git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'sh/serial-rework' and 'sh/oprofile'
[pandora-kernel.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
b10da17
..
cc8f892
100644
(file)
--- a/
arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/
arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@
-15,6
+15,7
@@
#include <linux/mtd/physmap.h>
#include <linux/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <linux/mtd/physmap.h>
#include <linux/mv643xx_eth.h>
#include <linux/ethtool.h>
+#include <net/dsa.h>
#include <asm/mach-types.h>
#include <asm/gpio.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/gpio.h>
#include <asm/mach/arch.h>
@@
-100,11
+101,20
@@
static struct platform_device wrt350n_v2_nor_flash = {
};
static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = {
};
static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = {
- .phy_addr =
-1
,
+ .phy_addr =
MV643XX_ETH_PHY_NONE
,
.speed = SPEED_1000,
.duplex = DUPLEX_FULL,
};
.speed = SPEED_1000,
.duplex = DUPLEX_FULL,
};
+static struct dsa_platform_data wrt350n_v2_switch_data = {
+ .port_names[0] = "lan2",
+ .port_names[1] = "lan1",
+ .port_names[2] = "wan",
+ .port_names[3] = "cpu",
+ .port_names[5] = "lan3",
+ .port_names[7] = "lan4",
+};
+
static void __init wrt350n_v2_init(void)
{
/*
static void __init wrt350n_v2_init(void)
{
/*
@@
-119,6
+129,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_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,