Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67237917 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add io-expander for audio daughter card on 8155"

parents 2dd299e4 1d559570

arch/arm64/boot/dts/qcom/sa8155-adp-common.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -76,15 +76,10 @@ 
	};

};



&qupv3_se20_i2c {

	status = "ok";

};



&pil_modem {

	status = "disabled";

};





&soc {

	qcom,lpass@17300000 {

		status = "ok";

arch/arm64/boot/dts/qcom/sa8155-audio.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -565,6 +565,19 @@ 
	status = "disabled";

};



&qupv3_se20_i2c {

	status = "ok";



	pinctrl-0 = <&qupv3_se20_i2c_active

			&audio_ioexp_reset_active>;



	gpio@3e {

		compatible = "semtech,sx1509q";

		reg = <0x3e>;

		semtech,probe-reset;

	};

};



&slim_aud {

	status = "disabled";

	iommu_slim_aud_ctrl_cb {

arch/arm64/boot/dts/qcom/sm8150-pinctrl.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -4546,5 +4546,18 @@ 
				bias-disable;

			};

		};



		audio_ioexp_reset_active: audio_ioexp_reset_active {

			mux {

				pins = "gpio166";

				function = "gpio";

			};

			config {

				pins = "gpio166";

				drive-strength = <2>;

				bias-disable;

				output-high;

			};

		};

	};

};