- adsl and lan leds are swapped.
- internetkey is labeled as hspa.
- enable status led and reset button for failsafe.
- use new leds script.
- fix switch configuration.
- remove enet0 from board_info.
- add profile.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 41588
'F@ST2704V2')
ucidef_set_led_usbdev "usb" "USB" "F@ST2704V2:green:usb" "1-1"
;;
+HW553)
+ ucidef_set_led_netdev "lan" "LAN" "HW553:blue:lan" "eth0"
+ ucidef_set_led_usbdev "usb1" "USB1" "HW553:red:hspa" "1-1"
+ ucidef_set_led_usbdev "usb2" "USB2" "HW553:blue:hspa" "1-2"
+ ;;
esac
ucidef_commit_leds
DV201AMR |\
DWV-S0 |\
"F@ST2404" |\
-HW553 |\
MAGIC |\
RTA1025W_16 |\
V2500V_BB)
AW4139 |\
AW4339U |\
+HW553 |\
HW556*)
ucidef_set_interface_lan "eth0.1"
ucidef_add_switch "eth0" "1" "1"
brcm63xx_has_reset_button="true"
ifname=eth1
;;
+ HW553)
+ status_led="HW553:blue:power"
+ brcm63xx_has_reset_button="true"
+ ifname=eth0
+ ;;
HW556*)
status_led="HW556:red:power"
brcm63xx_has_reset_button="true"
+++ /dev/null
-#
-# Copyright (C) 2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/HW556
- NAME:=HW556 WiFi
- PACKAGES:=kmod-rt2800-pci kmod-ath9k wpad-mini
-endef
-
-define Profile/HW556/Description
- Package set compatible with hardware using Atheros or Ralink WiFi cards (Huawei HG556a)
-endef
-$(eval $(call Profile,HW556))
-
--- /dev/null
+#
+# Copyright (C) 2012-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/HW553
+ NAME:=Huawei HG553
+ PACKAGES:=kmod-b43 wpad-mini \
+ kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev
+endef
+define Profile/HW553/Description
+ Package set optimized for Huawei HG553 using open-source b43 WiFi driver
+endef
+$(eval $(call Profile,HW553))
+
+define Profile/HW556
+ NAME:=HW556 WiFi
+ PACKAGES:=kmod-rt2800-pci kmod-ath9k wpad-mini
+endef
+
+define Profile/HW556/Description
+ Package set compatible with hardware using Atheros or Ralink WiFi cards (Huawei HG556a)
+endef
+$(eval $(call Profile,HW556))
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1764,6 +1764,83 @@ static struct board_info __initdata boar
+@@ -1764,6 +1764,76 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
+
+ .has_uart0 = 1,
+
-+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+
-+ .enet0 = {
-+ .has_phy = 1,
-+ .use_internal_phy = 1,
-+ },
-+
+ .enet1 = {
+ .has_phy = 1,
+ .phy_id = 0,
+
+ .leds = {
+ {
-+ .name = "HW553:red:lan",
++ .name = "HW553:red:adsl",
+ .gpio = 34,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:lan",
++ .name = "HW553:blue:adsl",
+ .gpio = 35,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:red:adsl",
++ .name = "HW553:red:lan",
+ .gpio = 22,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:adsl",
++ .name = "HW553:blue:lan",
+ .gpio = 23,
+ .active_low = 1,
+ },
+ .name = "HW553:red:power",
+ .gpio = 5,
+ .active_low = 1,
-+ .default_trigger = "default-on",
+ },
-+
+ {
+ .name = "HW553:blue:power",
+ .gpio = 4,
+ .active_low = 1,
++ .default_trigger = "default-on",
+ },
+ {
+ .name = "HW553:red:wifi",
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:red:internetkey",
++ .name = "HW553:red:hspa",
+ .gpio = 12,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:internetkey",
++ .name = "HW553:blue:hspa",
+ .gpio = 13,
+ .active_low = 1,
+ },
#endif
/*
-@@ -1812,6 +1889,7 @@ static const struct board_info __initcon
+@@ -1812,6 +1882,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
#endif
/*
-@@ -1857,6 +1896,7 @@ static const struct board_info __initcon
+@@ -1850,6 +1889,7 @@ static const struct board_info __initcon
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1880,6 +1880,72 @@ static struct board_info __initdata boar
+@@ -1873,6 +1873,72 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -1930,6 +1996,7 @@ static const struct board_info __initcon
+@@ -1923,6 +1989,7 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,
#endif
/*
-@@ -1981,6 +2040,7 @@ static const struct board_info __initcon
+@@ -1974,6 +2033,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2056,6 +2116,22 @@ void __init board_bcm963xx_init(void)
+@@ -2049,6 +2109,22 @@ void __init board_bcm963xx_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2041,6 +2099,7 @@ static const struct board_info __initcon
+@@ -2034,6 +2092,7 @@ static const struct board_info __initcon
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2100,6 +2145,7 @@ static const struct board_info __initcon
+@@ -2093,6 +2138,7 @@ static const struct board_info __initcon
&board_96348sv,
&board_V2500V_BB,
&board_V2110,
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2149,6 +2212,7 @@ static const struct board_info __initcon
+@@ -2142,6 +2205,7 @@ static const struct board_info __initcon
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,
#endif
/*
-@@ -2214,6 +2250,7 @@ static const struct board_info __initcon
+@@ -2207,6 +2243,7 @@ static const struct board_info __initcon
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2214,6 +2214,85 @@ static struct board_info __initdata boar
+@@ -2207,6 +2207,85 @@ static struct board_info __initdata boar
#endif
/*
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -2268,6 +2347,10 @@ static const struct board_info __initcon
+@@ -2261,6 +2340,10 @@ static const struct board_info __initcon
&board_HW553,
&board_spw303v,
#endif
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2290,6 +2290,72 @@ static struct board_info __initdata boar
+@@ -2283,6 +2283,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
#endif
/*
-@@ -2350,6 +2416,7 @@ static const struct board_info __initcon
+@@ -2343,6 +2409,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
#endif
/*
-@@ -2399,6 +2469,7 @@ static const struct board_info __initcon
+@@ -2392,6 +2462,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
#endif
/*
-@@ -2470,6 +2575,7 @@ static const struct board_info __initcon
+@@ -2463,6 +2568,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
#endif
/*
-@@ -2605,6 +2658,7 @@ static const struct board_info __initcon
+@@ -2598,6 +2651,7 @@ static const struct board_info __initcon
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2673,6 +2786,7 @@ static const struct board_info __initcon
+@@ -2666,6 +2779,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2584,6 +2584,73 @@ static struct board_info __initdata boar
+@@ -2577,6 +2577,73 @@ static struct board_info __initdata boar
},
}
};
#endif
/*
-@@ -2789,6 +2856,7 @@ static const struct board_info __initcon
+@@ -2782,6 +2849,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
-@@ -2653,6 +2656,104 @@ static struct board_info __initdata boar
+@@ -2646,6 +2649,104 @@ static struct board_info __initdata boar
};
#endif
/*
* known 6368 boards
*/
-@@ -2859,6 +2960,10 @@ static const struct board_info __initcon
+@@ -2852,6 +2953,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -2880,6 +2985,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2873,6 +2978,11 @@ static void __init boardid_fixup(u8 *boo
}
}
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -2928,6 +2979,7 @@ static const struct board_info __initcon
+@@ -2921,6 +2972,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
-@@ -2960,6 +3080,7 @@ static const struct board_info __initcon
+@@ -2953,6 +3073,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
-@@ -3079,6 +3152,7 @@ static const struct board_info __initcon
+@@ -3072,6 +3145,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
static struct board_info __initdata board_AR5387un = {
.name = "96328A-1441N1",
.expected_cpu_id = 0x6328,
-@@ -3152,6 +3219,7 @@ static const struct board_info __initcon
+@@ -3145,6 +3212,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
#endif
/*
-@@ -3233,6 +3282,7 @@ static const struct board_info __initcon
+@@ -3226,6 +3275,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -2882,6 +2883,492 @@ static struct board_info __initdata boar
+@@ -2875,6 +2876,492 @@ static struct board_info __initdata boar
},
};
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -3321,6 +3808,10 @@ static const struct board_info __initcon
+@@ -3314,6 +3801,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2,
&board_ct6373_1,
&board_HW553,
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -3340,13 +3831,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3333,13 +3824,37 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name();
#endif
/*
-@@ -3770,6 +3824,7 @@ static const struct board_info __initcon
+@@ -3763,6 +3817,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -3814,6 +3930,7 @@ static const struct board_info __initcon
+@@ -3807,6 +3923,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3769,6 +3769,96 @@ static struct board_info __initdata boar
+@@ -3762,6 +3762,96 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
#endif
/*
-@@ -3990,6 +4080,7 @@ static const struct board_info __initcon
+@@ -3983,6 +4073,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4244,6 +4331,9 @@ static const struct board_info __initcon
+@@ -4237,6 +4324,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
#endif
/*
-@@ -4333,6 +4421,7 @@ static const struct board_info __initcon
+@@ -4326,6 +4414,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4413,6 +4413,75 @@ static struct board_info __initdata boar
+@@ -4406,6 +4406,75 @@ static struct board_info __initdata boar
#endif
/*
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4497,6 +4566,9 @@ static const struct board_info __initcon
+@@ -4490,6 +4559,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
#endif
/*
-@@ -4533,6 +4578,7 @@ static const struct board_info __initcon
+@@ -4526,6 +4571,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4524,6 +4524,108 @@ static struct board_info __initdata boar
+@@ -4517,6 +4517,108 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -4614,6 +4716,7 @@ static const struct board_info __initcon
+@@ -4607,6 +4709,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4461,6 +4461,131 @@ static struct board_info __initdata boar
+@@ -4454,6 +4454,131 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
-@@ -4715,6 +4840,7 @@ static const struct board_info __initcon
+@@ -4708,6 +4833,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -4455,6 +4456,99 @@ static struct board_info __initdata boar
+@@ -4448,6 +4449,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
#endif
/*
-@@ -4838,6 +4932,7 @@ static const struct board_info __initcon
+@@ -4831,6 +4925,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1770,6 +1770,83 @@ static struct board_info __initdata boar
+@@ -1770,6 +1770,76 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
+
+ .has_uart0 = 1,
+
-+ .has_enet0 = 1,
+ .has_enet1 = 1,
+ .has_pci = 1,
+
-+ .enet0 = {
-+ .has_phy = 1,
-+ .use_internal_phy = 1,
-+ },
-+
+ .enet1 = {
+ .has_phy = 1,
+ .phy_id = 0,
+
+ .leds = {
+ {
-+ .name = "HW553:red:lan",
++ .name = "HW553:red:adsl",
+ .gpio = 34,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:lan",
++ .name = "HW553:blue:adsl",
+ .gpio = 35,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:red:adsl",
++ .name = "HW553:red:lan",
+ .gpio = 22,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:adsl",
++ .name = "HW553:blue:lan",
+ .gpio = 23,
+ .active_low = 1,
+ },
+ .name = "HW553:red:power",
+ .gpio = 5,
+ .active_low = 1,
-+ .default_trigger = "default-on",
+ },
-+
+ {
+ .name = "HW553:blue:power",
+ .gpio = 4,
+ .active_low = 1,
++ .default_trigger = "default-on",
+ },
+ {
+ .name = "HW553:red:wifi",
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:red:internetkey",
++ .name = "HW553:red:hspa",
+ .gpio = 12,
+ .active_low = 1,
+ },
+ {
-+ .name = "HW553:blue:internetkey",
++ .name = "HW553:blue:hspa",
+ .gpio = 13,
+ .active_low = 1,
+ },
#endif
/*
-@@ -1818,6 +1895,7 @@ static const struct board_info __initcon
+@@ -1818,6 +1888,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
#endif
/*
-@@ -1863,6 +1902,7 @@ static const struct board_info __initcon
+@@ -1856,6 +1895,7 @@ static const struct board_info __initcon
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1886,6 +1886,72 @@ static struct board_info __initdata boar
+@@ -1879,6 +1879,72 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -1936,6 +2002,7 @@ static const struct board_info __initcon
+@@ -1929,6 +1995,7 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
&board_HW553,
#endif
/*
-@@ -1987,6 +2046,7 @@ static const struct board_info __initcon
+@@ -1980,6 +2039,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2062,6 +2122,22 @@ void __init board_bcm963xx_init(void)
+@@ -2055,6 +2115,22 @@ void __init board_bcm963xx_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2047,6 +2105,7 @@ static const struct board_info __initcon
+@@ -2040,6 +2098,7 @@ static const struct board_info __initcon
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2106,6 +2151,7 @@ static const struct board_info __initcon
+@@ -2099,6 +2144,7 @@ static const struct board_info __initcon
&board_96348sv,
&board_V2500V_BB,
&board_V2110,
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.expected_cpu_id = 0x6348,
-@@ -2155,6 +2218,7 @@ static const struct board_info __initcon
+@@ -2148,6 +2211,7 @@ static const struct board_info __initcon
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,
#endif
/*
-@@ -2220,6 +2256,7 @@ static const struct board_info __initcon
+@@ -2213,6 +2249,7 @@ static const struct board_info __initcon
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2220,6 +2220,85 @@ static struct board_info __initdata boar
+@@ -2213,6 +2213,85 @@ static struct board_info __initdata boar
#endif
/*
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -2274,6 +2353,10 @@ static const struct board_info __initcon
+@@ -2267,6 +2346,10 @@ static const struct board_info __initcon
&board_HW553,
&board_spw303v,
#endif
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2296,6 +2296,72 @@ static struct board_info __initdata boar
+@@ -2289,6 +2289,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
#endif
/*
-@@ -2356,6 +2422,7 @@ static const struct board_info __initcon
+@@ -2349,6 +2415,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
#endif
/*
-@@ -2405,6 +2475,7 @@ static const struct board_info __initcon
+@@ -2398,6 +2468,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
#endif
/*
-@@ -2476,6 +2581,7 @@ static const struct board_info __initcon
+@@ -2469,6 +2574,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
#endif
/*
-@@ -2611,6 +2664,7 @@ static const struct board_info __initcon
+@@ -2604,6 +2657,7 @@ static const struct board_info __initcon
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
-@@ -2679,6 +2796,7 @@ static const struct board_info __initcon
+@@ -2672,6 +2789,7 @@ static const struct board_info __initcon
&board_nb4_ser_r2,
&board_nb4_fxc_r1,
&board_nb4_fxc_r2,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2594,6 +2594,73 @@ static struct board_info __initdata boar
+@@ -2587,6 +2587,73 @@ static struct board_info __initdata boar
},
}
};
#endif
/*
-@@ -2799,6 +2866,7 @@ static const struct board_info __initcon
+@@ -2792,6 +2859,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
-@@ -2663,6 +2666,104 @@ static struct board_info __initdata boar
+@@ -2656,6 +2659,104 @@ static struct board_info __initdata boar
};
#endif
/*
* known 6368 boards
*/
-@@ -2869,6 +2970,10 @@ static const struct board_info __initcon
+@@ -2862,6 +2963,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
-@@ -2890,6 +2995,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2883,6 +2988,11 @@ static void __init boardid_fixup(u8 *boo
}
}
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -2938,6 +2989,7 @@ static const struct board_info __initcon
+@@ -2931,6 +2982,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
-@@ -2970,6 +3090,7 @@ static const struct board_info __initcon
+@@ -2963,6 +3083,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
-@@ -3089,6 +3162,7 @@ static const struct board_info __initcon
+@@ -3082,6 +3155,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
static struct board_info __initdata board_AR5387un = {
.name = "96328A-1441N1",
.expected_cpu_id = 0x6328,
-@@ -3162,6 +3229,7 @@ static const struct board_info __initcon
+@@ -3155,6 +3222,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
#endif
/*
-@@ -3243,6 +3292,7 @@ static const struct board_info __initcon
+@@ -3236,6 +3285,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -2892,6 +2893,492 @@ static struct board_info __initdata boar
+@@ -2885,6 +2886,492 @@ static struct board_info __initdata boar
},
};
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
-@@ -3331,6 +3818,10 @@ static const struct board_info __initcon
+@@ -3324,6 +3811,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r2,
&board_ct6373_1,
&board_HW553,
&board_spw303v,
&board_DVAG3810BN,
#endif
-@@ -3350,13 +3841,37 @@ static void __init boardid_fixup(u8 *boo
+@@ -3343,13 +3834,37 @@ static void __init boardid_fixup(u8 *boo
struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
char *board_name = (char *)bcm63xx_nvram_get_name();
#endif
/*
-@@ -3780,6 +3834,7 @@ static const struct board_info __initcon
+@@ -3773,6 +3827,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.expected_cpu_id = 0x6348,
-@@ -3824,6 +3940,7 @@ static const struct board_info __initcon
+@@ -3817,6 +3933,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -3779,6 +3779,96 @@ static struct board_info __initdata boar
+@@ -3772,6 +3772,96 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
#endif
/*
-@@ -4000,6 +4090,7 @@ static const struct board_info __initcon
+@@ -3993,6 +4083,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
-@@ -4254,6 +4341,9 @@ static const struct board_info __initcon
+@@ -4247,6 +4334,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif
#endif
/*
-@@ -4343,6 +4431,7 @@ static const struct board_info __initcon
+@@ -4336,6 +4424,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4423,6 +4423,75 @@ static struct board_info __initdata boar
+@@ -4416,6 +4416,75 @@ static struct board_info __initdata boar
#endif
/*
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4507,6 +4576,9 @@ static const struct board_info __initcon
+@@ -4500,6 +4569,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
#endif
/*
-@@ -4543,6 +4588,7 @@ static const struct board_info __initcon
+@@ -4536,6 +4581,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4534,6 +4534,108 @@ static struct board_info __initdata boar
+@@ -4527,6 +4527,108 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -4624,6 +4726,7 @@ static const struct board_info __initcon
+@@ -4617,6 +4719,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4471,6 +4471,131 @@ static struct board_info __initdata boar
+@@ -4464,6 +4464,131 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
-@@ -4725,6 +4850,7 @@ static const struct board_info __initcon
+@@ -4718,6 +4843,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
-@@ -4465,6 +4466,99 @@ static struct board_info __initdata boar
+@@ -4458,6 +4459,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
#endif
/*
-@@ -4848,6 +4942,7 @@ static const struct board_info __initcon
+@@ -4841,6 +4935,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,
projects / openwrt / staging / dangole.git / commitdiff