Unverified Commit e81c07e2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm ARM64 DT fixes for v5.18

This disables the two Soundwire controllers as well as rx and tx macros
by default on the SM8250 platform to avoid crashes on devices where
these aren't available.

* tag 'qcom-arm64-fixes-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: sm8250: don't enable rx/tx macro by default

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2391e0d7 18019eb6

arch/arm64/boot/dts/qcom/sm8250-mtp.dts

+12 −0
Original line number Diff line number Diff line
@@ -622,6 +622,10 @@ 
	status = "okay";

};



&rxmacro {

	status = "okay";

};



&slpi {

	status = "okay";

	firmware-name = "qcom/sm8250/slpi.mbn";
@@ -773,6 +777,8 @@ 
};



&swr1 {

	status = "okay";



	wcd_rx: wcd9380-rx@0,4 {

		compatible = "sdw20217010d00";

		reg = <0 4>;
@@ -781,6 +787,8 @@ 
};



&swr2 {

	status = "okay";



	wcd_tx: wcd9380-tx@0,3 {

		compatible = "sdw20217010d00";

		reg = <0 3>;
@@ -819,6 +827,10 @@ 
	};

};



&txmacro {

	status = "okay";

};



&uart12 {

	status = "okay";

};

arch/arm64/boot/dts/qcom/sm8250.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -2255,6 +2255,7 @@ 
			pinctrl-0 = <&rx_swr_active>;

			compatible = "qcom,sm8250-lpass-rx-macro";

			reg = <0 0x3200000 0 0x1000>;

			status = "disabled";



			clocks = <&q6afecc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,

				<&q6afecc LPASS_CLK_ID_TX_CORE_NPL_MCLK  LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
@@ -2273,6 +2274,7 @@ 
		swr1: soundwire-controller@3210000 {

			reg = <0 0x3210000 0 0x2000>;

			compatible = "qcom,soundwire-v1.5.1";

			status = "disabled";

			interrupts = <GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&rxmacro>;

			clock-names = "iface";
@@ -2300,6 +2302,7 @@ 
			pinctrl-0 = <&tx_swr_active>;

			compatible = "qcom,sm8250-lpass-tx-macro";

			reg = <0 0x3220000 0 0x1000>;

			status = "disabled";



			clocks = <&q6afecc LPASS_CLK_ID_TX_CORE_MCLK LPASS_CLK_ATTRIBUTE_COUPLE_NO>,

				 <&q6afecc LPASS_CLK_ID_TX_CORE_NPL_MCLK  LPASS_CLK_ATTRIBUTE_COUPLE_NO>,
@@ -2323,6 +2326,7 @@ 
			compatible = "qcom,soundwire-v1.5.1";

			interrupts-extended = <&intc GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "core";

			status = "disabled";



			clocks = <&txmacro>;

			clock-names = "iface";