ramips: rt288x: remove per-board physmap_flash_data instances

[openwrt.git] / target / linux / ramips / files / arch / mips / ralink / rt288x / devices.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
index 6a5cf39..7f4d450 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
@@ -16,6 +16,7 @@
 #include <linux/etherdevice.h>
 #include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/rt2x00_platform.h>
 
 #include <asm/addrspace.h>
 
@@ -34,10 +35,14 @@ static struct resource rt288x_flash0_resources[] = {
        },
 };
 
+struct physmap_flash_data rt288x_flash0_data;
 static struct platform_device rt288x_flash0_device = {
        .name           = "physmap-flash",
        .resource       = rt288x_flash0_resources,
        .num_resources  = ARRAY_SIZE(rt288x_flash0_resources),
+       .dev = {
+               .platform_data = &rt288x_flash0_data,
+       },
 };
 
 static struct resource rt288x_flash1_resources[] = {
@@ -49,17 +54,21 @@ static struct resource rt288x_flash1_resources[] = {
        },
 };
 
+struct physmap_flash_data rt288x_flash1_data;
 static struct platform_device rt288x_flash1_device = {
        .name           = "physmap-flash",
        .resource       = rt288x_flash1_resources,
        .num_resources  = ARRAY_SIZE(rt288x_flash1_resources),
+       .dev = {
+               .platform_data = &rt288x_flash1_data,
+       },
 };
 
 static int rt288x_flash_instance __initdata;
-void __init rt288x_register_flash(unsigned int id,
-                                 struct physmap_flash_data *pdata)
+void __init rt288x_register_flash(unsigned int id)
 {
        struct platform_device *pdev;
+       struct physmap_flash_data *pdata;
        u32 t;
        int reg;
 
@@ -79,6 +88,7 @@ void __init rt288x_register_flash(unsigned int id,
        t = rt288x_memc_rr(reg);
        t = (t >> FLASH_CFG_WIDTH_SHIFT) & FLASH_CFG_WIDTH_MASK;
 
+       pdata = pdev->dev.platform_data;
        switch (t) {
        case FLASH_CFG_WIDTH_8BIT:
                pdata->width = 1;
@@ -94,7 +104,6 @@ void __init rt288x_register_flash(unsigned int id,
                return;
        }
 
-       pdev->dev.platform_data = pdata;
        pdev->id = rt288x_flash_instance;
 
        platform_device_register(pdev);
@@ -113,17 +122,19 @@ static struct resource rt288x_wifi_resources[] = {
        },
 };
 
+static struct rt2x00_platform_data rt288x_wifi_data;
 static struct platform_device rt288x_wifi_device = {
        .name                   = "rt2800_wmac",
        .resource               = rt288x_wifi_resources,
        .num_resources  = ARRAY_SIZE(rt288x_wifi_resources),
        .dev = {
-               .platform_data = NULL,
+               .platform_data = &rt288x_wifi_data,
        }
 };
 
 void __init rt288x_register_wifi(void)
 {
+       rt288x_wifi_data.eeprom_file_name = "RT288X.eeprom";
        platform_device_register(&rt288x_wifi_device);
 }
 
@@ -171,3 +182,30 @@ void __init rt288x_register_ethernet(void)
 
        platform_device_register(&rt288x_eth_device);
 }
+
+static struct resource rt288x_wdt_resources[] = {
+       {
+               .start  = RT2880_TIMER_BASE,
+               .end    = RT2880_TIMER_BASE + RT2880_TIMER_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+};
+
+static struct platform_device rt288x_wdt_device = {
+       .name           = "ramips-wdt",
+       .id             = -1,
+       .resource       = rt288x_wdt_resources,
+       .num_resources  = ARRAY_SIZE(rt288x_wdt_resources),
+};
+
+void __init rt288x_register_wdt(void)
+{
+       u32 t;
+
+       /* enable WDT reset output on pin SRAM_CS_N */
+       t = rt288x_sysc_rr(SYSC_REG_CLKCFG);
+       t |= CLKCFG_SRAM_CS_N_WDT;
+       rt288x_sysc_wr(t, SYSC_REG_CLKCFG);
+
+       platform_device_register(&rt288x_wdt_device);
+}