Changeset 34398


Ignore:
Timestamp:
2012-11-27T19:42:49+01:00 (5 years ago)
Author:
florian
Message:

[ar7] use physmap-flash part_probe_types

Signed-off-by: Florian Fainelli <florian@…>

Location:
trunk/target/linux/ar7
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar7/patches-3.3/110-flash.patch

    r33752 r34398  
    1 --- a/drivers/mtd/maps/physmap.c 
    2 +++ b/drivers/mtd/maps/physmap.c 
    3 @@ -78,7 +78,7 @@ static const char *rom_probe_types[] = { 
    4                                         "map_rom", 
    5                                         NULL }; 
    6  static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs", 
    7 -                                         NULL }; 
    8 +                                         "ar7part", NULL }; 
    9   
    10  static int physmap_flash_probe(struct platform_device *dev) 
    11  { 
    121--- a/drivers/mtd/Makefile 
    132+++ b/drivers/mtd/Makefile 
     
    2312--- a/arch/mips/ar7/platform.c 
    2413+++ b/arch/mips/ar7/platform.c 
    25 @@ -199,7 +199,7 @@ static struct resource physmap_flash_res 
     14@@ -199,11 +199,14 @@ static struct resource physmap_flash_res 
    2615        .name   = "mem", 
    2716        .flags  = IORESOURCE_MEM, 
     
    3120 }; 
    3221  
     22+static const char *ar7_probe_types[] = { "ar7part", NULL }; 
     23+ 
    3324 static struct physmap_flash_data physmap_flash_data = { 
     25        .width  = 2, 
     26+       .part_probe_types = ar7_probe_types, 
     27 }; 
     28  
     29 static struct platform_device physmap_flash = { 
  • trunk/target/linux/ar7/patches-3.3/320-ac49x-mtd-partitions.patch

    r34146 r34398  
    1 --- a/drivers/mtd/maps/physmap.c 
    2 +++ b/drivers/mtd/maps/physmap.c 
    3 @@ -78,7 +78,7 @@ static const char *rom_probe_types[] = { 
    4                                         "map_rom", 
    5                                         NULL }; 
    6  static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs", 
    7 -                                         "ar7part", NULL }; 
    8 +                                         "ac49xpart", "ar7part", NULL }; 
    9   
    10  static int physmap_flash_probe(struct platform_device *dev) 
    11  { 
    121--- a/drivers/mtd/Kconfig 
    132+++ b/drivers/mtd/Kconfig 
     
    3423 obj-$(CONFIG_MTD_AR7_PARTS)    += ar7part.o titanpart.o 
    3524 obj-$(CONFIG_MTD_BCM63XX_PARTS)        += bcm63xxpart.o 
     25--- a/arch/mips/ar7/platform.c 
     26+++ b/arch/mips/ar7/platform.c 
     27@@ -202,7 +202,7 @@ static struct resource physmap_flash_res 
     28        .end    = 0x11ffffff, 
     29 }; 
     30  
     31-static const char *ar7_probe_types[] = { "ar7part", NULL }; 
     32+static const char *ar7_probe_types[] = { "ac49xpart", "ar7part", NULL }; 
     33  
     34 static struct physmap_flash_data physmap_flash_data = { 
     35        .width  = 2, 
  • trunk/target/linux/ar7/patches-3.3/925-actiontec_leds.patch

    r33756 r34398  
    11--- a/arch/mips/ar7/platform.c 
    22+++ b/arch/mips/ar7/platform.c 
    3 @@ -462,31 +462,22 @@ static struct gpio_led fb_fon_leds[] = { 
     3@@ -465,31 +465,22 @@ static struct gpio_led fb_fon_leds[] = { 
    44        }, 
    55 }; 
     
    3636        }, 
    3737         { 
    38 @@ -494,6 +485,44 @@ static struct gpio_led gt701_leds[] = { 
     38@@ -497,6 +488,44 @@ static struct gpio_led gt701_leds[] = { 
    3939                 .gpio                   = 10, 
    4040                 .active_low             = 1, 
     
    8181  
    8282 static struct gpio_led_platform_data ar7_led_data; 
    83 @@ -537,9 +566,9 @@ static void __init detect_leds(void) 
     83@@ -540,9 +569,9 @@ static void __init detect_leds(void) 
    8484        } else if (strstr(prid, "CYWM") || strstr(prid, "CYWL")) { 
    8585                ar7_led_data.num_leds = ARRAY_SIZE(titan_leds); 
  • trunk/target/linux/ar7/patches-3.3/972-cpmac_fixup.patch

    r33751 r34398  
    11--- a/arch/mips/ar7/platform.c 
    22+++ b/arch/mips/ar7/platform.c 
    3 @@ -709,26 +709,23 @@ static int __init ar7_register_devices(v 
     3@@ -712,26 +712,23 @@ static int __init ar7_register_devices(v 
    44        } 
    55  
     
    4141        detect_leds(); 
    4242        res = platform_device_register(&ar7_gpio_leds); 
    43 @@ -741,8 +738,10 @@ static int __init ar7_register_devices(v 
     43@@ -744,8 +741,10 @@ static int __init ar7_register_devices(v 
    4444  
    4545        /* Register watchdog only if enabled in hardware */ 
  • trunk/target/linux/ar7/patches-3.6/110-flash.patch

    r34154 r34398  
    1 --- a/drivers/mtd/maps/physmap.c 
    2 +++ b/drivers/mtd/maps/physmap.c 
    3 @@ -94,7 +94,7 @@ static const char *rom_probe_types[] = { 
    4                                         "map_rom", 
    5                                         NULL }; 
    6  static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs", 
    7 -                                         NULL }; 
    8 +                                         "ar7part", NULL }; 
    9   
    10  static int physmap_flash_probe(struct platform_device *dev) 
    11  { 
    121--- a/drivers/mtd/Makefile 
    132+++ b/drivers/mtd/Makefile 
     
    2312--- a/arch/mips/ar7/platform.c 
    2413+++ b/arch/mips/ar7/platform.c 
    25 @@ -199,7 +199,7 @@ static struct resource physmap_flash_res 
     14@@ -199,11 +199,14 @@ static struct resource physmap_flash_res 
    2615        .name   = "mem", 
    2716        .flags  = IORESOURCE_MEM, 
     
    3120 }; 
    3221  
     22+static const char *ar7_probe_types[] = { "ar7part", NULL }; 
     23+ 
    3324 static struct physmap_flash_data physmap_flash_data = { 
     25        .width  = 2, 
     26+       .part_probe_types = ar7_probe_types, 
     27 }; 
     28  
     29 static struct platform_device physmap_flash = { 
  • trunk/target/linux/ar7/patches-3.6/320-ac49x-mtd-partitions.patch

    r34154 r34398  
    1 --- a/drivers/mtd/maps/physmap.c 
    2 +++ b/drivers/mtd/maps/physmap.c 
    3 @@ -94,7 +94,7 @@ static const char *rom_probe_types[] = { 
    4                                         "map_rom", 
    5                                         NULL }; 
    6  static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs", 
    7 -                                         "ar7part", NULL }; 
    8 +                                         "ac49xpart", "ar7part", NULL }; 
    9   
    10  static int physmap_flash_probe(struct platform_device *dev) 
    11  { 
    121--- a/drivers/mtd/Kconfig 
    132+++ b/drivers/mtd/Kconfig 
     
    3423 obj-$(CONFIG_MTD_AR7_PARTS)    += ar7part.o titanpart.o 
    3524 obj-$(CONFIG_MTD_BCM63XX_PARTS)        += bcm63xxpart.o 
     25--- a/arch/mips/ar7/platform.c 
     26+++ b/arch/mips/ar7/platform.c 
     27@@ -202,7 +202,7 @@ static struct resource physmap_flash_res 
     28        .end    = 0x11ffffff, 
     29 }; 
     30  
     31-static const char *ar7_probe_types[] = { "ar7part", NULL }; 
     32+static const char *ar7_probe_types[] = { "ac49xpart", "ar7part", NULL }; 
     33  
     34 static struct physmap_flash_data physmap_flash_data = { 
     35        .width  = 2, 
  • trunk/target/linux/ar7/patches-3.6/925-actiontec_leds.patch

    r34154 r34398  
    11--- a/arch/mips/ar7/platform.c 
    22+++ b/arch/mips/ar7/platform.c 
    3 @@ -462,31 +462,22 @@ static struct gpio_led fb_fon_leds[] = { 
     3@@ -465,31 +465,22 @@ static struct gpio_led fb_fon_leds[] = { 
    44        }, 
    55 }; 
     
    3636        }, 
    3737         { 
    38 @@ -494,6 +485,44 @@ static struct gpio_led gt701_leds[] = { 
     38@@ -497,6 +488,44 @@ static struct gpio_led gt701_leds[] = { 
    3939                 .gpio                   = 10, 
    4040                 .active_low             = 1, 
     
    8181  
    8282 static struct gpio_led_platform_data ar7_led_data; 
    83 @@ -537,9 +566,9 @@ static void __init detect_leds(void) 
     83@@ -540,9 +569,9 @@ static void __init detect_leds(void) 
    8484        } else if (strstr(prid, "CYWM") || strstr(prid, "CYWL")) { 
    8585                ar7_led_data.num_leds = ARRAY_SIZE(titan_leds); 
  • trunk/target/linux/ar7/patches-3.6/972-cpmac_fixup.patch

    r34154 r34398  
    11--- a/arch/mips/ar7/platform.c 
    22+++ b/arch/mips/ar7/platform.c 
    3 @@ -709,26 +709,23 @@ static int __init ar7_register_devices(v 
     3@@ -712,26 +712,23 @@ static int __init ar7_register_devices(v 
    44        } 
    55  
     
    4141        detect_leds(); 
    4242        res = platform_device_register(&ar7_gpio_leds); 
    43 @@ -741,8 +738,10 @@ static int __init ar7_register_devices(v 
     43@@ -744,8 +741,10 @@ static int __init ar7_register_devices(v 
    4444  
    4545        /* Register watchdog only if enabled in hardware */ 
Note: See TracChangeset for help on using the changeset viewer.