ARM: ux500: Purge support for registering the RTC when booting with ATAGs

It's time to remove all ATAG support from ux500 and rely solely on
Device Tree booting. This patch is part of that endeavour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index b236ec11c02d23bcee3314203a56232618421e12..d98ddb361e85cae3468ab744f879832b5e159418 100644 (file)
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -191,7 +191,6 @@ struct device * __init u8500_init_devices(void)
 
        parent = db8500_soc_device_init();
 
-       db8500_add_rtc(parent);
        db8500_add_gpios(parent);
 
        for (i = 0; i < ARRAY_SIZE(platform_devs); i++)

diff --git a/arch/arm/mach-ux500/devices-common.h b/arch/arm/mach-ux500/devices-common.h
index 030f5a0fe245a55c709726a9c9ff580e7af5497f..360112e2e23a0bb4b287f36439c7c67da1393e40 100644 (file)
--- a/arch/arm/mach-ux500/devices-common.h
+++ b/arch/arm/mach-ux500/devices-common.h
@@ -33,13 +33,6 @@ dbx500_add_uart(struct device *parent, const char *name, resource_size_t base,
        return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0, pdata, 0);
 }
 
-static inline struct amba_device *
-dbx500_add_rtc(struct device *parent, resource_size_t base, int irq)
-{
-       return amba_apb_device_add(parent, "rtc-pl031", base, SZ_4K, irq,
-                               0, NULL, 0);
-}
-
 struct nmk_gpio_platform_data;
 
 void dbx500_add_gpios(struct device *parent, resource_size_t *base, int num,

diff --git a/arch/arm/mach-ux500/devices-db8500.h b/arch/arm/mach-ux500/devices-db8500.h
index 9352400024403120f0a1cdafcdb61e2bc8f7e766..0b523b50aa06bd4b8feae875bd82c0126c734960 100644 (file)
--- a/arch/arm/mach-ux500/devices-db8500.h
+++ b/arch/arm/mach-ux500/devices-db8500.h
@@ -26,9 +26,6 @@ db8500_add_ssp(struct device *parent, const char *name, resource_size_t base,
        return amba_ahb_device_add(parent, name, base, SZ_4K, irq, 0, pdata, 0);
 }
 
-#define db8500_add_rtc(parent) \
-       dbx500_add_rtc(parent, U8500_RTC_BASE, IRQ_DB8500_RTC);
-
 #define db8500_add_ssp0(parent, pdata) \
        db8500_add_ssp(parent, "ssp0", U8500_SSP0_BASE, \
                       IRQ_DB8500_SSP0, pdata)