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

Commit c2147624 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'qcom/fixes' into next/fixes-non-critical 



* qcom/fixes:
  ARM: dts: msm: Fix gpio interrupt and reg length

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents a87010ef 29644125

arch/arm/boot/dts/qcom-msm8660-surf.dts

+2 −2
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ 


	msmgpio: gpio@800000 {

		compatible = "qcom,msm-gpio";

		reg = <0x00800000 0x1000>;

		reg = <0x00800000 0x4000>;

		gpio-controller;

		#gpio-cells = <2>;

		ngpio = <173>;

		interrupts = <0 32 0x4>;

		interrupts = <0 16 0x4>;

		interrupt-controller;

		#interrupt-cells = <2>;

	};

arch/arm/boot/dts/qcom-msm8960-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
		gpio-controller;

		#gpio-cells = <2>;

		ngpio = <150>;

		interrupts = <0 32 0x4>;

		interrupts = <0 16 0x4>;

		interrupt-controller;

		#interrupt-cells = <2>;

		reg = <0x800000 0x4000>;