From e5575fe335eee4a4a3a704d3895dbd382d61d76a Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sun, 27 May 2012 13:22:43 +0000 Subject: [PATCH] bcm63xx: add support for DSL-274XB rev F1 SVN-Revision: 31882 --- .../etc/uci-defaults/brcm63xx_fixcrc.sh | 1 + .../base-files/etc/uci-defaults/network | 1 + .../linux/brcm63xx/base-files/lib/brcm63xx.sh | 3 +- .../522-board_dsl_274xb_rev_f.patch | 137 ++++++++++++++++++ .../patches-3.3/550-alice_gate2_leds.patch | 2 +- .../patches-3.3/551-96348gw_a_leds.patch | 2 +- .../552-board_96348gw-10_reset_button.patch | 2 +- .../801-ssb_export_fallback_sprom.patch | 4 +- 8 files changed, 146 insertions(+), 6 deletions(-) create mode 100644 target/linux/brcm63xx/patches-3.3/522-board_dsl_274xb_rev_f.patch diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh b/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh index e63ecfde4d..45524aea4b 100755 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/brcm63xx_fixcrc.sh @@ -14,6 +14,7 @@ brcm63xx_detect case "$board_name" in "CPVA502+" |\ + AW4339U |\ CPVA642 |\ MAGIC |\ V2110 |\ diff --git a/target/linux/brcm63xx/base-files/etc/uci-defaults/network b/target/linux/brcm63xx/base-files/etc/uci-defaults/network index 66f937d53d..518b3b5212 100755 --- a/target/linux/brcm63xx/base-files/etc/uci-defaults/network +++ b/target/linux/brcm63xx/base-files/etc/uci-defaults/network @@ -16,6 +16,7 @@ case "$board_name" in 96348A-122 |\ 96358-502V |\ +AW4339U |\ CPVA642 |\ CT536_CT5621 |\ D-4P-W |\ diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh index e4ac5e331d..6f36b50eea 100755 --- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh +++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh @@ -48,7 +48,8 @@ brcm63xx_detect() { brcm63xx_has_reset_button="true" ifname=eth0 ;; - AW4139) + AW4139 |\ + AW4339U) status_led="dsl-274xb:green:power" brcm63xx_has_reset_button="true" ifname=eth0 diff --git a/target/linux/brcm63xx/patches-3.3/522-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.3/522-board_dsl_274xb_rev_f.patch new file mode 100644 index 0000000000..36b07063e3 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.3/522-board_dsl_274xb_rev_f.patch @@ -0,0 +1,137 @@ +From 653dd2c8ff9d777104de85fb7b872ebed7139ceb Mon Sep 17 00:00:00 2001 +From: Jonas Gorski +Date: Mon, 30 Apr 2012 09:10:51 +0200 +Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link + DSL-274xB rev F1 + +--- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 80 +++++++++++++++++++++++++++++ + 1 file changed, 80 insertions(+) + +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -54,6 +54,114 @@ + static struct board_info board; + + /* ++ * known 6328 boards ++ */ ++#ifdef CONFIG_BCM63XX_CPU_6328 ++static struct board_info __initdata board_dsl_274xb_f1 = { ++ .name = "AW4339U", ++ .expected_cpu_id = 0x6328, ++ ++ .has_uart0 = 1, ++ .has_pci = 1, ++ ++ .has_caldata = 1, ++ .caldata = { ++ { ++ .caldata_offset = 0x7d1000, ++ .slot = 0, ++ }, ++ }, ++ ++ .has_enetsw = 1, ++ ++ .enetsw = { ++ .used_ports = { ++ [0] = { ++ .used = 1, ++ .phy_id = 1, ++ .name = "Port 4", ++ }, ++ [1] = { ++ .used = 1, ++ .phy_id = 2, ++ .name = "Port 3", ++ }, ++ [2] = { ++ .used = 1, ++ .phy_id = 3, ++ .name = "Port 2", ++ }, ++ [3] = { ++ .used = 1, ++ .phy_id = 4, ++ .name = "Port 1", ++ }, ++ }, ++ }, ++ ++ .leds = { ++ { ++ .name = "dsl-274xb:red:internet", ++ .gpio = 2, ++ .active_low = 1, ++ }, ++ { ++ .name = "dsl-274xb:green:dsl", ++ .gpio = 3, ++ .active_low = 1, ++ }, ++ { ++ .name = "dsl-274xb:green:power", ++ .gpio = 4, ++ .active_low = 1, ++ .default_trigger = "default-on", ++ }, ++ { ++ .name = "dsl-274xb:red:power", ++ .gpio = 8, ++ .active_low = 1, ++ }, ++ { ++ .name = "dsl-274xb:blue:wps", ++ .gpio = 9, ++ .active_low = 1, ++ }, ++ { ++ .name = "dsl-274xb:green:internet", ++ .gpio = 11, ++ .active_low = 1, ++ }, ++ }, ++ ++ .buttons = { ++ { ++ .desc = "wifi", ++ .gpio = 10, ++ .active_low = 1, ++ .type = EV_KEY, ++ .code = BTN_0, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, ++ }, ++ { ++ .desc = "reset", ++ .gpio = 23, ++ .active_low = 1, ++ .type = EV_KEY, ++ .code = KEY_RESTART, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, ++ }, ++ { ++ .desc = "wps", ++ .gpio = 24, ++ .active_low = 1, ++ .code = KEY_WPS_BUTTON, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, ++ }, ++ }, ++}; ++#endif ++ ++/* + * known 6338 boards + */ + #ifdef CONFIG_BCM63XX_CPU_6338 +@@ -2160,6 +2268,9 @@ static struct board_info __initdata boar + * all boards + */ + static const struct board_info __initdata *bcm963xx_boards[] = { ++#ifdef CONFIG_BCM63XX_CPU_6328 ++ &board_dsl_274xb_f1, ++#endif + #ifdef CONFIG_BCM63XX_CPU_6338 + &board_96338gw, + &board_96338w, diff --git a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch index 7917287235..98fe1ea6f3 100644 --- a/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch +++ b/target/linux/brcm63xx/patches-3.3/550-alice_gate2_leds.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1305,6 +1305,99 @@ static struct board_info __initdata boar +@@ -1413,6 +1413,99 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, diff --git a/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch b/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch index 287674f446..902d076188 100644 --- a/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch +++ b/target/linux/brcm63xx/patches-3.3/551-96348gw_a_leds.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1085,6 +1085,19 @@ static struct board_info __initdata boar +@@ -1193,6 +1193,19 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, diff --git a/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch b/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch index e8bc47a51e..0ade7a479d 100644 --- a/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch +++ b/target/linux/brcm63xx/patches-3.3/552-board_96348gw-10_reset_button.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -663,6 +663,17 @@ static struct board_info __initdata boar +@@ -771,6 +771,17 @@ static struct board_info __initdata boar .active_low = 1, }, }, diff --git a/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch index 025edf4b35..faa122b494 100644 --- a/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch +++ b/target/linux/brcm63xx/patches-3.3/801-ssb_export_fallback_sprom.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -2351,7 +2352,7 @@ static void __init nb4_nvram_fixup(void) +@@ -2462,7 +2463,7 @@ static void __init nb4_nvram_fixup(void) * bcm4318 WLAN work */ #ifdef CONFIG_SSB_PCIHOST @@ -17,7 +17,7 @@ .revision = 0x02, .board_rev = 0x17, .country_code = 0x0, -@@ -2371,6 +2372,7 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -2482,6 +2483,7 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, }; -- 2.25.1