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

Commit c4d63f27 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove old convention of adding cd gpio to interrupt map"

parents 9487b0df da3a0b21

arch/arm64/boot/dts/qcom/sdm670-cdp.dtsi

+0 −9
Original line number Diff line number Diff line
@@ -95,15 +95,6 @@ 
	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;



	#address-cells = <0>;

	interrupt-parent = <&sdhc_2>;

	interrupts = <0 1 2>;

	#interrupt-cells = <1>;

	interrupt-map-mask = <0xffffffff>;

	interrupt-map = <0 &intc 0 0 204 0

			1 &intc 0 0 222 0

			2 &tlmm 96 0>;

	interrupt-names = "hc_irq", "pwr_irq", "status_irq";

	cd-gpios = <&tlmm 96 0x1>;



	status = "ok";

arch/arm64/boot/dts/qcom/sdm670-mtp.dtsi

+0 −9
Original line number Diff line number Diff line
@@ -95,15 +95,6 @@ 
	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;



	#address-cells = <0>;

	interrupt-parent = <&sdhc_2>;

	interrupts = <0 1 2>;

	#interrupt-cells = <1>;

	interrupt-map-mask = <0xffffffff>;

	interrupt-map = <0 &intc 0 0 204 0

			1 &intc 0 0 222 0

			2 &tlmm 96 0>;

	interrupt-names = "hc_irq", "pwr_irq", "status_irq";

	cd-gpios = <&tlmm 96 0x1>;



	status = "ok";