[brcm63xx] remove gpiodev, prefer sysfs gpio

SVN-Revision: 27284

diff --git a/target/linux/brcm63xx/patches-2.6.39/110-gpiodev.patch b/target/linux/brcm63xx/patches-2.6.39/110-gpiodev.patch
deleted file mode 100644 (file)
index fc99f53..0000000
--- a/target/linux/brcm63xx/patches-2.6.39/110-gpiodev.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -852,6 +852,10 @@ static struct platform_device mtd_dev =
-       .num_resources          = ARRAY_SIZE(mtd_resources),
- };
- 
-+static struct resource gpiodev_resource = {
-+      .start                  = 0xFFFFFFFF,
-+};
-+
- static struct gpio_led_platform_data bcm63xx_led_data;
- 
- static struct platform_device bcm63xx_gpio_leds = {
-@@ -916,6 +920,8 @@ int __init board_register_devices(void)
- 
-       platform_device_register(&mtd_dev);
- 
-+      platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
-+
-       bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
-       bcm63xx_led_data.leds = board.leds;
- 

diff --git a/target/linux/brcm63xx/patches-2.6.39/141-led_count.patch b/target/linux/brcm63xx/patches-2.6.39/141-led_count.patch
index e0fa19808a127962b040314d2e0f1dc857a5eec4..48aca11d45780920ab276fbcc84b58e94736d263 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/141-led_count.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/141-led_count.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -881,6 +881,7 @@ int __init board_register_devices(void)
+@@ -877,6 +877,7 @@ int __init board_register_devices(void)
  {
        u32 val;
        int button_count = 0;
@@ -8,9 +8,9 @@
  
        if (board.has_uart0)
                bcm63xx_uart_register(0);
-@@ -922,7 +923,11 @@ int __init board_register_devices(void)
+@@ -916,7 +917,11 @@ int __init board_register_devices(void)
  
-       platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
+       platform_device_register(&mtd_dev);
  
 -      bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
 +      /* count number of LEDs defined by this device */

diff --git a/target/linux/brcm63xx/patches-2.6.39/180-udc_preliminary_support.patch b/target/linux/brcm63xx/patches-2.6.39/180-udc_preliminary_support.patch
index 7b341b7198b0010f060393dff16c2861cf68914a..9c9ffbbdd995ad7ff1852cdabb76ef0e497bd715 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/180-udc_preliminary_support.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/180-udc_preliminary_support.patch
@@ -17,7 +17,7 @@
  };
  
  static struct board_info __initdata board_rta1025w_16 = {
-@@ -909,6 +912,9 @@ int __init board_register_devices(void)
+@@ -905,6 +908,9 @@ int __init board_register_devices(void)
        if (board.has_dsp)
                bcm63xx_dsp_register(&board.dsp);
  

diff --git a/target/linux/brcm63xx/patches-2.6.39/200-extended-platform-devices.patch b/target/linux/brcm63xx/patches-2.6.39/200-extended-platform-devices.patch
index db2c22f4705bff79cb4ef156507c3bf477df97a2..12e431b285ec2c621a243b7865dff7690c594f99 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/200-extended-platform-devices.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/200-extended-platform-devices.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -915,6 +915,9 @@ int __init board_register_devices(void)
+@@ -911,6 +911,9 @@ int __init board_register_devices(void)
        if (board.has_udc0)
                bcm63xx_udc_register();
  

diff --git a/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch b/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
index 761ac9605d5aab0797b184335ed3ebba42cff4c9..6205202912bd3b6b101aa6339f5d74ce083e8801 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -918,6 +918,9 @@ int __init board_register_devices(void)
+@@ -914,6 +914,9 @@ int __init board_register_devices(void)
        if (board.num_devs)
                platform_add_devices(board.devs, board.num_devs);
  

diff --git a/target/linux/brcm63xx/patches-2.6.39/240-spi.patch b/target/linux/brcm63xx/patches-2.6.39/240-spi.patch
index fb7dd9134de29ea96bbb9b3714b7f9e5f28e72ae..54bed22ca4d381c224ae3295037a8bf4178b3a03 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/240-spi.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/240-spi.patch
@@ -919,7 +919,7 @@
  #include <board_bcm963xx.h>
  
  #define PFX   "board_bcm963xx: "
-@@ -931,6 +932,8 @@ int __init board_register_devices(void)
+@@ -927,6 +928,8 @@ int __init board_register_devices(void)
        if (board.num_spis)
                spi_register_board_info(board.spis, board.num_spis);
  

diff --git a/target/linux/brcm63xx/patches-2.6.39/260-ssb_sprom_mac_pool.patch b/target/linux/brcm63xx/patches-2.6.39/260-ssb_sprom_mac_pool.patch
index 70711ec3ab8bb69277dd87061970061a33834c5b..40849c87d31daf070b1932529f3c039a3544428d 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/260-ssb_sprom_mac_pool.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/260-ssb_sprom_mac_pool.patch
@@ -18,7 +18,7 @@
  }
  
  /*
-@@ -946,6 +935,18 @@ int __init board_register_devices(void)
+@@ -942,6 +931,18 @@ int __init board_register_devices(void)
            !board_get_mac_address(board.enet1.mac_addr))
                bcm63xx_enet_register(1, &board.enet1);
  

diff --git a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
index 3028865273b809a986b5b003a8ed482d36183389..f1cfff614dddb58aea9884b408051e6cc0774c06 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
@@ -95,7 +95,7 @@
  
        /* dump cfe version */
        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2264,6 +2338,14 @@ int __init board_register_devices(void)
+@@ -2260,6 +2334,14 @@ int __init board_register_devices(void)
                val = bcm_mpi_readl(MPI_CSBASE_REG(0));
                val &= MPI_CSBASE_BASE_MASK;
        }

diff --git a/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch b/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
index c4dc287c76d0f88b31ecf5a569a95de7598658e7..e7d28233069a0d39af103bbaeea59e5424578363 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
@@ -18,7 +18,7 @@
  #endif
  
  /*
-@@ -2407,8 +2418,9 @@ int __init board_register_devices(void)
+@@ -2403,8 +2414,9 @@ int __init board_register_devices(void)
        if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
                memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
                memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);

diff --git a/target/linux/brcm63xx/patches-3.0/110-gpiodev.patch b/target/linux/brcm63xx/patches-3.0/110-gpiodev.patch
deleted file mode 100644 (file)
index 8283a54..0000000
--- a/target/linux/brcm63xx/patches-3.0/110-gpiodev.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -864,6 +864,10 @@ static struct platform_device mtd_dev =
-       .num_resources          = ARRAY_SIZE(mtd_resources),
- };
- 
-+static struct resource gpiodev_resource = {
-+      .start                  = 0xFFFFFFFF,
-+};
-+
- static struct gpio_led_platform_data bcm63xx_led_data;
- 
- static struct platform_device bcm63xx_gpio_leds = {
-@@ -928,6 +932,8 @@ int __init board_register_devices(void)
- 
-       platform_device_register(&mtd_dev);
- 
-+      platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
-+
-       bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
-       bcm63xx_led_data.leds = board.leds;
- 

diff --git a/target/linux/brcm63xx/patches-3.0/141-led_count.patch b/target/linux/brcm63xx/patches-3.0/141-led_count.patch
index c9adbb2685a2b8be13e634c00e846807eca6597a..67bc9b25041954c1c1ae42a4f208e81b17078684 100644 (file)
--- a/target/linux/brcm63xx/patches-3.0/141-led_count.patch
+++ b/target/linux/brcm63xx/patches-3.0/141-led_count.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -893,6 +893,7 @@ int __init board_register_devices(void)
+@@ -889,6 +889,7 @@ int __init board_register_devices(void)
  {
        u32 val;
        int button_count = 0;
@@ -8,9 +8,9 @@
  
        if (board.has_uart0)
                bcm63xx_uart_register(0);
-@@ -934,7 +935,11 @@ int __init board_register_devices(void)
+@@ -928,7 +929,11 @@ int __init board_register_devices(void)
  
-       platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1);
+       platform_device_register(&mtd_dev);
  
 -      bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
 +      /* count number of LEDs defined by this device */

diff --git a/target/linux/brcm63xx/patches-3.0/180-udc_preliminary_support.patch b/target/linux/brcm63xx/patches-3.0/180-udc_preliminary_support.patch
index 1cc259bd7747ae29e893f535b9316dc386888b6a..255e3fb1f444afb441322a558548c461e2f6a588 100644 (file)
--- a/target/linux/brcm63xx/patches-3.0/180-udc_preliminary_support.patch
+++ b/target/linux/brcm63xx/patches-3.0/180-udc_preliminary_support.patch
@@ -17,7 +17,7 @@
  };
  
  static struct board_info __initdata board_rta1025w_16 = {
-@@ -921,6 +924,9 @@ int __init board_register_devices(void)
+@@ -917,6 +920,9 @@ int __init board_register_devices(void)
        if (board.has_dsp)
                bcm63xx_dsp_register(&board.dsp);
  

diff --git a/target/linux/brcm63xx/patches-3.0/200-extended-platform-devices.patch b/target/linux/brcm63xx/patches-3.0/200-extended-platform-devices.patch
index f02db1f1db9ad91d41c346e286c7c7185cd5a9c6..c2c68792196292d3fbc58467ee3a9b1daa189263 100644 (file)
--- a/target/linux/brcm63xx/patches-3.0/200-extended-platform-devices.patch
+++ b/target/linux/brcm63xx/patches-3.0/200-extended-platform-devices.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -927,6 +927,9 @@ int __init board_register_devices(void)
+@@ -923,6 +923,9 @@ int __init board_register_devices(void)
        if (board.has_udc0)
                bcm63xx_udc_register();
  

diff --git a/target/linux/brcm63xx/patches-3.0/200-spi-board-info.patch b/target/linux/brcm63xx/patches-3.0/200-spi-board-info.patch
index 59ef0af21e85241e0d2f5788b2f46d8903ca27cc..b63e713992eee4712ddea455e5f3e4a38244b261 100644 (file)
--- a/target/linux/brcm63xx/patches-3.0/200-spi-board-info.patch
+++ b/target/linux/brcm63xx/patches-3.0/200-spi-board-info.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -930,6 +930,9 @@ int __init board_register_devices(void)
+@@ -926,6 +926,9 @@ int __init board_register_devices(void)
        if (board.num_devs)
                platform_add_devices(board.devs, board.num_devs);
  

diff --git a/target/linux/brcm63xx/patches-3.0/240-spi.patch b/target/linux/brcm63xx/patches-3.0/240-spi.patch
index 40606506f394238830b17d6d602bff4d594a5ef3..835cf87ae7a837990393108bf1be788561f3cdeb 100644 (file)
--- a/target/linux/brcm63xx/patches-3.0/240-spi.patch
+++ b/target/linux/brcm63xx/patches-3.0/240-spi.patch
@@ -919,7 +919,7 @@
  #include <board_bcm963xx.h>
  
  #define PFX   "board_bcm963xx: "
-@@ -943,6 +944,8 @@ int __init board_register_devices(void)
+@@ -939,6 +940,8 @@ int __init board_register_devices(void)
        if (board.num_spis)
                spi_register_board_info(board.spis, board.num_spis);
  

diff --git a/target/linux/brcm63xx/patches-3.0/260-ssb_sprom_mac_pool.patch b/target/linux/brcm63xx/patches-3.0/260-ssb_sprom_mac_pool.patch
index 2b4e3e0c5fcaac582712cd23e474155b03ec6d59..c76b43d96d1830f9a7ce57a0ab2aad7f13a011ef 100644 (file)
--- a/target/linux/brcm63xx/patches-3.0/260-ssb_sprom_mac_pool.patch
+++ b/target/linux/brcm63xx/patches-3.0/260-ssb_sprom_mac_pool.patch
@@ -19,7 +19,7 @@
  }
  
  /*
-@@ -958,6 +946,19 @@ int __init board_register_devices(void)
+@@ -954,6 +942,19 @@ int __init board_register_devices(void)
            !board_get_mac_address(board.enet1.mac_addr))
                bcm63xx_enet_register(1, &board.enet1);
  

diff --git a/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch b/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
index 210008a11140c14939ddb93c742f23ad78d9c111..4ad8e6f9a0dd386122ab20384e023cb6ab0b2d96 100644 (file)
--- a/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
@@ -95,7 +95,7 @@
  
        /* dump cfe version */
        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2276,6 +2350,14 @@ int __init board_register_devices(void)
+@@ -2272,6 +2346,14 @@ int __init board_register_devices(void)
                val = bcm_mpi_readl(MPI_CSBASE_REG(0));
                val &= MPI_CSBASE_BASE_MASK;
        }