Commit 89fb2d77 authored by Andrew Lunn's avatar Andrew Lunn
Browse files

Merge branch 'v3.5-rc7-fixes' into v3.5-rc7-dt-v3 

Merge in branch already pulled. Fulfils dependancies needed by
this patchset.
parents 42971035 77843504

Documentation/devicetree/bindings/mtd/orion-nand.txt

+2 −2
Original line number Diff line number Diff line 
NAND support for Marvell Orion SoC platforms



Required properties:

- compatible : "mrvl,orion-nand".

- compatible : "marvell,orion-nand".

- reg : Base physical address of the NAND and length of memory mapped

	region
@@ -24,7 +24,7 @@ nand@f4000000 { 
	ale = <1>;

	bank-width = <1>;

	chip-delay = <25>;

	compatible = "mrvl,orion-nand";

	compatible = "marvell,orion-nand";

	reg = <0xf4000000 0x400>;



	partition@0 {

arch/arm/boot/dts/kirkwood-dns320.dts

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


/ {

	model = "D-Link DNS-320 NAS (Rev A1)";

	compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";

	compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";

arch/arm/boot/dts/kirkwood-dns325.dts

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


/ {

	model = "D-Link DNS-325 NAS (Rev A1)";

	compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";

	compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";

arch/arm/boot/dts/kirkwood-dreamplug.dts

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


/ {

	model = "Globalscale Technologies Dreamplug";

	compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";

	compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";

arch/arm/boot/dts/kirkwood-ib62x0.dts

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


/ {

	model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";

	compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0",  "mrvl,kirkwood-88f6281", "mrvl,kirkwood";

	compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0",  "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";