Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm / plat-orion / common.c

diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 78c8bf4..272f49b 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;