From 4fa8e1979c3f76117e52c0068eba3bce898eca48 Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 25 Jun 2011 19:26:17 +0000 Subject: [brcm63xx] remove gpiodev, prefer sysfs gpio git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27284 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../brcm63xx/patches-2.6.39/110-gpiodev.patch | 22 ---------------------- .../brcm63xx/patches-2.6.39/141-led_count.patch | 6 +++--- .../180-udc_preliminary_support.patch | 2 +- .../200-extended-platform-devices.patch | 2 +- .../patches-2.6.39/200-spi-board-info.patch | 2 +- target/linux/brcm63xx/patches-2.6.39/240-spi.patch | 2 +- .../patches-2.6.39/260-ssb_sprom_mac_pool.patch | 2 +- .../brcm63xx/patches-2.6.39/452-board_V2500V.patch | 2 +- .../500-ssb-add-callback-for-sprom.patch | 2 +- .../linux/brcm63xx/patches-3.0/110-gpiodev.patch | 22 ---------------------- .../linux/brcm63xx/patches-3.0/141-led_count.patch | 6 +++--- .../patches-3.0/180-udc_preliminary_support.patch | 2 +- .../200-extended-platform-devices.patch | 2 +- .../brcm63xx/patches-3.0/200-spi-board-info.patch | 2 +- target/linux/brcm63xx/patches-3.0/240-spi.patch | 2 +- .../patches-3.0/260-ssb_sprom_mac_pool.patch | 2 +- .../brcm63xx/patches-3.0/452-board_V2500V.patch | 2 +- 17 files changed, 19 insertions(+), 63 deletions(-) delete mode 100644 target/linux/brcm63xx/patches-2.6.39/110-gpiodev.patch delete mode 100644 target/linux/brcm63xx/patches-3.0/110-gpiodev.patch (limited to 'target') 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 index fc99f5345..000000000 --- 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 e0fa19808..48aca11d4 100644 --- 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 7b341b719..9c9ffbbdd 100644 --- 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 db2c22f47..12e431b28 100644 --- 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 761ac9605..620520291 100644 --- 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 fb7dd9134..54bed22ca 100644 --- 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 #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 70711ec3a..40849c87d 100644 --- 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 302886527..f1cfff614 100644 --- 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 c4dc287c7..e7d282330 100644 --- 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 index 8283a5422..000000000 --- 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 c9adbb268..67bc9b250 100644 --- 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 1cc259bd7..255e3fb1f 100644 --- 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 f02db1f1d..c2c687921 100644 --- 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 59ef0af21..b63e71399 100644 --- 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 40606506f..835cf87ae 100644 --- 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 #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 2b4e3e0c5..c76b43d96 100644 --- 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 210008a11..4ad8e6f9a 100644 --- 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; } -- cgit v1.2.3