Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e40454d3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents b315dac3 77a1c68a

arch/arm/mach-mv78xx0/common.c

+2 −7
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data) 
{

	orion_ge01_init(eth_data,

			GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,

			NO_IRQ,

			MV643XX_TX_CSUM_DEFAULT_LIMIT);

}
@@ -242,9 +241,7 @@ void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data) 
		eth_data->duplex = DUPLEX_FULL;

	}



	orion_ge10_init(eth_data,

			GE10_PHYS_BASE, IRQ_MV78XX0_GE10_SUM,

			NO_IRQ);

	orion_ge10_init(eth_data, GE10_PHYS_BASE, IRQ_MV78XX0_GE10_SUM);

}
@@ -266,9 +263,7 @@ void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data) 
		eth_data->duplex = DUPLEX_FULL;

	}



	orion_ge11_init(eth_data,

			GE11_PHYS_BASE, IRQ_MV78XX0_GE11_SUM,

			NO_IRQ);

	orion_ge11_init(eth_data, GE11_PHYS_BASE, IRQ_MV78XX0_GE11_SUM);

}



/*****************************************************************************

arch/arm/mach-orion5x/common.c

+2 −2
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) 
/*****************************************************************************

 * Ethernet switch

 ****************************************************************************/

void __init orion5x_eth_switch_init(struct dsa_platform_data *d, int irq)

void __init orion5x_eth_switch_init(struct dsa_platform_data *d)

{

	orion_ge00_switch_init(d, irq);

	orion_ge00_switch_init(d);

}

arch/arm/mach-orion5x/common.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ void orion5x_setup_wins(void); 
void orion5x_ehci0_init(void);

void orion5x_ehci1_init(void);

void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);

void orion5x_eth_switch_init(struct dsa_platform_data *d, int irq);

void orion5x_eth_switch_init(struct dsa_platform_data *d);

void orion5x_i2c_init(void);

void orion5x_sata_init(struct mv_sata_platform_data *sata_data);

void orion5x_spi_init(void);

arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static struct dsa_chip_data rd88f5181l_fxo_switch_chip_data = { 
	.port_names[7]	= "lan3",

};



static struct dsa_platform_data rd88f5181l_fxo_switch_plat_data = {

static struct dsa_platform_data __initdata rd88f5181l_fxo_switch_plat_data = {

	.nr_chips	= 1,

	.chip		= &rd88f5181l_fxo_switch_chip_data,

};
@@ -120,7 +120,7 @@ static void __init rd88f5181l_fxo_init(void) 
	 */

	orion5x_ehci0_init();

	orion5x_eth_init(&rd88f5181l_fxo_eth_data);

	orion5x_eth_switch_init(&rd88f5181l_fxo_switch_plat_data, NO_IRQ);

	orion5x_eth_switch_init(&rd88f5181l_fxo_switch_plat_data);

	orion5x_uart0_init();



	mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,

arch/arm/mach-orion5x/rd88f5181l-ge-setup.c

+2 −3
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static struct dsa_chip_data rd88f5181l_ge_switch_chip_data = { 
	.port_names[7]	= "lan3",

};



static struct dsa_platform_data rd88f5181l_ge_switch_plat_data = {

static struct dsa_platform_data __initdata rd88f5181l_ge_switch_plat_data = {

	.nr_chips	= 1,

	.chip		= &rd88f5181l_ge_switch_chip_data,

};
@@ -125,8 +125,7 @@ static void __init rd88f5181l_ge_init(void) 
	 */

	orion5x_ehci0_init();

	orion5x_eth_init(&rd88f5181l_ge_eth_data);

	orion5x_eth_switch_init(&rd88f5181l_ge_switch_plat_data,

				gpio_to_irq(8));

	orion5x_eth_switch_init(&rd88f5181l_ge_switch_plat_data);

	orion5x_i2c_init();

	orion5x_uart0_init();