arm: mvebu: Add DM (driver model) support

This patch adds driver model support for some Marvell MVEBU SoC's. Including
Armada XP and 38x. All 3 currently mainlined boards are converted. DM is now
selected automatically for MVEBU platforms.

With this DM support now available for MVEBU, hardcoding the base addresses
and other information is not necessary any more. Probing should be done
by using the values provided via the device tree now instead. For this
the driver also need to be converted to DM. Patches for some of the drivers
will follow.

Signed-off-by: Stefan Roese <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Luka Perkov <[email protected]>

diff --git a/Makefile b/Makefile
index 3b2eebf4b72cc343dda7bb50e45e8000f4693a28..0f6a60c4f800535ae4ca10763893f5af226b1ccd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -915,10 +915,10 @@ u-boot.img u-boot.kwb u-boot.pbl: u-boot.bin FORCE
 # U-Boot image. So we need to combine SPL and u-boot.bin instead of
 # u-boot.img in this case.
 ifdef CONFIG_MVEBU_BOOTROM_UARTBOOT
-u-boot-spl.kwb: u-boot.bin spl/u-boot-spl.bin FORCE
+u-boot-spl.kwb: u-boot-dtb.bin spl/u-boot-spl.bin FORCE
        $(call if_changed,mkimage)
 else
-u-boot-spl.kwb: u-boot.img spl/u-boot-spl.bin FORCE
+u-boot-spl.kwb: u-boot-dtb.img spl/u-boot-spl.bin FORCE
        $(call if_changed,mkimage)
 endif
 

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 29abdcc695e441578576b59c4b3c37dfd4bf4228..50322c4158370d6252c659c71a0e29a4d22c11ea 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -109,6 +109,9 @@ config ARCH_MVEBU
        bool "Marvell MVEBU family (Armada XP/38x)"
        select CPU_V7
        select SUPPORT_SPL
+       select OF_CONTROL
+       select OF_SEPARATE
+       select DM
 
 config TARGET_DEVKIT3250
        bool "Support devkit3250"

diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index e273339648fb542863ba400be3b53eb69a083ad9..0ab729aa5d87ca3cc0dcefa2532ffdaff2622e55 100644 (file)
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -31,9 +31,6 @@ u32 spl_boot_mode(void)
 
 void board_init_f(ulong dummy)
 {
-       /* Set global data pointer */
-       gd = &gdata;
-
 #ifndef CONFIG_MVEBU_BOOTROM_UARTBOOT
        /*
         * Only call arch_cpu_init() when not returning to the

diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
index 24647cea4f7d95cbafcdb33ef92c58b44eab5eb7..f2b1126689d99afa31f14fbe77fea576f858f5d4 100644 (file)
--- a/configs/db-88f6820-gp_defconfig
+++ b/configs/db-88f6820-gp_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_TARGET_DB_88F6820_GP=y
+CONFIG_DEFAULT_DEVICE_TREE="armada-388-gp"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set

diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index 4e4da3c30531aae1925ad3ef092e51624e5f1589..df17dba53ae2b848cd0cf606c6fced148fb36e10 100644 (file)
--- a/configs/db-mv784mp-gp_defconfig
+++ b/configs/db-mv784mp-gp_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_TARGET_DB_MV784MP_GP=y
+CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set

diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index 59579976a38079bb4c2799b715a9190b53466eb3..d49def1beaa3fe3037f6349bea8da40547242f8a 100644 (file)
--- a/configs/maxbcm_defconfig
+++ b/configs/maxbcm_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_TARGET_MAXBCM=y
+CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
 CONFIG_SPL=y
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set