Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC board specific changes (part 1) from Olof Johansson:
 "These changes are all for board specific files.  These used to make up
  a large portion of the ARM changes in the past, but as we are
  generalizing the support and moving to device tree probing, this has
  gotten significantly smaller.

  The only platform actually adding new code here at the moment is
  Renesas shmobile, as they are still busy converting their code to
  device tree and have not come far enough to not need it."

* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
  ARM: msm: USB_MSM_OTG needs USB_PHY
  ARM: davinci: da850 evm: fix const qualifier placement
  ARM: davinci: da850 board: add remoteproc support
  ARM: pxa: move debug uart code
  ARM: pxa: select PXA935 on saar & tavorevb
  ARM: mmp: add more compatible names in gpio driver
  ARM: pxa: move PXA_GPIO_TO_IRQ macro
  ARM: pxa: remove cpu_is_xxx in gpio driver
  ARM: Kirkwood: update Network Space Mini v2 description
  ARM: Kirkwood: DT board setup for CloudBox
  ARM: Kirkwood: sort board entries by ASCII-code order
  ARM: OMAP: board-4430sdp: Provide regulator to pwm-backlight
  ARM: OMAP: zoom: Use pwm stack for lcd and keyboard backlight
  ARM: OMAP2+: omap2plus_defconfig: Add support for BMP085 pressure sensor
  omap2+: Remove useless Makefile line
  omap2+: Remove useless Makefile line
  ARM: OMAP: RX-51: add missing regulator supply definitions for lis3lv02d
  ARM: OMAP1: fix omap_udc registration
  ARM: davinci: use is IS_ENABLED macro
  ARM: kirkwood: add MACH_GURUPLUG_DT to defconfig
  ...

6 files changed, 254 insertions, 183 deletions

diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 7b6a64bc5f40..7509a89af967 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -2,23 +2,41 @@ if ARCH_KIRKWOOD
 
 menu "Marvell Kirkwood Implementations"
 
+config MACH_D2NET_V2
+        bool "LaCie d2 Network v2 NAS Board"
+        help
+          Say 'Y' here if you want your kernel to support the
+          LaCie d2 Network v2 NAS.
+
 config MACH_DB88F6281_BP
         bool "Marvell DB-88F6281-BP Development Board"
         help
           Say 'Y' here if you want your kernel to support the
           Marvell DB-88F6281-BP Development Board.
 
-config MACH_RD88F6192_NAS
-        bool "Marvell RD-88F6192-NAS Reference Board"
+config MACH_DOCKSTAR
+        bool "Seagate FreeAgent DockStar"
         help
           Say 'Y' here if you want your kernel to support the
-          Marvell RD-88F6192-NAS Reference Board.
+          Seagate FreeAgent DockStar.
 
-config MACH_RD88F6281
-        bool "Marvell RD-88F6281 Reference Board"
+config MACH_ESATA_SHEEVAPLUG
+        bool "Marvell eSATA SheevaPlug Reference Board"
         help
           Say 'Y' here if you want your kernel to support the
-          Marvell RD-88F6281 Reference Board.
+          Marvell eSATA SheevaPlug Reference Board.
+
+config MACH_GURUPLUG
+        bool "Marvell GuruPlug Reference Board"
+        help
+          Say 'Y' here if you want your kernel to support the
+          Marvell GuruPlug Reference Board.
+
+config MACH_INETSPACE_V2
+        bool "LaCie Internet Space v2 NAS Board"
+        help
+          Say 'Y' here if you want your kernel to support the
+          LaCie Internet Space v2 NAS.
 
 config MACH_MV88F6281GTW_GE
         bool "Marvell 88F6281 GTW GE Board"
@@ -26,23 +44,93 @@ config MACH_MV88F6281GTW_GE
           Say 'Y' here if you want your kernel to support the
           Marvell 88F6281 GTW GE Board.
 
+config MACH_NET2BIG_V2
+        bool "LaCie 2Big Network v2 NAS Board"
+        help
+          Say 'Y' here if you want your kernel to support the
+          LaCie 2Big Network v2 NAS.
+
+config MACH_NET5BIG_V2
+        bool "LaCie 5Big Network v2 NAS Board"
+        help
+          Say 'Y' here if you want your kernel to support the
+          LaCie 5Big Network v2 NAS.
+
+config MACH_NETSPACE_MAX_V2
+        bool "LaCie Network Space Max v2 NAS Board"
+        help
+          Say 'Y' here if you want your kernel to support the
+          LaCie Network Space Max v2 NAS.
+
+config MACH_NETSPACE_V2
+        bool "LaCie Network Space v2 NAS Board"
+        help
+          Say 'Y' here if you want your kernel to support the
+          LaCie Network Space v2 NAS.
+
+config MACH_OPENRD
+        bool
+
+config MACH_OPENRD_BASE
+        bool "Marvell OpenRD Base Board"
+        select MACH_OPENRD
+        help
+          Say 'Y' here if you want your kernel to support the
+          Marvell OpenRD Base Board.
+
+config MACH_OPENRD_CLIENT
+        bool "Marvell OpenRD Client Board"
+        select MACH_OPENRD
+        help
+          Say 'Y' here if you want your kernel to support the
+          Marvell OpenRD Client Board.
+
+config MACH_OPENRD_ULTIMATE
+        bool "Marvell OpenRD Ultimate Board"
+        select MACH_OPENRD
+        help
+          Say 'Y' here if you want your kernel to support the
+          Marvell OpenRD Ultimate Board.
+
+config MACH_RD88F6192_NAS
+        bool "Marvell RD-88F6192-NAS Reference Board"
+        help
+          Say 'Y' here if you want your kernel to support the
+          Marvell RD-88F6192-NAS Reference Board.
+
+config MACH_RD88F6281
+        bool "Marvell RD-88F6281 Reference Board"
+        help
+          Say 'Y' here if you want your kernel to support the
+          Marvell RD-88F6281 Reference Board.
+
 config MACH_SHEEVAPLUG
         bool "Marvell SheevaPlug Reference Board"
         help
           Say 'Y' here if you want your kernel to support the
           Marvell SheevaPlug Reference Board.
 
-config MACH_ESATA_SHEEVAPLUG
-        bool "Marvell eSATA SheevaPlug Reference Board"
+config MACH_T5325
+        bool "HP t5325 Thin Client"
         help
           Say 'Y' here if you want your kernel to support the
-          Marvell eSATA SheevaPlug Reference Board.
+          HP t5325 Thin Client.
 
-config MACH_GURUPLUG
-        bool "Marvell GuruPlug Reference Board"
+config MACH_TS219
+        bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
         help
           Say 'Y' here if you want your kernel to support the
-          Marvell GuruPlug Reference Board.
+          QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
+          TS-219P+ Turbo NAS devices.
+
+config MACH_TS41X
+        bool "QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo NAS"
+        help
+          Say 'Y' here if you want your kernel to support the
+          QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo
+          NAS devices.
+
+comment "Device tree entries"
 
 config ARCH_KIRKWOOD_DT
         bool "Marvell Kirkwood Flattened Device Tree"
@@ -58,12 +146,27 @@ config ARCH_KIRKWOOD_DT
           Say 'Y' here if you want your kernel to support the
           Marvell Kirkwood using flattened device tree.
 
-config MACH_GURUPLUG_DT
-        bool "Marvell GuruPlug Reference Board (Flattened Device Tree)"
+config MACH_CLOUDBOX_DT
+        bool "LaCie CloudBox NAS (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
+        help
+          Say 'Y' here if you want your kernel to support the LaCie
+          CloudBox NAS, using Flattened Device Tree.
+
+config MACH_DLINK_KIRKWOOD_DT
+        bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"
         select ARCH_KIRKWOOD_DT
         help
           Say 'Y' here if you want your kernel to support the
-          Marvell GuruPlug Reference Board (Flattened Device Tree).
+          Kirkwood-based D-Link NASes such as DNS-320 & DNS-325,
+          using Flattened Device Tree.
+
+config MACH_DOCKSTAR_DT
+        bool "Seagate FreeAgent Dockstar (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
+        help
+          Say 'Y' here if you want your kernel to support the
+          Seagate FreeAgent Dockstar (Flattened Device Tree).
 
 config MACH_DREAMPLUG_DT
         bool "Marvell DreamPlug (Flattened Device Tree)"
@@ -72,19 +175,19 @@ config MACH_DREAMPLUG_DT
           Say 'Y' here if you want your kernel to support the
           Marvell DreamPlug (Flattened Device Tree).
 
-config MACH_ICONNECT_DT
-        bool "Iomega Iconnect (Flattened Device Tree)"
+config MACH_GOFLEXNET_DT
+        bool "Seagate GoFlex Net (Flattened Device Tree)"
         select ARCH_KIRKWOOD_DT
         help
-          Say 'Y' here to enable Iomega Iconnect support.
+          Say 'Y' here if you want your kernel to support the
+          Seagate GoFlex Net (Flattened Device Tree).
 
-config MACH_DLINK_KIRKWOOD_DT
-        bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"
+config MACH_GURUPLUG_DT
+        bool "Marvell GuruPlug Reference Board (Flattened Device Tree)"
         select ARCH_KIRKWOOD_DT
         help
           Say 'Y' here if you want your kernel to support the
-          Kirkwood-based D-Link NASes such as DNS-320 & DNS-325,
-          using Flattened Device Tree.
+          Marvell GuruPlug Reference Board (Flattened Device Tree).
 
 config MACH_IB62X0_DT
         bool "RaidSonic IB-NAS6210, IB-NAS6220 (Flattened Device Tree)"
@@ -94,41 +197,18 @@ config MACH_IB62X0_DT
           RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
           Flattened Device Tree.
 
-config MACH_TS219_DT
-        bool "Device Tree for QNAP TS-11X, TS-21X NAS"
-        select ARCH_KIRKWOOD_DT
-        select ARM_APPENDED_DTB
-        select ARM_ATAG_DTB_COMPAT
-        help
-          Say 'Y' here if you want your kernel to support the QNAP
-          TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
-          TS-219P+ Turbo NAS devices using Fattened Device Tree.
-          There are two different Device Tree descriptions, depending
-          on if the device is based on an if the board uses the MV6281
-          or MV6282. If you have the wrong one, the buttons will not
-          work.
-
-config MACH_DOCKSTAR_DT
-        bool "Seagate FreeAgent Dockstar (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          Seagate FreeAgent Dockstar (Flattened Device Tree).
-
-config MACH_GOFLEXNET_DT
-        bool "Seagate GoFlex Net (Flattened Device Tree)"
+config MACH_ICONNECT_DT
+        bool "Iomega Iconnect (Flattened Device Tree)"
         select ARCH_KIRKWOOD_DT
         help
-          Say 'Y' here if you want your kernel to support the
-          Seagate GoFlex Net (Flattened Device Tree).
+          Say 'Y' here to enable Iomega Iconnect support.
 
-config MACH_LSXL_DT
-        bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"
+config MACH_INETSPACE_V2_DT
+        bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
         select ARCH_KIRKWOOD_DT
         help
-          Say 'Y' here if you want your kernel to support the
-          Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using
-          Flattened Device Tree.
+          Say 'Y' here if you want your kernel to support the LaCie
+          Internet Space v2 NAS, using Flattened Device Tree.
 
 config MACH_IOMEGA_IX2_200_DT
         bool "Iomega StorCenter ix2-200 (Flattened Device Tree)"
@@ -144,12 +224,13 @@ config MACH_KM_KIRKWOOD_DT
           Say 'Y' here if you want your kernel to support the
           Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
 
-config MACH_INETSPACE_V2_DT
-        bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
+config MACH_LSXL_DT
+        bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"
         select ARCH_KIRKWOOD_DT
         help
-          Say 'Y' here if you want your kernel to support the LaCie
-          Internet Space v2 NAS, using Flattened Device Tree.
+          Say 'Y' here if you want your kernel to support the
+          Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using
+          Flattened Device Tree.
 
 config MACH_MPLCEC4_DT
         bool "MPL CEC4 (Flattened Device Tree)"
@@ -158,12 +239,12 @@ config MACH_MPLCEC4_DT
           Say 'Y' here if you want your kernel to support the
           MPL CEC4 (Flattened Device Tree).
 
-config MACH_NETSPACE_V2_DT
-        bool "LaCie Network Space v2 NAS (Flattened Device Tree)"
+config MACH_NETSPACE_LITE_V2_DT
+        bool "LaCie Network Space Lite v2 NAS (Flattened Device Tree)"
         select ARCH_KIRKWOOD_DT
         help
           Say 'Y' here if you want your kernel to support the LaCie
-          Network Space v2 NAS, using Flattened Device Tree.
+          Network Space Lite v2 NAS, using Flattened Device Tree.
 
 config MACH_NETSPACE_MAX_V2_DT
         bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)"
@@ -172,128 +253,69 @@ config MACH_NETSPACE_MAX_V2_DT
           Say 'Y' here if you want your kernel to support the LaCie
           Network Space Max v2 NAS, using Flattened Device Tree.
 
-config MACH_NETSPACE_LITE_V2_DT
-        bool "LaCie Network Space Lite v2 NAS (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the LaCie
-          Network Space Lite v2 NAS, using Flattened Device Tree.
-
 config MACH_NETSPACE_MINI_V2_DT
         bool "LaCie Network Space Mini v2 NAS (Flattened Device Tree)"
         select ARCH_KIRKWOOD_DT
         help
           Say 'Y' here if you want your kernel to support the LaCie
-          Network Space Mini v2 NAS (aka SafeBox), using Flattened
-          Device Tree.
+          Network Space Mini v2 NAS using Flattened Device Tree.
 
-config MACH_OPENBLOCKS_A6_DT
-        bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          Plat'Home OpenBlocks A6 (Flattened Device Tree).
+          This board is embedded in a product named CloudBox, which
+          provides automatic backup on a 100GB cloud storage. This
+          should not confused with a more recent LaCie NAS also named
+          CloudBox. For this last, the disk capacity is 1TB or above.
 
-config MACH_TOPKICK_DT
-        bool "USI Topkick (Flattened Device Tree)"
+config MACH_NETSPACE_V2_DT
+        bool "LaCie Network Space v2 NAS (Flattened Device Tree)"
         select ARCH_KIRKWOOD_DT
         help
-          Say 'Y' here if you want your kernel to support the
-          USI Topkick, using Flattened Device Tree
-
-config MACH_TS219
-        bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
-        help
-          Say 'Y' here if you want your kernel to support the
-          QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
-          TS-219P+ Turbo NAS devices.
-
-config MACH_TS41X
-        bool "QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo NAS"
-        help
-          Say 'Y' here if you want your kernel to support the
-          QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo
-          NAS devices.
-
-config MACH_DOCKSTAR
-        bool "Seagate FreeAgent DockStar"
-        help
-          Say 'Y' here if you want your kernel to support the
-          Seagate FreeAgent DockStar.
-
-config MACH_OPENRD
-        bool
-
-config MACH_OPENRD_BASE
-        bool "Marvell OpenRD Base Board"
-        select MACH_OPENRD
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell OpenRD Base Board.
-
-config MACH_OPENRD_CLIENT
-        bool "Marvell OpenRD Client Board"
-        select MACH_OPENRD
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell OpenRD Client Board.
-
-config MACH_OPENRD_ULTIMATE
-        bool "Marvell OpenRD Ultimate Board"
-        select MACH_OPENRD
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell OpenRD Ultimate Board.
-
-config MACH_NETSPACE_V2
-        bool "LaCie Network Space v2 NAS Board"
-        help
-          Say 'Y' here if you want your kernel to support the
-          LaCie Network Space v2 NAS.
-
-config MACH_INETSPACE_V2
-        bool "LaCie Internet Space v2 NAS Board"
-        help
-          Say 'Y' here if you want your kernel to support the
-          LaCie Internet Space v2 NAS.
-
-config MACH_NETSPACE_MAX_V2
-        bool "LaCie Network Space Max v2 NAS Board"
-        help
-          Say 'Y' here if you want your kernel to support the
-          LaCie Network Space Max v2 NAS.
+          Say 'Y' here if you want your kernel to support the LaCie
+          Network Space v2 NAS, using Flattened Device Tree.
 
-config MACH_D2NET_V2
-        bool "LaCie d2 Network v2 NAS Board"
+config MACH_NSA310_DT
+        bool "ZyXEL NSA-310 (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
+        select ARM_ATAG_DTB_COMPAT
         help
           Say 'Y' here if you want your kernel to support the
-          LaCie d2 Network v2 NAS.
+          ZyXEL NSA-310 board (Flattened Device Tree).
 
-config MACH_NET2BIG_V2
-        bool "LaCie 2Big Network v2 NAS Board"
+config MACH_OPENBLOCKS_A6_DT
+        bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
         help
           Say 'Y' here if you want your kernel to support the
-          LaCie 2Big Network v2 NAS.
+          Plat'Home OpenBlocks A6 (Flattened Device Tree).
 
-config MACH_NET5BIG_V2
-        bool "LaCie 5Big Network v2 NAS Board"
+config MACH_READYNAS_DT
+        bool "NETGEAR ReadyNAS Duo v2 (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
+        select ARM_APPENDED_DTB
+        select ARM_ATAG_DTB_COMPAT
         help
           Say 'Y' here if you want your kernel to support the
-          LaCie 5Big Network v2 NAS.
+          NETGEAR ReadyNAS Duo v2 using Fattened Device Tree.
 
-config MACH_T5325
-        bool "HP t5325 Thin Client"
+config MACH_TOPKICK_DT
+        bool "USI Topkick (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
         help
           Say 'Y' here if you want your kernel to support the
-          HP t5325 Thin Client.
+          USI Topkick, using Flattened Device Tree
 
-config MACH_NSA310_DT
-        bool "ZyXEL NSA-310 (Flattened Device Tree)"
+config MACH_TS219_DT
+        bool "Device Tree for QNAP TS-11X, TS-21X NAS"
         select ARCH_KIRKWOOD_DT
+        select ARM_APPENDED_DTB
         select ARM_ATAG_DTB_COMPAT
         help
-          Say 'Y' here if you want your kernel to support the
-          ZyXEL NSA-310 board (Flattened Device Tree).
+          Say 'Y' here if you want your kernel to support the QNAP
+          TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
+          TS-219P+ Turbo NAS devices using Fattened Device Tree.
+          There are two different Device Tree descriptions, depending
+          on if the device is based on an if the board uses the MV6281
+          or MV6282. If you have the wrong one, the buttons will not
+          work.
 
 endmenu
 
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index 4cc4bee4d0cf..cdbca328a412 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -1,42 +1,44 @@
 obj-y                           += common.o addr-map.o irq.o pcie.o mpp.o
 
+obj-$(CONFIG_MACH_D2NET_V2)             += d2net_v2-setup.o lacie_v2-common.o
 obj-$(CONFIG_MACH_DB88F6281_BP)         += db88f6281-bp-setup.o
-obj-$(CONFIG_MACH_RD88F6192_NAS)        += rd88f6192-nas-setup.o
-obj-$(CONFIG_MACH_RD88F6281)            += rd88f6281-setup.o
-obj-$(CONFIG_MACH_MV88F6281GTW_GE)      += mv88f6281gtw_ge-setup.o
-obj-$(CONFIG_MACH_SHEEVAPLUG)           += sheevaplug-setup.o
+obj-$(CONFIG_MACH_DOCKSTAR)             += dockstar-setup.o
 obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)     += sheevaplug-setup.o
 obj-$(CONFIG_MACH_GURUPLUG)             += guruplug-setup.o
-obj-$(CONFIG_MACH_DOCKSTAR)             += dockstar-setup.o
-obj-$(CONFIG_MACH_TS219)                += ts219-setup.o tsx1x-common.o
-obj-$(CONFIG_MACH_TS41X)                += ts41x-setup.o tsx1x-common.o
-obj-$(CONFIG_MACH_OPENRD)               += openrd-setup.o
-obj-$(CONFIG_MACH_NETSPACE_V2)          += netspace_v2-setup.o lacie_v2-common.o
 obj-$(CONFIG_MACH_INETSPACE_V2)         += netspace_v2-setup.o lacie_v2-common.o
-obj-$(CONFIG_MACH_NETSPACE_MAX_V2)      += netspace_v2-setup.o lacie_v2-common.o
-obj-$(CONFIG_MACH_D2NET_V2)             += d2net_v2-setup.o lacie_v2-common.o
+obj-$(CONFIG_MACH_MV88F6281GTW_GE)      += mv88f6281gtw_ge-setup.o
 obj-$(CONFIG_MACH_NET2BIG_V2)           += netxbig_v2-setup.o lacie_v2-common.o
 obj-$(CONFIG_MACH_NET5BIG_V2)           += netxbig_v2-setup.o lacie_v2-common.o
+obj-$(CONFIG_MACH_NETSPACE_MAX_V2)      += netspace_v2-setup.o lacie_v2-common.o
+obj-$(CONFIG_MACH_NETSPACE_V2)          += netspace_v2-setup.o lacie_v2-common.o
+obj-$(CONFIG_MACH_OPENRD)               += openrd-setup.o
+obj-$(CONFIG_MACH_RD88F6192_NAS)        += rd88f6192-nas-setup.o
+obj-$(CONFIG_MACH_RD88F6281)            += rd88f6281-setup.o
+obj-$(CONFIG_MACH_SHEEVAPLUG)           += sheevaplug-setup.o
 obj-$(CONFIG_MACH_T5325)                += t5325-setup.o
+obj-$(CONFIG_MACH_TS219)                += ts219-setup.o tsx1x-common.o
+obj-$(CONFIG_MACH_TS41X)                += ts41x-setup.o tsx1x-common.o
 
 obj-$(CONFIG_ARCH_KIRKWOOD_DT)          += board-dt.o
-obj-$(CONFIG_MACH_DREAMPLUG_DT)         += board-dreamplug.o
-obj-$(CONFIG_MACH_GURUPLUG_DT)          += board-guruplug.o
-obj-$(CONFIG_MACH_ICONNECT_DT)          += board-iconnect.o
+obj-$(CONFIG_MACH_CLOUDBOX_DT)          += board-ns2.o
 obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)    += board-dnskw.o
-obj-$(CONFIG_MACH_IB62X0_DT)            += board-ib62x0.o
-obj-$(CONFIG_MACH_TS219_DT)             += board-ts219.o tsx1x-common.o
 obj-$(CONFIG_MACH_DOCKSTAR_DT)          += board-dockstar.o
+obj-$(CONFIG_MACH_DREAMPLUG_DT)         += board-dreamplug.o
 obj-$(CONFIG_MACH_GOFLEXNET_DT)         += board-goflexnet.o
-obj-$(CONFIG_MACH_LSXL_DT)              += board-lsxl.o
+obj-$(CONFIG_MACH_GURUPLUG_DT)          += board-guruplug.o
+obj-$(CONFIG_MACH_IB62X0_DT)            += board-ib62x0.o
+obj-$(CONFIG_MACH_ICONNECT_DT)          += board-iconnect.o
+obj-$(CONFIG_MACH_INETSPACE_V2_DT)      += board-ns2.o
 obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)    += board-iomega_ix2_200.o
 obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)       += board-km_kirkwood.o
-obj-$(CONFIG_MACH_INETSPACE_V2_DT)      += board-ns2.o
+obj-$(CONFIG_MACH_LSXL_DT)              += board-lsxl.o
 obj-$(CONFIG_MACH_MPLCEC4_DT)           += board-mplcec4.o
-obj-$(CONFIG_MACH_NETSPACE_V2_DT)       += board-ns2.o
-obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)   += board-ns2.o
 obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT)  += board-ns2.o
+obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)   += board-ns2.o
 obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT)  += board-ns2.o
+obj-$(CONFIG_MACH_NETSPACE_V2_DT)       += board-ns2.o
 obj-$(CONFIG_MACH_NSA310_DT)            += board-nsa310.o
 obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)     += board-openblocks_a6.o
+obj-$(CONFIG_MACH_READYNAS_DT)          += board-readynas.o
 obj-$(CONFIG_MACH_TOPKICK_DT)           += board-usi_topkick.o
+obj-$(CONFIG_MACH_TS219_DT)             += board-ts219.o tsx1x-common.o
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index d367aa6b47bb..7904758e771f 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -139,16 +139,20 @@ static void __init kirkwood_dt_init(void)
         if (of_machine_is_compatible("keymile,km_kirkwood"))
                 km_kirkwood_init();
 
-        if (of_machine_is_compatible("lacie,inetspace_v2") ||
-            of_machine_is_compatible("lacie,netspace_v2") ||
-            of_machine_is_compatible("lacie,netspace_max_v2") ||
+        if (of_machine_is_compatible("lacie,cloudbox") ||
+            of_machine_is_compatible("lacie,inetspace_v2") ||
             of_machine_is_compatible("lacie,netspace_lite_v2") ||
-            of_machine_is_compatible("lacie,netspace_mini_v2"))
+            of_machine_is_compatible("lacie,netspace_max_v2") ||
+            of_machine_is_compatible("lacie,netspace_mini_v2") ||
+            of_machine_is_compatible("lacie,netspace_v2"))
                 ns2_init();
 
         if (of_machine_is_compatible("mpl,cec4"))
                 mplcec4_init();
 
+        if (of_machine_is_compatible("netgear,readynas-duo-v2"))
+                netgear_readynas_init();
+
         if (of_machine_is_compatible("plathome,openblocks-a6"))
                 openblocks_a6_init();
 
@@ -171,12 +175,14 @@ static const char * const kirkwood_dt_board_compat[] = {
         "buffalo,lsxl",
         "iom,ix2-200",
         "keymile,km_kirkwood",
+        "lacie,cloudbox",
         "lacie,inetspace_v2",
-        "lacie,netspace_max_v2",
-        "lacie,netspace_v2",
         "lacie,netspace_lite_v2",
+        "lacie,netspace_max_v2",
         "lacie,netspace_mini_v2",
+        "lacie,netspace_v2",
         "mpl,cec4",
+        "netgear,readynas-duo-v2",
         "plathome,openblocks-a6",
         "usi,topkick",
         "zyxel,nsa310",
diff --git a/arch/arm/mach-kirkwood/board-ns2.c b/arch/arm/mach-kirkwood/board-ns2.c
index f2ea3b7ad726..f8f660525ace 100644
--- a/arch/arm/mach-kirkwood/board-ns2.c
+++ b/arch/arm/mach-kirkwood/board-ns2.c
@@ -27,7 +27,8 @@ void __init ns2_init(void)
         /*
          * Basic setup. Needs to be called early.
          */
-        if (of_machine_is_compatible("lacie,netspace_lite_v2") ||
+        if (of_machine_is_compatible("lacie,cloudbox") ||
+            of_machine_is_compatible("lacie,netspace_lite_v2") ||
             of_machine_is_compatible("lacie,netspace_mini_v2"))
                 ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
         kirkwood_ge00_init(&ns2_ge00_data);
diff --git a/arch/arm/mach-kirkwood/board-readynas.c b/arch/arm/mach-kirkwood/board-readynas.c
new file mode 100644
index 000000000000..fb42c20e273f
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-readynas.c
@@ -0,0 +1,28 @@
+/*
+ * NETGEAR ReadyNAS Duo v2 Board setup for drivers not already
+ * converted to DT.
+ *
+ * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mv643xx_eth.h>
+#include <mach/kirkwood.h>
+#include "common.h"
+
+static struct mv643xx_eth_platform_data netgear_readynas_ge00_data = {
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
+};
+
+void __init netgear_readynas_init(void)
+{
+        kirkwood_ge00_init(&netgear_readynas_ge00_data);
+        kirkwood_pcie_init(KW_PCIE0);
+}
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index 5ed70565c843..3147be2f34da 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@ -141,12 +141,24 @@ void openblocks_a6_init(void);
 static inline void openblocks_a6_init(void) {};
 #endif
 
+#ifdef CONFIG_MACH_READYNAS_DT
+void netgear_readynas_init(void);
+#else
+static inline void netgear_readynas_init(void) {};
+#endif
+
 #ifdef CONFIG_MACH_TOPKICK_DT
 void usi_topkick_init(void);
 #else
 static inline void usi_topkick_init(void) {};
 #endif
 
+#ifdef CONFIG_MACH_CLOUDBOX_DT
+void cloudbox_init(void);
+#else
+static inline void cloudbox_init(void) {};
+#endif
+
 /* early init functions not converted to fdt yet */
 char *kirkwood_id(void);
 void kirkwood_l2_init(void);