Merge tag 'davinci-for-v3.14/dt' of... (310c8547) · Commits · 戴 / test

Merge tag 'davinci-for-v3.14/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt From Sekhar Nori: DaVinci device tree file updates to add GPIO support. * tag 'davinci-for-v3.14/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci : ARM: davinci: da850 evm: add GPIO pinumux entries DT node ARM: davinci: da850: add GPIO DT node Signed-off-by:

arch/arm/boot/dts/da850-evm.dts

+3 −0

+14 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		* option) any later version.
		*/
		#include "skeleton.dtsi"
		#include <dt-bindings/interrupt-controller/irq.h>

		/ {
		arm {
		@@ -256,6 +257,19 @@
		36
		>;
		};
		gpio: gpio@1e26000 {
		compatible = "ti,dm6441-gpio";
		gpio-controller;
		reg = <0x226000 0x1000>;
		interrupts = <42 IRQ_TYPE_EDGE_BOTH
		43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH
		45 IRQ_TYPE_EDGE_BOTH 46 IRQ_TYPE_EDGE_BOTH
		47 IRQ_TYPE_EDGE_BOTH 48 IRQ_TYPE_EDGE_BOTH
		49 IRQ_TYPE_EDGE_BOTH 50 IRQ_TYPE_EDGE_BOTH>;
		ti,ngpio = <144>;
		ti,davinci-gpio-unbanked = <0>;
		status = "disabled";
		};
		};
		nand_cs3@62000000 {
		compatible = "ti,davinci-nand";