ARM: ux500: Clean-up temporary Device Tree enablement helpers
authorLee Jones <lee.jones@linaro.org>
Wed, 27 Jun 2012 07:42:08 +0000 (08:42 +0100)
committerLee Jones <lee.jones@linaro.org>
Thu, 20 Sep 2012 10:32:28 +0000 (12:32 +0200)
Here we remove some of the extra overhead we introduced to make
DT:ing the Snowball platform easier.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
arch/arm/mach-ux500/cpu-db8500.c

index db3c52d..38b7f9c 100644 (file)
@@ -138,10 +138,6 @@ static struct platform_device *platform_devs[] __initdata = {
        &db8500_prcmu_device,
 };
 
-static struct platform_device *of_platform_devs[] __initdata = {
-       &u8500_dma40_device,
-};
-
 static resource_size_t __initdata db8500_gpio_base[] = {
        U8500_GPIOBANK0_BASE,
        U8500_GPIOBANK1_BASE,
@@ -235,7 +231,6 @@ struct device * __init u8500_init_devices(struct ab8500_platform_data *ab8500)
 struct device * __init u8500_of_init_devices(void)
 {
        struct device *parent;
-       int i;
 
        parent = db8500_soc_device_init();
 
@@ -244,8 +239,7 @@ struct device * __init u8500_of_init_devices(void)
        platform_device_register_data(parent,
                "cpufreq-u8500", -1, NULL, 0);
 
-       for (i = 0; i < ARRAY_SIZE(of_platform_devs); i++)
-               of_platform_devs[i]->dev.parent = parent;
+       u8500_dma40_device.dev.parent = parent;
 
        /*
         * Devices to be DT:ed:
@@ -253,7 +247,7 @@ struct device * __init u8500_of_init_devices(void)
         *   db8500_pmu_device   = done
         *   db8500_prcmu_device = done
         */
-       platform_add_devices(of_platform_devs, ARRAY_SIZE(of_platform_devs));
+       platform_device_register(&u8500_dma40_device);
 
        return parent;
 }