From: cshore Date: Tue, 7 Dec 2010 15:15:41 +0000 (+0000) Subject: [brcm63xx] Remove patch 140-new_bcm96348gw_leds because it is really the GW6200 leds... X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/27a7d97c151caabf83780fdab06342d07ec6558f [brcm63xx] Remove patch 140-new_bcm96348gw_leds because it is really the GW6200 leds, not the generic 96348GW. Another commit will add the GW6200 specific boardid and leds. This removal reverts the 96348GW leds to the reference design GPIOs. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24302 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh index 6f0028218..25f2ab47e 100755 --- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh +++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh @@ -15,8 +15,7 @@ brcm63xx_detect() { case "$board_name" in "bcm63xx/96348GW "*) - status_led="tel" - status_led2="line1" + status_led="power" brcm63xx_has_reset_button="true" ifname=eth1 ;; diff --git a/target/linux/brcm63xx/patches-2.6.35/140-new_bcm96348gw_leds.patch b/target/linux/brcm63xx/patches-2.6.35/140-new_bcm96348gw_leds.patch deleted file mode 100644 index 5d3fcfd0f..000000000 --- a/target/linux/brcm63xx/patches-2.6.35/140-new_bcm96348gw_leds.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -345,24 +345,39 @@ static struct board_info __initdata boar - .active_low = 1, - }, - { -- .name = "ppp", -- .gpio = 3, -+ .name = "power", -+ .gpio = 0, - .active_low = 1, -+ .default_trigger = "default-on", - }, - { -- .name = "ppp-fail", -+ .name = "stop", -+ .gpio = 1, -+ .active_low = 1, -+ }, -+ { -+ .name = "line1", - .gpio = 4, - .active_low = 1, - }, - { -- .name = "power", -- .gpio = 0, -+ .name = "line2", -+ .gpio = 5, - .active_low = 1, -- .default_trigger = "default-on", - }, - { -- .name = "stop", -- .gpio = 1, -+ .name = "line3", -+ .gpio = 6, -+ .active_low = 1, -+ }, -+ { -+ .name = "tel", -+ .gpio = 7, -+ .active_low = 1, -+ }, -+ { -+ .name = "eth", -+ .gpio = 35, - .active_low = 1, - }, - }, -@@ -880,6 +895,7 @@ static struct platform_device bcm63xx_gp - int __init board_register_devices(void) - { - u32 val; -+ int led_count = 0; - int button_count = 0; - - if (board.has_uart0) -@@ -922,7 +938,11 @@ int __init board_register_devices(void) - - platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1); - -- bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds); -+ /* count number of LEDs defined by this device */ -+ while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name) -+ led_count++; -+ -+ bcm63xx_led_data.num_leds = led_count; - bcm63xx_led_data.leds = board.leds; - - platform_device_register(&bcm63xx_gpio_leds); ---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -56,7 +56,7 @@ struct board_info { - struct bcm63xx_dsp_platform_data dsp; - - /* GPIO LEDs */ -- struct gpio_led leds[5]; -+ struct gpio_led leds[8]; - - /* Buttons */ - struct gpio_button buttons[2]; diff --git a/target/linux/brcm63xx/patches-2.6.35/150-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-2.6.35/150-alice_gate2_leds.patch index 24adac420..fa5ca81be 100644 --- a/target/linux/brcm63xx/patches-2.6.35/150-alice_gate2_leds.patch +++ b/target/linux/brcm63xx/patches-2.6.35/150-alice_gate2_leds.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -603,6 +603,99 @@ static struct board_info __initdata boar +@@ -588,6 +588,99 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, @@ -106,7 +106,7 @@ struct bcm63xx_dsp_platform_data dsp; /* GPIO LEDs */ -- struct gpio_led leds[8]; +- struct gpio_led leds[5]; + struct gpio_led leds[14]; /* Buttons */ diff --git a/target/linux/brcm63xx/patches-2.6.35/180-udc_preliminary_support.patch b/target/linux/brcm63xx/patches-2.6.35/180-udc_preliminary_support.patch index 195185d79..84534e6ee 100644 --- a/target/linux/brcm63xx/patches-2.6.35/180-udc_preliminary_support.patch +++ b/target/linux/brcm63xx/patches-2.6.35/180-udc_preliminary_support.patch @@ -8,7 +8,7 @@ #include #define PFX "board_bcm963xx: " -@@ -415,6 +416,8 @@ static struct board_info __initdata boar +@@ -400,6 +401,8 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -17,7 +17,7 @@ }; static struct board_info __initdata board_rta1025w_16 = { -@@ -1011,6 +1014,9 @@ int __init board_register_devices(void) +@@ -1001,6 +1004,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.35/200-extended-platform-devices.patch b/target/linux/brcm63xx/patches-2.6.35/200-extended-platform-devices.patch index 388e5716a..70637e5d4 100644 --- a/target/linux/brcm63xx/patches-2.6.35/200-extended-platform-devices.patch +++ b/target/linux/brcm63xx/patches-2.6.35/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 -@@ -1017,6 +1017,9 @@ int __init board_register_devices(void) +@@ -1007,6 +1007,9 @@ int __init board_register_devices(void) if (board.has_udc0) bcm63xx_udc_register(); diff --git a/target/linux/brcm63xx/patches-2.6.35/200-spi-board-info.patch b/target/linux/brcm63xx/patches-2.6.35/200-spi-board-info.patch index 612fbc567..d73d6f0ac 100644 --- a/target/linux/brcm63xx/patches-2.6.35/200-spi-board-info.patch +++ b/target/linux/brcm63xx/patches-2.6.35/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 -@@ -1020,6 +1020,9 @@ int __init board_register_devices(void) +@@ -1010,6 +1010,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.35/220-board-D4PW.patch b/target/linux/brcm63xx/patches-2.6.35/220-board-D4PW.patch index b1d022cfd..1e630d16a 100644 --- a/target/linux/brcm63xx/patches-2.6.35/220-board-D4PW.patch +++ b/target/linux/brcm63xx/patches-2.6.35/220-board-D4PW.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -479,6 +479,49 @@ static struct board_info __initdata boar +@@ -464,6 +464,49 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -50,7 +50,7 @@ #endif /* -@@ -737,6 +780,7 @@ static const struct board_info __initdat +@@ -728,6 +771,7 @@ static const struct board_info __initdat &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, diff --git a/target/linux/brcm63xx/patches-2.6.35/221-board-NB4.patch b/target/linux/brcm63xx/patches-2.6.35/221-board-NB4.patch index f3a838647..c2d105662 100644 --- a/target/linux/brcm63xx/patches-2.6.35/221-board-NB4.patch +++ b/target/linux/brcm63xx/patches-2.6.35/221-board-NB4.patch @@ -23,7 +23,7 @@ static struct bcm963xx_nvram nvram; static unsigned int mac_addr_used; static struct board_info board; -@@ -758,6 +767,502 @@ static struct board_info __initdata boar +@@ -749,6 +758,502 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -526,7 +526,7 @@ #endif /* -@@ -788,9 +1293,30 @@ static const struct board_info __initdat +@@ -779,9 +1284,30 @@ static const struct board_info __initdat &board_96358vw2, &board_AGPFS0, &board_DWVS0, @@ -557,7 +557,7 @@ /* * Register a sane SPROMv2 to make the on-board * bcm4318 WLAN work -@@ -908,6 +1434,9 @@ void __init board_prom_init(void) +@@ -899,6 +1425,9 @@ void __init board_prom_init(void) return; } diff --git a/target/linux/brcm63xx/patches-2.6.35/240-spi.patch b/target/linux/brcm63xx/patches-2.6.35/240-spi.patch index ed35e3689..b324a0f45 100644 --- a/target/linux/brcm63xx/patches-2.6.35/240-spi.patch +++ b/target/linux/brcm63xx/patches-2.6.35/240-spi.patch @@ -982,7 +982,7 @@ #include #define PFX "board_bcm963xx: " -@@ -1596,6 +1597,9 @@ int __init board_register_devices(void) +@@ -1586,6 +1587,9 @@ 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.35/250-6358-enet1-external-mii-clk.patch b/target/linux/brcm63xx/patches-2.6.35/250-6358-enet1-external-mii-clk.patch index bf07d359c..3e033fb23 100644 --- a/target/linux/brcm63xx/patches-2.6.35/250-6358-enet1-external-mii-clk.patch +++ b/target/linux/brcm63xx/patches-2.6.35/250-6358-enet1-external-mii-clk.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1486,6 +1486,8 @@ void __init board_prom_init(void) +@@ -1477,6 +1477,8 @@ void __init board_prom_init(void) if (BCMCPU_IS_6348()) val |= GPIO_MODE_6348_G3_EXT_MII | GPIO_MODE_6348_G0_EXT_MII; diff --git a/target/linux/brcm63xx/patches-2.6.35/270-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-2.6.35/270-board-96338W2_E7T.patch index 166123f42..c6bd1c869 100644 --- a/target/linux/brcm63xx/patches-2.6.35/270-board-96338W2_E7T.patch +++ b/target/linux/brcm63xx/patches-2.6.35/270-board-96338W2_E7T.patch @@ -39,7 +39,7 @@ #endif /* -@@ -1273,6 +1305,7 @@ static const struct board_info __initdat +@@ -1264,6 +1296,7 @@ static const struct board_info __initdat #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, &board_96338w, diff --git a/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch b/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch index d88239cd9..aa7322d9e 100644 --- a/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch +++ b/target/linux/brcm63xx/patches-2.6.35/300-wl_exports.patch @@ -14,7 +14,7 @@ * known 6338 boards */ #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1453,6 +1460,7 @@ void __init board_prom_init(void) +@@ -1444,6 +1451,7 @@ void __init board_prom_init(void) /* extract nvram data */ memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram)); diff --git a/target/linux/brcm63xx/patches-2.6.35/310-CPVA642_board.patch b/target/linux/brcm63xx/patches-2.6.35/310-CPVA642_board.patch index 0b4f79165..480e190d3 100644 --- a/target/linux/brcm63xx/patches-2.6.35/310-CPVA642_board.patch +++ b/target/linux/brcm63xx/patches-2.6.35/310-CPVA642_board.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -677,6 +677,98 @@ static struct board_info __initdata boar +@@ -662,6 +662,98 @@ static struct board_info __initdata boar }, }; @@ -99,7 +99,7 @@ static struct board_info __initdata board_AGPFS0 = { .name = "AGPF-S0", .expected_cpu_id = 0x6358, -@@ -1339,6 +1431,7 @@ static const struct board_info __initdat +@@ -1324,6 +1416,7 @@ static const struct board_info __initdat &board_96358vw, &board_96358vw2, &board_AGPFS0, diff --git a/target/linux/brcm63xx/patches-2.6.35/400-board_96358gw.patch b/target/linux/brcm63xx/patches-2.6.35/400-board_96358gw.patch index 1fdede949..d008e1d8f 100644 --- a/target/linux/brcm63xx/patches-2.6.35/400-board_96358gw.patch +++ b/target/linux/brcm63xx/patches-2.6.35/400-board_96358gw.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -577,6 +577,59 @@ static struct board_info __initdata boar +@@ -562,6 +562,59 @@ static struct board_info __initdata boar * known 6358 boards */ #ifdef CONFIG_BCM63XX_CPU_6358 @@ -60,7 +60,7 @@ static struct board_info __initdata board_96358vw = { .name = "96358VW", .expected_cpu_id = 0x6358, -@@ -1428,6 +1481,7 @@ static const struct board_info __initdat +@@ -1413,6 +1466,7 @@ static const struct board_info __initdat #endif #ifdef CONFIG_BCM63XX_CPU_6358 diff --git a/target/linux/brcm63xx/patches-2.6.35/410-boardid_fixup.patch b/target/linux/brcm63xx/patches-2.6.35/410-boardid_fixup.patch index db3ebf997..286d9acb2 100644 --- a/target/linux/brcm63xx/patches-2.6.35/410-boardid_fixup.patch +++ b/target/linux/brcm63xx/patches-2.6.35/410-boardid_fixup.patch @@ -18,7 +18,7 @@ static struct bcm963xx_nvram nvram; static unsigned int mac_addr_used; static struct board_info board; -@@ -1581,6 +1585,29 @@ static int board_get_mac_address(u8 *mac +@@ -1566,6 +1570,29 @@ static int board_get_mac_address(u8 *mac return 0; } @@ -48,7 +48,7 @@ /* * early init callback, read nvram data from flash and checksum it */ -@@ -1632,6 +1659,11 @@ void __init board_prom_init(void) +@@ -1617,6 +1644,11 @@ void __init board_prom_init(void) /* Fixup broken nb4 board name */ nb4_nvram_fixup(); diff --git a/target/linux/brcm63xx/patches-2.6.35/420-board_spw500v.patch b/target/linux/brcm63xx/patches-2.6.35/420-board_spw500v.patch index 34785e29c..4f02951ac 100644 --- a/target/linux/brcm63xx/patches-2.6.35/420-board_spw500v.patch +++ b/target/linux/brcm63xx/patches-2.6.35/420-board_spw500v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -575,6 +575,67 @@ static struct board_info __initdata boar +@@ -560,6 +560,67 @@ static struct board_info __initdata boar }; @@ -68,7 +68,7 @@ #endif /* -@@ -1482,6 +1543,7 @@ static const struct board_info __initdat +@@ -1467,6 +1528,7 @@ static const struct board_info __initdat &board_96348gw_a, &board_rta1025w_16, &board_96348_D4PW,