Commit 18019eb6 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: sm8250: don't enable rx/tx macro by default 



Enabling rxmacro and txmacro nodes by defaults makes Qualcomm RB5 to
crash and reboot while probing audio devices. Disable these device tree
nodes by default and enabled them only when necessary (for the
SM8250-MTP board).

Fixes: 24f52ef0 ("arm64: dts: qcom: sm8250: Add nodes for tx and rx macros with soundwire masters")
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220401185814.519653-1-dmitry.baryshkov@linaro.org
parent 31231092

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";