22 files changed, 86 insertions, 64 deletions

diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig
index abe61bf379d2..1da5d9e48224 100644
--- a/arch/arm/configs/realview-smp_defconfig
+++ b/arch/arm/configs/realview-smp_defconfig
@@ -76,8 +76,10 @@ CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_VERSATILE=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1307=y
 CONFIG_RTC_DRV_PL031=y
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index 7079cbe898a8..d02e9d911bb7 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -75,8 +75,10 @@ CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_VERSATILE=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1307=y
 CONFIG_RTC_DRV_PL031=y
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index 073541a50e23..d52b4ffe2012 100644
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -61,6 +61,9 @@ CONFIG_SND_ARMAACI=m
 CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=m
 CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_VERSATILE=y
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_EXT2_FS=y
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 49c914cd9c7a..9f19636fea2f 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -11,7 +11,6 @@ menu "Broadcom SoC Selection"
 
 config ARCH_BCM_MOBILE
         bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
-        depends on MMU
         select ARCH_REQUIRE_GPIOLIB
         select ARM_ERRATA_754322
         select ARM_ERRATA_764369 if SMP
@@ -33,10 +32,7 @@ config ARCH_BCM2835
         select ARM_AMBA
         select ARM_ERRATA_411920
         select ARM_TIMER_SP804
-        select CLKDEV_LOOKUP
         select CLKSRC_OF
-        select CPU_V6
-        select GENERIC_CLOCKEVENTS
         select PINCTRL
         select PINCTRL_BCM2835
         help
@@ -45,14 +41,10 @@ config ARCH_BCM2835
 
 config ARCH_BCM_5301X
         bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7
-        depends on MMU
         select ARM_GIC
         select CACHE_L2X0
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
-        select HAVE_SMP
-        select COMMON_CLK
-        select GENERIC_CLOCKEVENTS
         select ARM_GLOBAL_TIMER
         select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
         select MIGHT_HAVE_PCI
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 3f73eecbcfb0..bfc5af18e483 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -3,7 +3,6 @@ config ARCH_MVEBU
         select ARCH_SUPPORTS_BIG_ENDIAN
         select CLKSRC_MMIO
         select GENERIC_IRQ_CHIP
-        select IRQ_DOMAIN
         select PINCTRL
         select PLAT_ORION
         select MVEBU_MBUS
@@ -11,7 +10,6 @@ config ARCH_MVEBU
         select ARCH_REQUIRE_GPIOLIB
         select MIGHT_HAVE_PCI
         select PCI_QUIRKS if PCI
-        select OF_ADDRESS_PCI
 
 if ARCH_MVEBU
 
@@ -38,7 +36,6 @@ config MACH_ARMADA_375
         select ARM_ERRATA_753970
         select ARM_GIC
         select ARMADA_375_CLK
-        select CPU_V7
         select MACH_MVEBU_V7
         select PINCTRL_ARMADA_375
         help
@@ -51,7 +48,6 @@ config MACH_ARMADA_38X
         select ARM_ERRATA_753970
         select ARM_GIC
         select ARMADA_38X_CLK
-        select CPU_V7
         select MACH_MVEBU_V7
         select PINCTRL_ARMADA_38X
         help
@@ -86,13 +82,11 @@ config MACH_KIRKWOOD
         select ARCH_REQUIRE_GPIOLIB
         select CPU_FEROCEON
         select KIRKWOOD_CLK
-        select OF_IRQ
         select ORION_IRQCHIP
         select ORION_TIMER
         select PCI
         select PCI_QUIRKS
         select PINCTRL_KIRKWOOD
-        select USE_OF
         help
           Say 'Y' here if you want your kernel to support boards based
           on the Marvell Kirkwood device tree.
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index a028be234334..6aa22147cace 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -3,8 +3,6 @@ config ARCH_QCOM
         select ARCH_REQUIRE_GPIOLIB
         select ARM_GIC
         select CLKSRC_OF
-        select GENERIC_CLOCKEVENTS
-        select HAVE_SMP
         select QCOM_SCM if SMP
         help
           Support for Qualcomm's devicetree based systems.
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 1d5ee5c9a1dc..960b8dd78c44 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -148,6 +148,21 @@ struct platform_device realview_cf_device = {
         },
 };
 
+static struct resource realview_leds_resources[] = {
+        {
+                .start  = REALVIEW_SYS_BASE + REALVIEW_SYS_LED_OFFSET,
+                .end    = REALVIEW_SYS_BASE + REALVIEW_SYS_LED_OFFSET + 4,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+struct platform_device realview_leds_device = {
+        .name           = "versatile-leds",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(realview_leds_resources),
+        .resource       = realview_leds_resources,
+};
+
 static struct resource realview_i2c_resource = {
         .start          = REALVIEW_I2C_BASE,
         .end            = REALVIEW_I2C_BASE + SZ_4K - 1,
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index 602ca5ec52c5..13dc830ef469 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -37,6 +37,7 @@ struct machine_desc;
 
 extern struct platform_device realview_flash_device;
 extern struct platform_device realview_cf_device;
+extern struct platform_device realview_leds_device;
 extern struct platform_device realview_i2c_device;
 extern struct mmci_platform_data realview_mmc0_plat_data;
 extern struct mmci_platform_data realview_mmc1_plat_data;
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index c85ddb2a0ad0..6bb070e80128 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -452,6 +452,7 @@ static void __init realview_eb_init(void)
         realview_flash_register(&realview_eb_flash_resource, 1);
         platform_device_register(&realview_i2c_device);
         platform_device_register(&char_lcd_device);
+        platform_device_register(&realview_leds_device);
         eth_device_register();
         realview_usb_register(realview_eb_isp1761_resources);
 
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index c5eade76461b..173f2c15de49 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -367,6 +367,7 @@ static void __init realview_pb1176_init(void)
         realview_usb_register(realview_pb1176_isp1761_resources);
         platform_device_register(&pmu_device);
         platform_device_register(&char_lcd_device);
+        platform_device_register(&realview_leds_device);
 
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                 struct amba_device *d = amba_devs[i];
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index f4b0962578fe..bde7e6b1fd44 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -347,6 +347,7 @@ static void __init realview_pb11mp_init(void)
         realview_eth_register(NULL, realview_pb11mp_smsc911x_resources);
         platform_device_register(&realview_i2c_device);
         platform_device_register(&realview_cf_device);
+        platform_device_register(&realview_leds_device);
         realview_usb_register(realview_pb11mp_isp1761_resources);
         platform_device_register(&pmu_device);
 
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index 10a3e1d76891..4e57a8599265 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -289,6 +289,7 @@ static void __init realview_pba8_init(void)
         realview_eth_register(NULL, realview_pba8_smsc911x_resources);
         platform_device_register(&realview_i2c_device);
         platform_device_register(&realview_cf_device);
+        platform_device_register(&realview_leds_device);
         realview_usb_register(realview_pba8_isp1761_resources);
         platform_device_register(&pmu_device);
 
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 9d75493e3f0c..72c96caebefa 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -385,6 +385,7 @@ static void __init realview_pbx_init(void)
         realview_eth_register(NULL, realview_pbx_smsc911x_resources);
         platform_device_register(&realview_i2c_device);
         platform_device_register(&realview_cf_device);
+        platform_device_register(&realview_leds_device);
         realview_usb_register(realview_pbx_isp1761_resources);
 
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 0f92ba8e7884..edb1a914deb3 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -205,8 +205,8 @@ config MACH_ARMADILLO800EVA_REFERENCE
         select SND_SOC_WM8978 if SND_SIMPLE_CARD
         select USE_OF
         ---help---
-           Use reference implementation of Aramdillo800 EVA board support
-           which makes a greater use of device tree at the expense
+           Use reference implementation of Armadillo800 EVA board support
+           which makes greater use of device tree at the expense
            of not supporting a number of devices.
 
            This is intended to aid developers
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 8f3c68101d59..a177a7b3bdbd 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -765,7 +765,7 @@ static struct platform_device *r8a7740_late_devices[] __initdata = {
  *      "Media RAM (MERAM)" on r8a7740 documentation
  */
 #define MEBUFCNTR       0xFE950098
-void r8a7740_meram_workaround(void)
+void __init r8a7740_meram_workaround(void)
 {
         void __iomem *reg;
 
@@ -869,17 +869,6 @@ void __init r8a7740_add_early_devices(void)
 
 #ifdef CONFIG_USE_OF
 
-void __init r8a7740_add_early_devices_dt(void)
-{
-        shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
-
-        early_platform_add_devices(r8a7740_early_devices,
-                                   ARRAY_SIZE(r8a7740_early_devices));
-
-        /* setup early console here as well */
-        shmobile_setup_console();
-}
-
 void __init r8a7740_add_standard_devices_dt(void)
 {
         platform_add_devices(r8a7740_devices_dt,
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 27301278c208..f8176b051be4 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -1037,11 +1037,7 @@ void __init sh7372_add_early_devices_dt(void)
 {
         shmobile_setup_delay(800, 1, 3); /* Cortex-A8 @ 800MHz */
 
-        early_platform_add_devices(sh7372_early_devices,
-                                   ARRAY_SIZE(sh7372_early_devices));
-
-        /* setup early console here as well */
-        shmobile_setup_console();
+        sh7372_add_early_devices();
 }
 
 void __init sh7372_add_standard_devices_dt(void)
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index f2c89fb8fca9..be83ba25f81b 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -310,6 +310,21 @@ static struct platform_device char_lcd_device = {
         .resource       =       char_lcd_resources,
 };
 
+static struct resource leds_resources[] = {
+        {
+                .start  = VERSATILE_SYS_BASE + VERSATILE_SYS_LED_OFFSET,
+                .end    = VERSATILE_SYS_BASE + VERSATILE_SYS_LED_OFFSET + 4,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device leds_device = {
+        .name           = "versatile-leds",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(leds_resources),
+        .resource       = leds_resources,
+};
+
 /*
  * Clock handling
  */
@@ -795,6 +810,7 @@ void __init versatile_init(void)
         platform_device_register(&versatile_i2c_device);
         platform_device_register(&smc91x_device);
         platform_device_register(&char_lcd_device);
+        platform_device_register(&leds_device);
 
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                 struct amba_device *d = amba_devs[i];
diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig
index 2c4332b9f948..fce41e93b6a4 100644
--- a/arch/arm/plat-versatile/Kconfig
+++ b/arch/arm/plat-versatile/Kconfig
@@ -6,12 +6,6 @@ config PLAT_VERSATILE_CLOCK
 config PLAT_VERSATILE_CLCD
         bool
 
-config PLAT_VERSATILE_LEDS
-        def_bool y if NEW_LEDS
-        depends on ARCH_REALVIEW || ARCH_VERSATILE
-        select LEDS_CLASS
-        select LEDS_TRIGGERS
-
 config PLAT_VERSATILE_SCHED_CLOCK
         def_bool y
 
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile
index f88d448b629c..2e0c472958ae 100644
--- a/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@ -2,6 +2,5 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
 
 obj-$(CONFIG_PLAT_VERSATILE_CLOCK) += clock.o
 obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o
-obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o
 obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o
 obj-$(CONFIG_SMP) += headsmp.o platsmp.o
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 6de9dfbf61c1..39e717797cc0 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -487,6 +487,14 @@ config LEDS_BLINKM
           This option enables support for the BlinkM RGB LED connected
           through I2C. Say Y to enable support for the BlinkM LED.
 
+config LEDS_VERSATILE
+        tristate "LED support for the ARM Versatile and RealView"
+        depends on ARCH_REALVIEW || ARCH_VERSATILE
+        depends on LEDS_CLASS
+        help
+          This option enabled support for the LEDs on the ARM Versatile
+          and RealView boards. Say Y to enabled these.
+
 comment "LED Triggers"
 source "drivers/leds/trigger/Kconfig"
 
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 3cd76dbd9be2..8b4c956e11ba 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -54,6 +54,7 @@ obj-$(CONFIG_LEDS_ASIC3)		+= leds-asic3.o
 obj-$(CONFIG_LEDS_MAX8997)              += leds-max8997.o
 obj-$(CONFIG_LEDS_LM355x)               += leds-lm355x.o
 obj-$(CONFIG_LEDS_BLINKM)               += leds-blinkm.o
+obj-$(CONFIG_LEDS_VERSATILE)            += leds-versatile.o
 
 # LED SPI Drivers
 obj-$(CONFIG_LEDS_DAC124S085)           += leds-dac124s085.o
diff --git a/arch/arm/plat-versatile/leds.c b/drivers/leds/leds-versatile.c
index d2490d00b46c..80553022d661 100644
--- a/arch/arm/plat-versatile/leds.c
+++ b/drivers/leds/leds-versatile.c
@@ -7,22 +7,14 @@
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/leds.h>
-
-#include <mach/hardware.h>
-#include <mach/platform.h>
-
-#ifdef VERSATILE_SYS_BASE
-#define LEDREG  (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_LED_OFFSET)
-#endif
-
-#ifdef REALVIEW_SYS_BASE
-#define LEDREG  (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LED_OFFSET)
-#endif
+#include <linux/platform_device.h>
 
 struct versatile_led {
+        void __iomem            *base;
         struct led_classdev     cdev;
         u8                      mask;
 };
@@ -50,30 +42,37 @@ static void versatile_led_set(struct led_classdev *cdev,
 {
         struct versatile_led *led = container_of(cdev,
                                                  struct versatile_led, cdev);
-        u32 reg = readl(LEDREG);
+        u32 reg = readl(led->base);
 
         if (b != LED_OFF)
                 reg |= led->mask;
         else
                 reg &= ~led->mask;
-        writel(reg, LEDREG);
+        writel(reg, led->base);
 }
 
 static enum led_brightness versatile_led_get(struct led_classdev *cdev)
 {
         struct versatile_led *led = container_of(cdev,
                                                  struct versatile_led, cdev);
-        u32 reg = readl(LEDREG);
+        u32 reg = readl(led->base);
 
         return (reg & led->mask) ? LED_FULL : LED_OFF;
 }
 
-static int __init versatile_leds_init(void)
+static int versatile_leds_probe(struct platform_device *dev)
 {
         int i;
+        struct resource *res;
+        void __iomem *base;
 
-        /* All ON */
-        writel(0xff, LEDREG);
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+        base = devm_ioremap_resource(&dev->dev, res);
+        if (IS_ERR(base))
+                return PTR_ERR(base);
+
+        /* All off */
+        writel(0, base);
         for (i = 0; i < ARRAY_SIZE(versatile_leds); i++) {
                 struct versatile_led *led;
 
@@ -81,6 +80,7 @@ static int __init versatile_leds_init(void)
                 if (!led)
                         break;
 
+                led->base = base;
                 led->cdev.name = versatile_leds[i].name;
                 led->cdev.brightness_set = versatile_led_set;
                 led->cdev.brightness_get = versatile_led_get;
@@ -96,8 +96,15 @@ static int __init versatile_leds_init(void)
         return 0;
 }
 
-/*
- * Since we may have triggers on any subsystem, defer registration
- * until after subsystem_init.
- */
-fs_initcall(versatile_leds_init);
+static struct platform_driver versatile_leds_driver = {
+        .driver = {
+                .name   = "versatile-leds",
+        },
+        .probe = versatile_leds_probe,
+};
+
+module_platform_driver(versatile_leds_driver);
+
+MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
+MODULE_DESCRIPTION("ARM Versatile LED driver");
+MODULE_LICENSE("GPL v2");