ramips: use uncached address in detect_mem_size

[openwrt.git] / target / linux / ramips / files / arch / mips / ralink / rt305x / mach-dir-300-revb.c

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
index c0167bc..70a2245 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c
@@ -31,7 +31,6 @@
 
 #define DIR_300B_BUTTONS_POLL_INTERVAL 20
 
 
 #define DIR_300B_BUTTONS_POLL_INTERVAL 20
 

-#ifdef CONFIG_MTD_PARTITIONS

 static struct mtd_partition dir_300b_partitions[] = {
        {
                .name   = "u-boot",
 static struct mtd_partition dir_300b_partitions[] = {
        {
                .name   = "u-boot",


@@ -62,13 +61,10 @@ static struct mtd_partition dir_300b_partitions[] = {
                .size   = 0x3b0000,
        }
 };
                .size   = 0x3b0000,
        }
 };

-#endif /* CONFIG_MTD_PARTITIONS */

 
 static struct physmap_flash_data dir_300b_flash_data = {
 
 static struct physmap_flash_data dir_300b_flash_data = {

-#ifdef CONFIG_MTD_PARTITIONS

        .nr_parts       = ARRAY_SIZE(dir_300b_partitions),
        .parts          = dir_300b_partitions,
        .nr_parts       = ARRAY_SIZE(dir_300b_partitions),
        .parts          = dir_300b_partitions,

-#endif

 };
 
 static struct gpio_led dir_300b_leds_gpio[] __initdata = {
 };
 
 static struct gpio_led dir_300b_leds_gpio[] __initdata = {


@@ -110,6 +106,7 @@ static void __init dir_300b_init(void)
        rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
        rt305x_register_flash(0, &dir_300b_flash_data);
        rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
 
        rt305x_register_flash(0, &dir_300b_flash_data);

+       rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_LLLLW;

        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_300b_leds_gpio),
                                  dir_300b_leds_gpio);
        rt305x_register_ethernet();
        ramips_register_gpio_leds(-1, ARRAY_SIZE(dir_300b_leds_gpio),
                                  dir_300b_leds_gpio);


@@ -122,3 +119,9 @@ static void __init dir_300b_init(void)
 
 MIPS_MACHINE(RAMIPS_MACH_DIR_300_B1, "DIR-300-B1", "D-Link DIR-300 B1",
             dir_300b_init);
 
 MIPS_MACHINE(RAMIPS_MACH_DIR_300_B1, "DIR-300-B1", "D-Link DIR-300 B1",
             dir_300b_init);

+
+MIPS_MACHINE(RAMIPS_MACH_DIR_600_B1, "DIR-600-B1", "D-Link DIR-600 B1",
+            dir_300b_init);
+
+MIPS_MACHINE(RAMIPS_MACH_DIR_600_B2, "DIR-600-B2", "D-Link DIR-600 B2",
+            dir_300b_init);