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

diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 6af5430d0d97f911f4ac159c734221a23362b085..f72e1e9f5fc55b87e14cc7f7a9609317e1f7d274 100644 (file)
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -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);
 }
 
 /*****************************************************************************

diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 058994e9957034b8eef612d1368215b390beb88f..04910764c38591c6b4d5b7bc14b0ed79ef15c3e6 100644 (file)
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -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);
 }
 
 

diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h
index cd0389c6e822c5e01958ab350897ee38ae29ecc1..8a4115bd441daa2e3c16ff8ec52caafe53c43c6e 100644 (file)
--- a/arch/arm/mach-orion5x/common.h
+++ b/arch/arm/mach-orion5x/common.h
@@ -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);

diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index c742e7b40b0db544cf0446303db4daad2c7101df..dccadf68ea2b7bf5277490d6cb198f2b141a96e5 100644 (file)
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -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,

diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index 7e977b794b0cb8bbe864b468881e43b1986b6dd8..affe5ec825de2cbd819398e52bcb2dc22b6cc8b6 100644 (file)
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -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();
 

diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
index 4bf80dd5478c13f6acb87c9fb8efb120b4955b7a..67ee8571b03c86e16b014745d1c96de887b3a0e8 100644 (file)
--- 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();

diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c
index 4e1e5c8f61114c179ca6d3691a40c6115ae83426..4dbcdbe1de7ccb2f6e3e4bdc14d478a447c10453 100644 (file)
--- a/arch/arm/mach-orion5x/wnr854t-setup.c
+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
@@ -106,7 +106,7 @@ static struct dsa_chip_data wnr854t_switch_chip_data = {
        .port_names[7] = "lan2",
 };
 
-static struct dsa_platform_data wnr854t_switch_plat_data = {
+static struct dsa_platform_data __initdata wnr854t_switch_plat_data = {
        .nr_chips       = 1,
        .chip           = &wnr854t_switch_chip_data,
 };
@@ -124,7 +124,7 @@ static void __init wnr854t_init(void)
         * Configure peripherals.
         */
        orion5x_eth_init(&wnr854t_eth_data);
-       orion5x_eth_switch_init(&wnr854t_switch_plat_data, NO_IRQ);
+       orion5x_eth_switch_init(&wnr854t_switch_plat_data);
        orion5x_uart0_init();
 
        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,

diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index 61e9027ef22416e44d053edd2ff582ae7ea141c6..a6a8c4648d74f0382ca283440c359e12e7452d38 100644 (file)
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -191,7 +191,7 @@ static struct dsa_chip_data wrt350n_v2_switch_chip_data = {
        .port_names[7]  = "lan4",
 };
 
-static struct dsa_platform_data wrt350n_v2_switch_plat_data = {
+static struct dsa_platform_data __initdata wrt350n_v2_switch_plat_data = {
        .nr_chips       = 1,
        .chip           = &wrt350n_v2_switch_chip_data,
 };
@@ -210,7 +210,7 @@ static void __init wrt350n_v2_init(void)
         */
        orion5x_ehci0_init();
        orion5x_eth_init(&wrt350n_v2_eth_data);
-       orion5x_eth_switch_init(&wrt350n_v2_switch_plat_data, NO_IRQ);
+       orion5x_eth_switch_init(&wrt350n_v2_switch_plat_data);
        orion5x_uart0_init();
 
        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,

diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 78c8bf4043c06d1f3c8ad0d6e198224cfb777c57..272f49b2c68fc5606533b4110ab157bc6318c19e 100644 (file)
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -52,21 +52,27 @@ void __init orion_clkdev_init(struct clk *tclk)
 static void fill_resources(struct platform_device *device,
                           struct resource *resources,
                           resource_size_t mapbase,
-                          resource_size_t size,
-                          unsigned int irq)
+                          resource_size_t size)
 {
        device->resource = resources;
        device->num_resources = 1;
        resources[0].flags = IORESOURCE_MEM;
        resources[0].start = mapbase;
        resources[0].end = mapbase + size;
+}
 
-       if (irq != NO_IRQ) {
-               device->num_resources++;
-               resources[1].flags = IORESOURCE_IRQ;
-               resources[1].start = irq;
-               resources[1].end = irq;
-       }
+static void fill_resources_irq(struct platform_device *device,
+                              struct resource *resources,
+                              resource_size_t mapbase,
+                              resource_size_t size,
+                              unsigned int irq)
+{
+       fill_resources(device, resources, mapbase, size);
+
+       device->num_resources++;
+       resources[1].flags = IORESOURCE_IRQ;
+       resources[1].start = irq;
+       resources[1].end = irq;
 }
 
 /*****************************************************************************
@@ -93,7 +99,7 @@ static void __init uart_complete(
        data->uartclk = uart_get_clk_rate(clk);
        orion_uart->dev.platform_data = data;
 
-       fill_resources(orion_uart, resources, mapbase, 0xff, irq);
+       fill_resources_irq(orion_uart, resources, mapbase, 0xff, irq);
        platform_device_register(orion_uart);
 }
 
@@ -305,8 +311,8 @@ void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
                            unsigned int tx_csum_limit)
 {
        fill_resources(&orion_ge00_shared, orion_ge00_shared_resources,
-                      mapbase + 0x2000, SZ_16K - 1, NO_IRQ);
-       fill_resources(&orion_ge_mvmdio, orion_ge_mvmdio_resources,
+                      mapbase + 0x2000, SZ_16K - 1);
+       fill_resources_irq(&orion_ge_mvmdio, orion_ge_mvmdio_resources,
                        mapbase + 0x2004, 0x84 - 1, irq_err);
        orion_ge00_shared_data.tx_csum_limit = tx_csum_limit;
        ge_complete(&orion_ge00_shared_data,
@@ -354,11 +360,10 @@ static struct platform_device orion_ge01 = {
 void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
                            unsigned long mapbase,
                            unsigned long irq,
-                           unsigned long irq_err,
                            unsigned int tx_csum_limit)
 {
        fill_resources(&orion_ge01_shared, orion_ge01_shared_resources,
-                      mapbase + 0x2000, SZ_16K - 1, NO_IRQ);
+                      mapbase + 0x2000, SZ_16K - 1);
        orion_ge01_shared_data.tx_csum_limit = tx_csum_limit;
        ge_complete(&orion_ge01_shared_data,
                    orion_ge01_resources, irq, &orion_ge01_shared,
@@ -404,11 +409,10 @@ static struct platform_device orion_ge10 = {
 
 void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
                            unsigned long mapbase,
-                           unsigned long irq,
-                           unsigned long irq_err)
+                           unsigned long irq)
 {
        fill_resources(&orion_ge10_shared, orion_ge10_shared_resources,
-                      mapbase + 0x2000, SZ_16K - 1, NO_IRQ);
+                      mapbase + 0x2000, SZ_16K - 1);
        ge_complete(&orion_ge10_shared_data,
                    orion_ge10_resources, irq, &orion_ge10_shared,
                    NULL,
@@ -453,11 +457,10 @@ static struct platform_device orion_ge11 = {
 
 void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
                            unsigned long mapbase,
-                           unsigned long irq,
-                           unsigned long irq_err)
+                           unsigned long irq)
 {
        fill_resources(&orion_ge11_shared, orion_ge11_shared_resources,
-                      mapbase + 0x2000, SZ_16K - 1, NO_IRQ);
+                      mapbase + 0x2000, SZ_16K - 1);
        ge_complete(&orion_ge11_shared_data,
                    orion_ge11_resources, irq, &orion_ge11_shared,
                    NULL,
@@ -467,37 +470,15 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
 /*****************************************************************************
  * Ethernet switch
  ****************************************************************************/
-static struct resource orion_switch_resources[] = {
-       {
-               .start  = 0,
-               .end    = 0,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device orion_switch_device = {
-       .name           = "dsa",
-       .id             = 0,
-       .num_resources  = 0,
-       .resource       = orion_switch_resources,
-};
-
-void __init orion_ge00_switch_init(struct dsa_platform_data *d, int irq)
+void __init orion_ge00_switch_init(struct dsa_platform_data *d)
 {
        int i;
 
-       if (irq != NO_IRQ) {
-               orion_switch_resources[0].start = irq;
-               orion_switch_resources[0].end = irq;
-               orion_switch_device.num_resources = 1;
-       }
-
        d->netdev = &orion_ge00.dev;
        for (i = 0; i < d->nr_chips; i++)
                d->chip[i].host_dev = &orion_ge_mvmdio.dev;
-       orion_switch_device.dev.platform_data = d;
 
-       platform_device_register(&orion_switch_device);
+       platform_device_register_data(NULL, "dsa", 0, d, sizeof(d));
 }
 
 /*****************************************************************************
@@ -538,7 +519,7 @@ void __init orion_i2c_init(unsigned long mapbase,
                           unsigned long freq_m)
 {
        orion_i2c_pdata.freq_m = freq_m;
-       fill_resources(&orion_i2c, orion_i2c_resources, mapbase,
+       fill_resources_irq(&orion_i2c, orion_i2c_resources, mapbase,
                       SZ_32 - 1, irq);
        platform_device_register(&orion_i2c);
 }
@@ -548,7 +529,7 @@ void __init orion_i2c_1_init(unsigned long mapbase,
                             unsigned long freq_m)
 {
        orion_i2c_1_pdata.freq_m = freq_m;
-       fill_resources(&orion_i2c_1, orion_i2c_1_resources, mapbase,
+       fill_resources_irq(&orion_i2c_1, orion_i2c_1_resources, mapbase,
                       SZ_32 - 1, irq);
        platform_device_register(&orion_i2c_1);
 }
@@ -576,14 +557,14 @@ static struct platform_device orion_spi_1 = {
 void __init orion_spi_init(unsigned long mapbase)
 {
        fill_resources(&orion_spi, &orion_spi_resources,
-                      mapbase, SZ_512 - 1, NO_IRQ);
+                      mapbase, SZ_512 - 1);
        platform_device_register(&orion_spi);
 }
 
 void __init orion_spi_1_init(unsigned long mapbase)
 {
        fill_resources(&orion_spi_1, &orion_spi_1_resources,
-                      mapbase, SZ_512 - 1, NO_IRQ);
+                      mapbase, SZ_512 - 1);
        platform_device_register(&orion_spi_1);
 }
 
@@ -741,7 +722,7 @@ void __init orion_ehci_init(unsigned long mapbase,
                            enum orion_ehci_phy_ver phy_version)
 {
        orion_ehci_data.phy_version = phy_version;
-       fill_resources(&orion_ehci, orion_ehci_resources, mapbase, SZ_4K - 1,
+       fill_resources_irq(&orion_ehci, orion_ehci_resources, mapbase, SZ_4K - 1,
                       irq);
 
        platform_device_register(&orion_ehci);
@@ -765,7 +746,7 @@ static struct platform_device orion_ehci_1 = {
 void __init orion_ehci_1_init(unsigned long mapbase,
                              unsigned long irq)
 {
-       fill_resources(&orion_ehci_1, orion_ehci_1_resources,
+       fill_resources_irq(&orion_ehci_1, orion_ehci_1_resources,
                       mapbase, SZ_4K - 1, irq);
 
        platform_device_register(&orion_ehci_1);
@@ -789,7 +770,7 @@ static struct platform_device orion_ehci_2 = {
 void __init orion_ehci_2_init(unsigned long mapbase,
                              unsigned long irq)
 {
-       fill_resources(&orion_ehci_2, orion_ehci_2_resources,
+       fill_resources_irq(&orion_ehci_2, orion_ehci_2_resources,
                       mapbase, SZ_4K - 1, irq);
 
        platform_device_register(&orion_ehci_2);
@@ -819,7 +800,7 @@ void __init orion_sata_init(struct mv_sata_platform_data *sata_data,
                            unsigned long irq)
 {
        orion_sata.dev.platform_data = sata_data;
-       fill_resources(&orion_sata, orion_sata_resources,
+       fill_resources_irq(&orion_sata, orion_sata_resources,
                       mapbase, 0x5000 - 1, irq);
 
        platform_device_register(&orion_sata);
@@ -849,7 +830,7 @@ void __init orion_crypto_init(unsigned long mapbase,
                              unsigned long sram_size,
                              unsigned long irq)
 {
-       fill_resources(&orion_crypto, orion_crypto_resources,
+       fill_resources_irq(&orion_crypto, orion_crypto_resources,
                       mapbase, 0xffff, irq);
        orion_crypto.num_resources = 3;
        orion_crypto_resources[2].start = srambase;

diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
index 9e6d76ad48a9d16bc9a80bab7b06172d2ff14509..9347f3c58a6dfc7f44f340cbd47b8e45f698d04a 100644 (file)
--- a/arch/arm/plat-orion/include/plat/common.h
+++ b/arch/arm/plat-orion/include/plat/common.h
@@ -47,21 +47,17 @@ void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
 void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
                            unsigned long mapbase,
                            unsigned long irq,
-                           unsigned long irq_err,
                            unsigned int tx_csum_limit);
 
 void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
                            unsigned long mapbase,
-                           unsigned long irq,
-                           unsigned long irq_err);
+                           unsigned long irq);
 
 void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
                            unsigned long mapbase,
-                           unsigned long irq,
-                           unsigned long irq_err);
+                           unsigned long irq);
 
-void __init orion_ge00_switch_init(struct dsa_platform_data *d,
-                                  int irq);
+void __init orion_ge00_switch_init(struct dsa_platform_data *d);
 
 void __init orion_i2c_init(unsigned long mapbase,
                           unsigned long irq,