Commit 3de834b2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-fixes-for-5.11' of... 

Merge tag 'qcom-arm64-fixes-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Qualcomm ARM64 fixes for 5.11

This fixes a regression in Lenovo Yoga C630, where the touchpad in some
units stopped working, by re-enabling the "tsc2" device.

It also marks the LPASS related clocks as protected to allow DB845c and
the Lenovo Yoga C630 to boot even if CONFIG_SDM_LPASSCC_845 is enabled.

* tag 'qcom-arm64-fixes-for-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: sdm845: Reserve LPASS clocks in gcc
  arm64: dts: qcom: c630: keep both touchpad devices enabled

Link: https://lore.kernel.org/r/20210125232039.642565-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c25644d5 93f2a115

arch/arm64/boot/dts/qcom/sdm845-db845c.dts

+3 −1
Original line number Diff line number Diff line
@@ -415,7 +415,9 @@ 
&gcc {

	protected-clocks = <GCC_QSPI_CORE_CLK>,

			   <GCC_QSPI_CORE_CLK_SRC>,

			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>;

			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>,

			   <GCC_LPASS_Q6_AXI_CLK>,

			   <GCC_LPASS_SWAY_CLK>;

};



&gpu {

arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts

+5 −9
Original line number Diff line number Diff line
@@ -302,7 +302,9 @@ 
&gcc {

	protected-clocks = <GCC_QSPI_CORE_CLK>,

			   <GCC_QSPI_CORE_CLK_SRC>,

			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>;

			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>,

			   <GCC_LPASS_Q6_AXI_CLK>,

			   <GCC_LPASS_SWAY_CLK>;

};



&gpu {
@@ -320,6 +322,8 @@ 
&i2c3 {

	status = "okay";

	clock-frequency = <400000>;

	/* Overwrite pinctrl-0 from sdm845.dtsi */

	pinctrl-0 = <&qup_i2c3_default &i2c3_hid_active>;



	tsel: hid@15 {

		compatible = "hid-over-i2c";
@@ -327,9 +331,6 @@ 
		hid-descr-addr = <0x1>;



		interrupts-extended = <&tlmm 37 IRQ_TYPE_LEVEL_HIGH>;



		pinctrl-names = "default";

		pinctrl-0 = <&i2c3_hid_active>;

	};



	tsc2: hid@2c {
@@ -338,11 +339,6 @@ 
		hid-descr-addr = <0x20>;



		interrupts-extended = <&tlmm 37 IRQ_TYPE_LEVEL_HIGH>;



		pinctrl-names = "default";

		pinctrl-0 = <&i2c3_hid_active>;



		status = "disabled";

	};

};