ramips: introduce ramips_soc_prom_init and move SoC detection into that

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

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c
index 943f8e1..8d394bb 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c
@@ -310,10 +310,7 @@ static struct resource rt3883_wlan_resources[] = {
        },
 };
 
-static struct rt2x00_platform_data rt3883_wlan_data = {
-       .eeprom_file_name       = "RT3883.eeprom",
-};
-
+struct rt2x00_platform_data rt3883_wlan_data;
 static struct platform_device rt3883_wlan_device = {
        .name           = "rt2800_wmac",
        .resource       = rt3883_wlan_resources,
@@ -325,6 +322,7 @@ static struct platform_device rt3883_wlan_device = {
 
 void __init rt3883_register_wlan(void)
 {
+       rt3883_wlan_data.eeprom_file_name = "RT3883.eeprom",
        platform_device_register(&rt3883_wlan_device);
 }
 
@@ -365,8 +363,7 @@ static struct resource rt3883_nand_resources[] = {
        },
 };
 
-static struct ramips_nand_platform_data rt3883_nand_data;
-
+struct ramips_nand_platform_data rt3883_nand_data;
 static struct platform_device rt3883_nand_device = {
        .name           = RAMIPS_NAND_DRIVER_NAME,
        .id             = -1,
@@ -377,9 +374,7 @@ static struct platform_device rt3883_nand_device = {
        },
 };
 
-void __init rt3883_register_nand(struct mtd_partition *parts, int nr_parts)
+void __init rt3883_register_nand(void)
 {
-       rt3883_nand_data.parts = parts;
-       rt3883_nand_data.nr_parts = nr_parts;
        platform_device_register(&rt3883_nand_device);
 }