git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull cpumask into release branch
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-orion5x
/
wrt350n-v2-setup.c
diff --git
a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index cc8f8920086505fb963efc6c232f617ed1082855..1b4ad9d5e2ebeedeab6804e47b52651cc3e6c74e 100644
(file)
--- a/
arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/
arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@
-106,7
+106,7
@@
static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = {
.duplex = DUPLEX_FULL,
};
.duplex = DUPLEX_FULL,
};
-static struct dsa_
platform_data wrt350n_v2_switch
_data = {
+static struct dsa_
chip_data wrt350n_v2_switch_chip
_data = {
.port_names[0] = "lan2",
.port_names[1] = "lan1",
.port_names[2] = "wan",
.port_names[0] = "lan2",
.port_names[1] = "lan1",
.port_names[2] = "wan",
@@
-115,6
+115,11
@@
static struct dsa_platform_data wrt350n_v2_switch_data = {
.port_names[7] = "lan4",
};
.port_names[7] = "lan4",
};
+static struct dsa_platform_data wrt350n_v2_switch_plat_data = {
+ .nr_chips = 1,
+ .chip = &wrt350n_v2_switch_chip_data,
+};
+
static void __init wrt350n_v2_init(void)
{
/*
static void __init wrt350n_v2_init(void)
{
/*
@@
-129,7
+134,7
@@
static void __init wrt350n_v2_init(void)
*/
orion5x_ehci0_init();
orion5x_eth_init(&wrt350n_v2_eth_data);
*/
orion5x_ehci0_init();
orion5x_eth_init(&wrt350n_v2_eth_data);
- orion5x_eth_switch_init(&wrt350n_v2_switch_data, NO_IRQ);
+ orion5x_eth_switch_init(&wrt350n_v2_switch_
plat_
data, NO_IRQ);
orion5x_uart0_init();
orion5x_setup_dev_boot_win(WRT350N_V2_NOR_BOOT_BASE,
orion5x_uart0_init();
orion5x_setup_dev_boot_win(WRT350N_V2_NOR_BOOT_BASE,