aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.3
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-03-05 13:29:54 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-03-05 13:29:54 +0000
commit631a035a76580af3755e0151cc94d6685ab89949 (patch)
tree547329f159981754f7dce31d7bc24c2369cdcb65 /target/linux/brcm63xx/patches-3.3
parent74946bb022331ea8717e33f6abe049968a20cb3c (diff)
downloadupstream-631a035a76580af3755e0151cc94d6685ab89949.tar.gz
upstream-631a035a76580af3755e0151cc94d6685ab89949.tar.bz2
upstream-631a035a76580af3755e0151cc94d6685ab89949.zip
Merge branch 'bcm63xx'
SVN-Revision: 30819
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3')
-rw-r--r--target/linux/brcm63xx/patches-3.3/011-add_bcm63xx_ehci_controller.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/100-reset_buttons.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/200-extended-platform-devices.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/300-alice_gate2_leds.patch10
-rw-r--r--target/linux/brcm63xx/patches-3.3/457-board_96348A-122.patch78
-rw-r--r--target/linux/brcm63xx/patches-3.3/458-RTA1205W_16_uart_fixes.patch10
-rw-r--r--target/linux/brcm63xx/patches-3.3/459_board_CPVA502plus.patch55
-rw-r--r--target/linux/brcm63xx/patches-3.3/977-ssb_export_fallback_sprom.patch4
8 files changed, 153 insertions, 10 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/011-add_bcm63xx_ehci_controller.patch b/target/linux/brcm63xx/patches-3.3/011-add_bcm63xx_ehci_controller.patch
index 788375c1ca..969c3b78a4 100644
--- a/target/linux/brcm63xx/patches-3.3/011-add_bcm63xx_ehci_controller.patch
+++ b/target/linux/brcm63xx/patches-3.3/011-add_bcm63xx_ehci_controller.patch
@@ -34,7 +34,7 @@ Subject: [PATCH 22/57] ehci: add driver for bcm63xx integrated controller.
+ BCM6358 and later chips.
+
config USB_EHCI_FSL
- bool "Support for Freescale on-chip EHCI USB controller"
+ bool "Support for Freescale PPC on-chip EHCI USB controller"
depends on USB_EHCI_HCD && FSL_SOC
--- /dev/null
+++ b/drivers/usb/host/ehci-bcm63xx.c
diff --git a/target/linux/brcm63xx/patches-3.3/100-reset_buttons.patch b/target/linux/brcm63xx/patches-3.3/100-reset_buttons.patch
index aa69ecdc60..00380341ae 100644
--- a/target/linux/brcm63xx/patches-3.3/100-reset_buttons.patch
+++ b/target/linux/brcm63xx/patches-3.3/100-reset_buttons.patch
@@ -100,7 +100,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.3/200-extended-platform-devices.patch b/target/linux/brcm63xx/patches-3.3/200-extended-platform-devices.patch
index 039df694fe..0e62140dc8 100644
--- a/target/linux/brcm63xx/patches-3.3/200-extended-platform-devices.patch
+++ b/target/linux/brcm63xx/patches-3.3/200-extended-platform-devices.patch
@@ -15,7 +15,7 @@
@@ -62,6 +62,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.3/300-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.3/300-alice_gate2_leds.patch
index c5043c9cc1..2e096385cd 100644
--- a/target/linux/brcm63xx/patches-3.3/300-alice_gate2_leds.patch
+++ b/target/linux/brcm63xx/patches-3.3/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.3/457-board_96348A-122.patch b/target/linux/brcm63xx/patches-3.3/457-board_96348A-122.patch
new file mode 100644
index 0000000000..b18e93fa73
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.3/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
+@@ -1010,6 +1010,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
+
+ /*
+@@ -2069,6 +2130,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.3/458-RTA1205W_16_uart_fixes.patch b/target/linux/brcm63xx/patches-3.3/458-RTA1205W_16_uart_fixes.patch
new file mode 100644
index 0000000000..89eab826e7
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.3/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
+@@ -705,6 +705,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.3/459_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-3.3/459_board_CPVA502plus.patch
new file mode 100644
index 0000000000..fa2526836c
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.3/459_board_CPVA502plus.patch
@@ -0,0 +1,55 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -1072,6 +1072,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
+
+ /*
+@@ -2132,6 +2170,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.3/977-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.3/977-ssb_export_fallback_sprom.patch
index 1181d102b9..7f95d3fed9 100644
--- a/target/linux/brcm63xx/patches-3.3/977-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-3.3/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
-@@ -2109,7 +2109,7 @@ static void __init nb4_nvram_fixup(void)
+@@ -2211,7 +2211,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,
-@@ -2129,6 +2129,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -2231,6 +2231,7 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848,
.boardflags_hi = 0x0000,
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 03:32:20 +0000