diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-07-21 18:55:02 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-07-21 18:55:02 +0000 |
| commit | 78fae87beb5ba2c0afd3beb7176f735c00ea5f04 (patch) | |
| tree | 9a62409527a36f12fe5ea9a13514c73418490405 /target/linux/orion/files | |
| parent | 087fcb0eb3b7b53a4867232d69d4bab0d93e302d (diff) | |
| download | upstream-78fae87beb5ba2c0afd3beb7176f735c00ea5f04.tar.gz upstream-78fae87beb5ba2c0afd3beb7176f735c00ea5f04.tar.bz2 upstream-78fae87beb5ba2c0afd3beb7176f735c00ea5f04.zip | |
upgrade orion to 2.6.30.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16950 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/orion/files')
| -rw-r--r-- | target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c b/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c index f794b4cc52..5ce2114460 100644 --- a/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c +++ b/target/linux/orion/files/arch/arm/mach-orion5x/dt2-setup.c @@ -209,7 +209,7 @@ static struct mv643xx_eth_platform_data dt2_eth_data = { .duplex = DUPLEX_FULL, }; -static struct dsa_platform_data dt2_switch_data = { +static struct dsa_chip_data dt2_switch_chip_data = { .port_names[0] = "wan", .port_names[1] = "lan1", .port_names[2] = "lan2", @@ -218,6 +218,11 @@ static struct dsa_platform_data dt2_switch_data = { .port_names[5] = "lan4", }; +static struct dsa_platform_data dt2_switch_plat_data = { + .nr_chips = 1, + .chip = &dt2_switch_chip_data, +}; + /***************************************************************************** * RTC ISL1208 on I2C bus ****************************************************************************/ @@ -300,7 +305,6 @@ static void __init dt2_init(void) /* * Configure peripherals. */ - gpio_display(); orion5x_uart0_init(); orion5x_ehci0_init(); @@ -321,7 +325,7 @@ static void __init dt2_init(void) orion5x_eth_init(&dt2_eth_data); memcpy(dt2_eth_data.mac_addr, dt2_eeprom.gw.mac_addr[0], 6); - orion5x_eth_switch_init(&dt2_switch_data, NO_IRQ); + orion5x_eth_switch_init(&dt2_switch_plat_data, NO_IRQ); i2c_register_board_info(0, &dt2_i2c_rtc, 1); |