Commit 0233903e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'omap/dt' into next/omap-gpmc 



Dependency for the gpmc changes

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0df1f248 065bd7fe

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -302,7 +302,9 @@ dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \ 
	omap3-ha.dtb \

	omap3-ha-lcd.dtb \

	omap3-igep0020.dtb \

	omap3-igep0020-rev-f.dtb \

	omap3-igep0030.dtb \

	omap3-igep0030-rev-g.dtb \

	omap3-ldp.dtb \

	omap3-lilly-dbb056.dtb \

	omap3-n900.dtb \
@@ -347,6 +349,7 @@ dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \ 
	omap5-sbc-t54.dtb \

	omap5-uevm.dtb

dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \

	am57xx-beagle-x15.dtb \

	dra72-evm.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \

	orion5x-lacie-ethernet-disk-mini-v2.dtb \

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

+2 −2
Original line number Diff line number Diff line
@@ -437,9 +437,9 @@ 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&nandflash_pins_s0>;

	ranges = <0 0 0x08000000 0x10000000>;	/* CS0: NAND */

	ranges = <0 0 0x08000000 0x1000000>;	/* CS0: 16MB for NAND */

	nand@0,0 {

		reg = <0 0 0>; /* CS0, offset 0 */

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		ti,nand-ecc-opt = "bch8";

		ti,elm-id = <&elm>;

		nand-bus-width = <8>;

arch/arm/boot/dts/am335x-igep0033.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -126,10 +126,10 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&nandflash_pins>;



	ranges = <0 0 0x08000000 0x10000000>;	/* CS0: NAND */

	ranges = <0 0 0x08000000 0x1000000>;	/* CS0: 16MB for NAND */



	nand@0,0 {

		reg = <0 0 0>; /* CS0, offset 0 */

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		nand-bus-width = <8>;

		ti,nand-ecc-opt = "bch8";

		gpmc,device-width = <1>;

arch/arm/boot/dts/am33xx.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -204,6 +204,8 @@ 
			reg = <0x44e09000 0x2000>;

			interrupts = <72>;

			status = "disabled";

			dmas = <&edma 26>, <&edma 27>;

			dma-names = "tx", "rx";

		};



		uart1: serial@48022000 {
@@ -213,6 +215,8 @@ 
			reg = <0x48022000 0x2000>;

			interrupts = <73>;

			status = "disabled";

			dmas = <&edma 28>, <&edma 29>;

			dma-names = "tx", "rx";

		};



		uart2: serial@48024000 {
@@ -222,6 +226,8 @@ 
			reg = <0x48024000 0x2000>;

			interrupts = <74>;

			status = "disabled";

			dmas = <&edma 30>, <&edma 31>;

			dma-names = "tx", "rx";

		};



		uart3: serial@481a6000 {
@@ -356,6 +362,7 @@ 
			reg = <0x480C8000 0x200>;

			interrupts = <77>;

			ti,hwmods = "mailbox";

			#mbox-cells = <1>;

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <8>;

			mbox_wkupm3: wkup_m3 {

arch/arm/boot/dts/am4372.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
			reg = <0x480C8000 0x200>;

			interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;

			ti,hwmods = "mailbox";

			#mbox-cells = <1>;

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <8>;

			mbox_wkupm3: wkup_m3 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE