ARM: nomadik: delete old board files

The Device Tree support on Nomadik can do everything the old board
files could do, so delete the old board files and make the nomadik
select CONFIG_OF.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 2 insertions, 110 deletions

diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
index 5ad301e4eb2f..60a18e12e6ce 100644
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -48,53 +48,6 @@
 #include <asm/cacheflush.h>
 #include <asm/hardware/cache-l2x0.h>
 
-#include "cpu-8815.h"
-
-/* The 8815 has 4 GPIO blocks, let's register them immediately */
-static resource_size_t __initdata cpu8815_gpio_base[] = {
-        NOMADIK_GPIO0_BASE,
-        NOMADIK_GPIO1_BASE,
-        NOMADIK_GPIO2_BASE,
-        NOMADIK_GPIO3_BASE,
-};
-
-static struct platform_device *
-cpu8815_add_gpio(int id, resource_size_t addr, int irq,
-                 struct nmk_gpio_platform_data *pdata)
-{
-        struct resource resources[] = {
-                {
-                        .start  = addr,
-                        .end    = addr + 127,
-                        .flags  = IORESOURCE_MEM,
-                },
-                {
-                        .start  = irq,
-                        .end    = irq,
-                        .flags  = IORESOURCE_IRQ,
-                }
-        };
-
-        return platform_device_register_resndata(NULL, "gpio", id,
-                                resources, ARRAY_SIZE(resources),
-                                pdata, sizeof(*pdata));
-}
-
-void cpu8815_add_gpios(resource_size_t *base, int num, int irq,
-                       struct nmk_gpio_platform_data *pdata)
-{
-        int first = 0;
-        int i;
-
-        for (i = 0; i < num; i++, first += 32, irq++) {
-                pdata->first_gpio = first;
-                pdata->first_irq = NOMADIK_GPIO_TO_IRQ(first);
-                pdata->num_gpio = 32;
-
-                cpu8815_add_gpio(i, base[i], irq, pdata);
-        }
-}
-
 static unsigned long out_low[] = { PIN_OUTPUT_LOW };
 static unsigned long out_high[] = { PIN_OUTPUT_HIGH };
 static unsigned long in_nopull[] = { PIN_INPUT_NOPULL };
@@ -137,38 +90,6 @@ static struct pinctrl_map __initdata nhk8815_pinmap[] = {
         PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO74_C20", in_pullup),
 };
 
-static inline void
-cpu8815_add_pinctrl(struct device *parent, const char *name)
-{
-        struct platform_device_info pdevinfo = {
-                .parent = parent,
-                .name = name,
-                .id = -1,
-        };
-
-        pinctrl_register_mappings(nhk8815_pinmap, ARRAY_SIZE(nhk8815_pinmap));
-        platform_device_register_full(&pdevinfo);
-}
-
-static int __init cpu8815_init(void)
-{
-        struct nmk_gpio_platform_data pdata = {
-                /* No custom data yet */
-        };
-
-        /* For e.g. device tree boots */
-        if (!machine_is_nomadik())
-                return 0;
-
-        cpu8815_add_gpios(cpu8815_gpio_base, ARRAY_SIZE(cpu8815_gpio_base),
-                          IRQ_GPIO0, &pdata);
-        cpu8815_add_pinctrl(NULL, "pinctrl-stn8815");
-        amba_apb_device_add(NULL, "rng", NOMADIK_RNG_BASE, SZ_4K, 0, 0, NULL, 0);
-        amba_apb_device_add(NULL, "rtc-pl031", NOMADIK_RTC_BASE, SZ_4K, IRQ_RTC_RTT, 0, NULL, 0);
-        return 0;
-}
-arch_initcall(cpu8815_init);
-
 /* All SoC devices live in the same area (see hardware.h) */
 static struct map_desc nomadik_io_desc[] __initdata = {
         {
@@ -180,37 +101,12 @@ static struct map_desc nomadik_io_desc[] __initdata = {
         /* static ram and secured ram may be added later */
 };
 
-void __init cpu8815_map_io(void)
+static void __init cpu8815_map_io(void)
 {
         iotable_init(nomadik_io_desc, ARRAY_SIZE(nomadik_io_desc));
 }
 
-void __init cpu8815_init_irq(void)
-{
-        /* This modified VIC cell has two register blocks, at 0 and 0x20 */
-        vic_init(io_p2v(NOMADIK_IC_BASE + 0x00), IRQ_VIC_START +  0, ~0, 0);
-        vic_init(io_p2v(NOMADIK_IC_BASE + 0x20), IRQ_VIC_START + 32, ~0, 0);
-
-        /*
-         * Init clocks here so that they are available for system timer
-         * initialization.
-         */
-        nomadik_clk_init();
-}
-
-/*
- * This function is called from the board init ("init_machine").
- */
- void __init cpu8815_platform_init(void)
-{
-#ifdef CONFIG_CACHE_L2X0
-        /* At full speed latency must be >=2, so 0x249 in low bits */
-        l2x0_init(io_p2v(NOMADIK_L2CC_BASE), 0x00730249, 0xfe000fff);
-#endif
-         return;
-}
-
-void cpu8815_restart(char mode, const char *cmd)
+static void cpu8815_restart(char mode, const char *cmd)
 {
         void __iomem *src_rstsr = io_p2v(NOMADIK_SRC_BASE + 0x18);
 
@@ -220,8 +116,6 @@ void cpu8815_restart(char mode, const char *cmd)
         writel(1, src_rstsr);
 }
 
-#ifdef CONFIG_OF
-
 /* Initial value for SRC control register: all timers use MXTAL/8 source */
 #define SRC_CR_INIT_MASK        0x00007fff
 #define SRC_CR_INIT_VAL         0x2aaa8000
@@ -393,5 +287,3 @@ DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815")
         .restart        = cpu8815_restart,
         .dt_compat      = cpu8815_board_compat,
 MACHINE_END
-
-#endif