Commit 2ea698c6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu into next/dt 

mvebu dt for 4.5 (part 3)

Add dts for the following boards:
- Zyxel NSA325
- PogoPlug series 4
Add GPU support for Dove
Update boolean property to wakeup source for isil

* tag 'mvebu-dt-4.5-3' of git://git.infradead.org/linux-mvebu

:
  ARM: dts: armada: replace isil, irq2-can-wakeup-machine with wakeup-source property
  ARM: dts: enable GPU for SolidRun's Cubox
  ARM: dts: dove: add DT GPU support
  ARM: mvebu: kirkwood: add PogoPlug series 4 device tree
  ARM: mvebu: add kirkwood compatibles for cloudengine boards
  ARM: dts: kirkwood: Add DTS for Zyxel NSA325

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0d639e0a 8b44f5be

Documentation/devicetree/bindings/arm/marvell,kirkwood.txt

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ board. Currently known boards are: 
"buffalo,lswxl"

"buffalo,lsxhl"

"buffalo,lsxl"

"cloudengines,pogo02"

"cloudengines,pogoplugv4"

"dlink,dns-320"

"dlink,dns-320-a1"

"dlink,dns-325"

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -204,12 +204,14 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ 
	kirkwood-ns2mini.dtb \

	kirkwood-nsa310.dtb \

	kirkwood-nsa310a.dtb \

	kirkwood-nsa325.dtb \

	kirkwood-openblocks_a6.dtb \

	kirkwood-openblocks_a7.dtb \

	kirkwood-openrd-base.dtb \

	kirkwood-openrd-client.dtb \

	kirkwood-openrd-ultimate.dtb \

	kirkwood-pogo_e02.dtb \

	kirkwood-pogoplug-series-4.dtb \

	kirkwood-rd88f6192.dtb \

	kirkwood-rd88f6281-z0.dtb \

	kirkwood-rd88f6281-a.dtb \

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 
				isl12057: isl12057@68 {

					compatible = "isil,isl12057";

					reg = <0x68>;

					isil,irq2-can-wakeup-machine;

					wakeup-source;

				};



				g762: g762@3e {

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
				isl12057: isl12057@68 {

					compatible = "isil,isl12057";

					reg = <0x68>;

					isil,irq2-can-wakeup-machine;

					wakeup-source;

				};



				g762: g762@3e {

arch/arm/boot/dts/armada-xp-netgear-rn2120.dts

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ 
				isl12057: isl12057@68 {

					compatible = "isil,isl12057";

					reg = <0x68>;

					isil,irq2-can-wakeup-machine;

					wakeup-source;

				};

			};

CRA Git | Maintained and supported by SUSTech CRA and CCSE