From 18982296c750b8bd433669adb28134d645e68932 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 5 Mar 2012 13:29:54 +0000 Subject: Merge branch 'bcm63xx' git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30819 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../brcm63xx/patches-3.1/100-reset_buttons.patch | 2 +- .../200-extended-platform-devices.patch | 2 +- .../patches-3.1/300-alice_gate2_leds.patch | 10 +-- .../patches-3.1/457-board_96348A-122.patch | 78 ++++++++++++++++++++++ .../patches-3.1/458-RTA1205W_16_uart_fixes.patch | 10 +++ .../patches-3.1/459_board_CPVA502plus.patch | 55 +++++++++++++++ .../977-ssb_export_fallback_sprom.patch | 4 +- 7 files changed, 152 insertions(+), 9 deletions(-) create mode 100644 target/linux/brcm63xx/patches-3.1/457-board_96348A-122.patch create mode 100644 target/linux/brcm63xx/patches-3.1/458-RTA1205W_16_uart_fixes.patch create mode 100644 target/linux/brcm63xx/patches-3.1/459_board_CPVA502plus.patch (limited to 'target/linux/brcm63xx/patches-3.1') diff --git a/target/linux/brcm63xx/patches-3.1/100-reset_buttons.patch b/target/linux/brcm63xx/patches-3.1/100-reset_buttons.patch index f1f69f421e..ac61812f77 100644 --- a/target/linux/brcm63xx/patches-3.1/100-reset_buttons.patch +++ b/target/linux/brcm63xx/patches-3.1/100-reset_buttons.patch @@ -92,7 +92,7 @@ struct gpio_led leds[5]; + + /* Buttons */ -+ struct gpio_button buttons[2]; ++ struct gpio_button buttons[4]; }; #endif /* ! BOARD_BCM963XX_H_ */ diff --git a/target/linux/brcm63xx/patches-3.1/200-extended-platform-devices.patch b/target/linux/brcm63xx/patches-3.1/200-extended-platform-devices.patch index 2ec70c174c..363c6b159e 100644 --- a/target/linux/brcm63xx/patches-3.1/200-extended-platform-devices.patch +++ b/target/linux/brcm63xx/patches-3.1/200-extended-platform-devices.patch @@ -15,7 +15,7 @@ @@ -61,6 +61,10 @@ struct board_info { /* Buttons */ - struct gpio_button buttons[2]; + struct gpio_button buttons[4]; + + /* Additional platform devices */ + struct platform_device **devs; diff --git a/target/linux/brcm63xx/patches-3.1/300-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.1/300-alice_gate2_leds.patch index f54fab736b..d9f891f8a9 100644 --- a/target/linux/brcm63xx/patches-3.1/300-alice_gate2_leds.patch +++ b/target/linux/brcm63xx/patches-3.1/300-alice_gate2_leds.patch @@ -29,12 +29,12 @@ + .active_low = 1, + }, + { -+ .name = "adsl:red", ++ .name = "adsl:green", + .gpio = 9, + .active_low = 1, + }, + { -+ .name = "adsl:green", ++ .name = "adsl:red", + .gpio = 10, + .active_low = 1, + }, @@ -49,12 +49,12 @@ + .active_low = 1, + }, + { -+ .name = "internet:red", ++ .name = "internet:green", + .gpio = 25, + .active_low = 1, + }, + { -+ .name = "internet:green", ++ .name = "internet:red", + .gpio = 24, + .active_low = 1, + }, @@ -110,4 +110,4 @@ + struct gpio_led leds[14]; /* Buttons */ - struct gpio_button buttons[2]; + struct gpio_button buttons[4]; diff --git a/target/linux/brcm63xx/patches-3.1/457-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.1/457-board_96348A-122.patch new file mode 100644 index 0000000000..a7ee9755a6 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.1/457-board_96348A-122.patch @@ -0,0 +1,78 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -1009,6 +1009,67 @@ static struct board_info __initdata boar + }, + }; + ++static struct board_info __initdata board_96348A_122 = { ++ .name = "96348A-122", ++ .expected_cpu_id = 0x6348, ++ ++ .has_uart0 = 1, ++ .has_enet1 = 1, ++ .has_pci = 1, ++ ++ .enet1 = { ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, ++ ++ .has_ohci0 = 1, ++ ++ .leds = { ++ { ++ .name = "power", ++ .gpio = 0, ++ .active_low = 1, ++ .default_trigger = "default-on", ++ }, ++ { ++ .name = "alarm", ++ .gpio = 2, ++ .active_low = 1, ++ }, ++ { ++ .name = "wps", ++ .gpio = 6, ++ .active_low = 1, ++ }, ++ }, ++ .buttons = { ++ { ++ .desc = "reset", ++ .gpio = 33, ++ .active_low = 1, ++ .type = EV_KEY, ++ .code = KEY_RESTART, ++ .threshold = 3, ++ }, ++ { ++ .desc = "wifi", ++ .gpio = 34, ++ .active_low = 1, ++ .type = EV_KEY, ++ .code = BTN_0, ++ .threshold = 3, ++ }, ++ { ++ .desc = "wps", ++ .gpio = 35, ++ .active_low = 1, ++ .type = EV_KEY, ++ .code = KEY_WPS_BUTTON, ++ .threshold = 3, ++ }, ++ }, ++}; ++ + #endif + + /* +@@ -2068,6 +2129,7 @@ static const struct board_info __initdat + &board_V2500V_BB, + &board_V2110, + &board_ct536_ct5621, ++ &board_96348A_122, + #endif + + #ifdef CONFIG_BCM63XX_CPU_6358 diff --git a/target/linux/brcm63xx/patches-3.1/458-RTA1205W_16_uart_fixes.patch b/target/linux/brcm63xx/patches-3.1/458-RTA1205W_16_uart_fixes.patch new file mode 100644 index 0000000000..90a9a5c553 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.1/458-RTA1205W_16_uart_fixes.patch @@ -0,0 +1,10 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -704,6 +704,7 @@ static struct board_info __initdata boar + .name = "RTA1025W_16", + .expected_cpu_id = 0x6348, + ++ .has_uart0 = 1, + .has_enet0 = 1, + .has_enet1 = 1, + .has_pci = 1, diff --git a/target/linux/brcm63xx/patches-3.1/459_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.1/459_board_CPVA502plus.patch new file mode 100644 index 0000000000..426e9d0091 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.1/459_board_CPVA502plus.patch @@ -0,0 +1,55 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -1071,6 +1071,44 @@ static struct board_info __initdata boar + }, + }; + ++static struct board_info __initdata board_CPVA502plus = { ++ .name = "CPVA502+", ++ .expected_cpu_id = 0x6348, ++ ++ .has_uart0 = 1, ++ .has_enet0 = 1, ++ .has_enet1 = 1, ++ .has_pci = 1, ++ ++ .enet0 = { ++ .has_phy = 1, ++ .use_internal_phy = 1, ++ }, ++ .enet1 = { ++ .force_speed_100 = 1, ++ .force_duplex_full = 1, ++ }, ++ ++ .has_udc0 = 1, ++ ++ .leds = { ++ { ++ .name = "phone", ++ .gpio = 0, ++ .active_low = 1, ++ }, ++ { ++ .name = "link", ++ .gpio = 5, ++ .active_low = 1, ++ }, ++ { ++ .name = "feth1", /* FIXME:does gpio4 enable eth1 phy? */ ++ .gpio = 4, ++ .active_low = 1, ++ }, ++ }, ++}; + #endif + + /* +@@ -2131,6 +2169,7 @@ static const struct board_info __initdat + &board_V2110, + &board_ct536_ct5621, + &board_96348A_122, ++ &board_CPVA502plus, + #endif + + #ifdef CONFIG_BCM63XX_CPU_6358 diff --git a/target/linux/brcm63xx/patches-3.1/977-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.1/977-ssb_export_fallback_sprom.patch index 478019d99e..6bfa419bfd 100644 --- a/target/linux/brcm63xx/patches-3.1/977-ssb_export_fallback_sprom.patch +++ b/target/linux/brcm63xx/patches-3.1/977-ssb_export_fallback_sprom.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2108,7 +2108,7 @@ static void __init nb4_nvram_fixup(void) +@@ -2210,7 +2210,7 @@ static void __init nb4_nvram_fixup(void) * bcm4318 WLAN work */ #ifdef CONFIG_SSB_PCIHOST @@ -9,7 +9,7 @@ .revision = 0x02, .board_rev = 0x17, .country_code = 0x0, -@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -2230,6 +2230,7 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, }; -- cgit v1.2.3