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

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

Merge branch 'pxa/dt' into next/dt 



From: Haojian Zhuang <haojian.zhuang@gmail.com>:
* pxa/dt:
  ARM: pxa: DTS: override gpio node in pxa3xx.dtsi
  ARM: pxa: fix DT auxdata for pxa3xx-gpio

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 19dab4ce 93c5a5b1

arch/arm/boot/dts/pxa3xx.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -28,5 +28,16 @@ 
			marvell,intc-priority;

			marvell,intc-nr-irqs = <56>;

		};



		gpio: gpio@40e00000 {

			compatible = "intel,pxa3xx-gpio";

			reg = <0x40e00000 0x10000>;

			interrupt-names = "gpio0", "gpio1", "gpio_mux";

			interrupts = <8 9 10>;

			gpio-controller;

			#gpio-cells = <0x2>;

			interrupt-controller;

			#interrupt-cells = <0x2>;

		};

	};

};

arch/arm/mach-pxa/pxa-dt.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static const struct of_dev_auxdata pxa3xx_auxdata_lookup[] __initconst = { 
	OF_DEV_AUXDATA("mrvl,pxa-uart",		0x40700000, "pxa2xx-uart.2", NULL),

	OF_DEV_AUXDATA("mrvl,pxa-uart",		0x41600000, "pxa2xx-uart.3", NULL),

	OF_DEV_AUXDATA("marvell,pxa-mmc",	0x41100000, "pxa2xx-mci.0", NULL),

	OF_DEV_AUXDATA("mrvl,pxa-gpio",		0x40e00000, "pxa-gpio", NULL),

	OF_DEV_AUXDATA("intel,pxa3xx-gpio",	0x40e00000, "pxa3xx-gpio", NULL),

	OF_DEV_AUXDATA("marvell,pxa-ohci",	0x4c000000, "pxa27x-ohci", NULL),

	OF_DEV_AUXDATA("mrvl,pxa-i2c",		0x40301680, "pxa2xx-i2c.0", NULL),

	OF_DEV_AUXDATA("mrvl,pwri2c",		0x40f500c0, "pxa3xx-i2c.1", NULL),