diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-21 22:35:56 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-21 22:35:56 +0200 |
| commit | e40454d3f444ba7f8cc78dd985a1414a5945757c (patch) | |
| tree | 83dd7f86bb3b69c29779e20c0bd10f7b1ece493f /arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | |
| parent | b315dac3e877bd75af601e41946f1e8c3f2542da (diff) | |
| parent | 77a1c68a96f4e018860033f3827602014a4f1663 (diff) | |
Merge tag 'mvebu-soc-4.9-1' of git://git.infradead.org/linux-mvebu into next/soc
Pull "mvebu soc for 4.9 (part 1)" from Gregory CLEMENT:
- irq cleanup for old mvebu SoC
* tag 'mvebu-soc-4.9-1' of git://git.infradead.org/linux-mvebu:
ARM: orion5x: remove extraneous NO_IRQ
ARM: orion: simplify orion_ge00_switch_init
ARM: mvebu/orion: remove NO_IRQ check from device init
ARM: mv78xx0: simplify ethernet device creation
Diffstat (limited to 'arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c index 4bf80dd5478c..67ee8571b03c 100644 --- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c +++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c @@ -40,7 +40,7 @@ static struct dsa_chip_data rd88f6183ap_ge_switch_chip_data = { .port_names[5] = "cpu", }; -static struct dsa_platform_data rd88f6183ap_ge_switch_plat_data = { +static struct dsa_platform_data __initdata rd88f6183ap_ge_switch_plat_data = { .nr_chips = 1, .chip = &rd88f6183ap_ge_switch_chip_data, }; @@ -71,7 +71,6 @@ static struct spi_board_info __initdata rd88f6183ap_ge_spi_slave_info[] = { { .modalias = "m25p80", .platform_data = &rd88f6183ap_ge_spi_slave_data, - .irq = NO_IRQ, .max_speed_hz = 20000000, .bus_num = 0, .chip_select = 0, @@ -90,8 +89,7 @@ static void __init rd88f6183ap_ge_init(void) */ orion5x_ehci0_init(); orion5x_eth_init(&rd88f6183ap_ge_eth_data); - orion5x_eth_switch_init(&rd88f6183ap_ge_switch_plat_data, - gpio_to_irq(3)); + orion5x_eth_switch_init(&rd88f6183ap_ge_switch_plat_data); spi_register_board_info(rd88f6183ap_ge_spi_slave_info, ARRAY_SIZE(rd88f6183ap_ge_spi_slave_info)); orion5x_spi_init(); |