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

Commit e5e2a5b0 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 the msm gpio node for msm8916"

parents 74f4e4d4 4efd5dc8

arch/arm/boot/dts/qcom/msm8916-pm.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ 
			<0xff 207>, /* rpm_ipc(27) */

			<0xff 240>; /* summary_irq_kpss */



		qcom,gpio-parent = <&msmgpio>;

		qcom,gpio-parent = <&msm_gpio>;

		qcom,gpio-map = <3  108 >,

			<4  1 >,

			<5  5 >,

arch/arm/boot/dts/qcom/msm8916-qrd.dts

+1 −1
Original line number Diff line number Diff line
@@ -49,6 +49,6 @@ 
		vdd-supply = <&pm8916_l17>;

		vio-supply = <&pm8916_l6>;

		akm,layout = <0x0>;

		akm,gpio_rstn = <&msmgpio 36 0x0>;

		akm,gpio_rstn = <&msm_gpio 36 0x0>;

	};

};

arch/arm/boot/dts/qcom/msm8916.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -135,18 +135,6 @@ 
		<0x0b002000 0x1000>;

	};



	msmgpio: gpio@1000000 {

		compatible = "qcom,msm-gpio";

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

		#interrupt-cells = <2>;

		reg = <0x1000000 0x300000>;

		ngpio = <122>;



		qcom,direct-connect-irqs = <29>;

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupts = <1 2 0xf08>,