Merge tag 'davinci-for-v3.15/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Merge "DaVinci SoC updates for v3.15" from Sekhar Nori:

This pull request removes da8xx_omapl_defconfig
enabling all ARMv5 davinci devices to be built
using davinci_all_defconfig

* tag 'davinci-for-v3.15/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: remove da8xx_omapl_defconfig
  ARM: davinci: da8xx: fix multiple watchdog device registration
  ARM: davinci: add da8xx specific configs to davinci_all_defconfig
  ARM: davinci: enable da8xx build concurrently with older devices

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

7 files changed, 39 insertions, 32 deletions

diff --git a/arch/arm/mach-davinci/Makefile.boot b/arch/arm/mach-davinci/Makefile.boot
index 04a6c4e67b14..4b81601754a2 100644
--- a/arch/arm/mach-davinci/Makefile.boot
+++ b/arch/arm/mach-davinci/Makefile.boot
@@ -1,13 +1,7 @@
-ifeq ($(CONFIG_ARCH_DAVINCI_DA8XX),y)
-ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y)
-$(error Cannot enable DaVinci and DA8XX platforms concurrently)
-else
-   zreladdr-y   += 0xc0008000
-params_phys-y   := 0xc0000100
-initrd_phys-y   := 0xc0800000
-endif
-else
-   zreladdr-y   += 0x80008000
-params_phys-y   := 0x80000100
-initrd_phys-y   := 0x80800000
-endif
+zreladdr-$(CONFIG_ARCH_DAVINCI_DA8XX)           += 0xc0008000
+params_phys-$(CONFIG_ARCH_DAVINCI_DA8XX)        := 0xc0000100
+initrd_phys-$(CONFIG_ARCH_DAVINCI_DA8XX)        := 0xc0800000
+
+zreladdr-$(CONFIG_ARCH_DAVINCI_DMx)             += 0x80008000
+params_phys-$(CONFIG_ARCH_DAVINCI_DMx)          := 0x80000100
+initrd_phys-$(CONFIG_ARCH_DAVINCI_DMx)          := 0x80800000
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index 2eebc4338802..4ffc37accce0 100644
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -79,6 +79,8 @@ int davinci_gpio_register(struct resource *res, int size, void *pdata);
 #define DM646X_ASYNC_EMIF_CONTROL_BASE  0x20008000
 #define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000
 
+int davinci_init_wdt(void);
+
 /* DM355 function declarations */
 void dm355_init(void);
 void dm355_init_spi0(unsigned chipselect_mask,
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index 5cf9a027dcc6..6257aa452568 100644
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -313,9 +313,9 @@ void davinci_restart(enum reboot_mode mode, const char *cmd)
         davinci_watchdog_reset(&davinci_wdt_device);
 }
 
-static void davinci_init_wdt(void)
+int davinci_init_wdt(void)
 {
-        platform_device_register(&davinci_wdt_device);
+        return platform_device_register(&davinci_wdt_device);
 }
 
 static struct platform_device davinci_gpio_device = {
@@ -348,16 +348,3 @@ struct davinci_timer_instance davinci_timer_instance[2] = {
         },
 };
 
-/*-------------------------------------------------------------------------*/
-
-static int __init davinci_init_devices(void)
-{
-        /* please keep these calls, and their implementations above,
-         * in alphabetical order so they're easier to sort through.
-         */
-        davinci_init_wdt();
-
-        return 0;
-}
-arch_initcall(davinci_init_devices);
-
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 4668c0e19767..07381d8cea62 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -1076,12 +1076,18 @@ int __init dm355_init_video(struct vpfe_config *vpfe_cfg,
 
 static int __init dm355_init_devices(void)
 {
+        int ret = 0;
+
         if (!cpu_is_davinci_dm355())
                 return 0;
 
         davinci_cfg_reg(DM355_INT_EDMA_CC);
         platform_device_register(&dm355_edma_device);
 
-        return 0;
+        ret = davinci_init_wdt();
+        if (ret)
+                pr_warn("%s: watchdog init failed: %d\n", __func__, ret);
+
+        return ret;
 }
 postcore_initcall(dm355_init_devices);
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index b44b49e2801a..08a61b938333 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -1436,6 +1436,8 @@ int __init dm365_init_video(struct vpfe_config *vpfe_cfg,
 
 static int __init dm365_init_devices(void)
 {
+        int ret = 0;
+
         if (!cpu_is_davinci_dm365())
                 return 0;
 
@@ -1445,6 +1447,10 @@ static int __init dm365_init_devices(void)
         platform_device_register(&dm365_mdio_device);
         platform_device_register(&dm365_emac_device);
 
-        return 0;
+        ret = davinci_init_wdt();
+        if (ret)
+                pr_warn("%s: watchdog init failed: %d\n", __func__, ret);
+
+        return ret;
 }
 postcore_initcall(dm365_init_devices);
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 5c3e0be95ef3..5debffba4b24 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -964,6 +964,8 @@ int __init dm644x_init_video(struct vpfe_config *vpfe_cfg,
 
 static int __init dm644x_init_devices(void)
 {
+        int ret = 0;
+
         if (!cpu_is_davinci_dm644x())
                 return 0;
 
@@ -972,6 +974,10 @@ static int __init dm644x_init_devices(void)
         platform_device_register(&dm644x_mdio_device);
         platform_device_register(&dm644x_emac_device);
 
-        return 0;
+        ret = davinci_init_wdt();
+        if (ret)
+                pr_warn("%s: watchdog init failed: %d\n", __func__, ret);
+
+        return ret;
 }
 postcore_initcall(dm644x_init_devices);
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 81768dd47096..332d00d24dc2 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -955,12 +955,18 @@ void __init dm646x_init(void)
 
 static int __init dm646x_init_devices(void)
 {
+        int ret = 0;
+
         if (!cpu_is_davinci_dm646x())
                 return 0;
 
         platform_device_register(&dm646x_mdio_device);
         platform_device_register(&dm646x_emac_device);
 
-        return 0;
+        ret = davinci_init_wdt();
+        if (ret)
+                pr_warn("%s: watchdog init failed: %d\n", __func__, ret);
+
+        return ret;
 }
 postcore_initcall(dm646x_init_devices);