ARM: Orion: Remove address map info from all platform data structures

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Michael Walle <michael@walle.cc>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>

6 files changed, 13 insertions, 58 deletions

diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 9e5451b3c8e..e5a2fde29b1 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -13,7 +13,6 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/serial_8250.h>
-#include <linux/mbus.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/mv643xx_i2c.h>
@@ -203,13 +202,12 @@ void __init orion_rtc_init(unsigned long mapbase,
  ****************************************************************************/
 static __init void ge_complete(
         struct mv643xx_eth_shared_platform_data *orion_ge_shared_data,
-        struct mbus_dram_target_info *mbus_dram_info, int tclk,
+        int tclk,
         struct resource *orion_ge_resource, unsigned long irq,
         struct platform_device *orion_ge_shared,
         struct mv643xx_eth_platform_data *eth_data,
         struct platform_device *orion_ge)
 {
-        orion_ge_shared_data->dram = mbus_dram_info;
         orion_ge_shared_data->t_clk = tclk;
         orion_ge_resource->start = irq;
         orion_ge_resource->end = irq;
@@ -259,7 +257,6 @@ static struct platform_device orion_ge00 = {
 };
 
 void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
@@ -267,7 +264,7 @@ void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
 {
         fill_resources(&orion_ge00_shared, orion_ge00_shared_resources,
                        mapbase + 0x2000, SZ_16K - 1, irq_err);
-        ge_complete(&orion_ge00_shared_data, mbus_dram_info, tclk,
+        ge_complete(&orion_ge00_shared_data, tclk,
                     orion_ge00_resources, irq, &orion_ge00_shared,
                     eth_data, &orion_ge00);
 }
@@ -313,7 +310,6 @@ static struct platform_device orion_ge01 = {
 };
 
 void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
@@ -321,7 +317,7 @@ void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
 {
         fill_resources(&orion_ge01_shared, orion_ge01_shared_resources,
                        mapbase + 0x2000, SZ_16K - 1, irq_err);
-        ge_complete(&orion_ge01_shared_data, mbus_dram_info, tclk,
+        ge_complete(&orion_ge01_shared_data, tclk,
                     orion_ge01_resources, irq, &orion_ge01_shared,
                     eth_data, &orion_ge01);
 }
@@ -367,7 +363,6 @@ static struct platform_device orion_ge10 = {
 };
 
 void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
@@ -375,7 +370,7 @@ void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
 {
         fill_resources(&orion_ge10_shared, orion_ge10_shared_resources,
                        mapbase + 0x2000, SZ_16K - 1, irq_err);
-        ge_complete(&orion_ge10_shared_data, mbus_dram_info, tclk,
+        ge_complete(&orion_ge10_shared_data, tclk,
                     orion_ge10_resources, irq, &orion_ge10_shared,
                     eth_data, &orion_ge10);
 }
@@ -421,7 +416,6 @@ static struct platform_device orion_ge11 = {
 };
 
 void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
@@ -429,7 +423,7 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
 {
         fill_resources(&orion_ge11_shared, orion_ge11_shared_resources,
                        mapbase + 0x2000, SZ_16K - 1, irq_err);
-        ge_complete(&orion_ge11_shared_data, mbus_dram_info, tclk,
+        ge_complete(&orion_ge11_shared_data, tclk,
                     orion_ge11_resources, irq, &orion_ge11_shared,
                     eth_data, &orion_ge11);
 }
@@ -592,8 +586,6 @@ void __init orion_wdt_init(unsigned long tclk)
 /*****************************************************************************
  * XOR
  ****************************************************************************/
-static struct mv_xor_platform_shared_data orion_xor_shared_data;
-
 static u64 orion_xor_dmamask = DMA_BIT_MASK(32);
 
 void __init orion_xor_init_channels(
@@ -632,9 +624,6 @@ static struct resource orion_xor0_shared_resources[] = {
 static struct platform_device orion_xor0_shared = {
         .name           = MV_XOR_SHARED_NAME,
         .id             = 0,
-        .dev            = {
-                .platform_data = &orion_xor_shared_data,
-        },
         .num_resources  = ARRAY_SIZE(orion_xor0_shared_resources),
         .resource       = orion_xor0_shared_resources,
 };
@@ -687,14 +676,11 @@ static struct platform_device orion_xor01_channel = {
         },
 };
 
-void __init orion_xor0_init(struct mbus_dram_target_info *mbus_dram_info,
-                            unsigned long mapbase_low,
+void __init orion_xor0_init(unsigned long mapbase_low,
                             unsigned long mapbase_high,
                             unsigned long irq_0,
                             unsigned long irq_1)
 {
-        orion_xor_shared_data.dram = mbus_dram_info;
-
         orion_xor0_shared_resources[0].start = mapbase_low;
         orion_xor0_shared_resources[0].end = mapbase_low + 0xff;
         orion_xor0_shared_resources[1].start = mapbase_high;
@@ -727,9 +713,6 @@ static struct resource orion_xor1_shared_resources[] = {
 static struct platform_device orion_xor1_shared = {
         .name           = MV_XOR_SHARED_NAME,
         .id             = 1,
-        .dev            = {
-                .platform_data = &orion_xor_shared_data,
-        },
         .num_resources  = ARRAY_SIZE(orion_xor1_shared_resources),
         .resource       = orion_xor1_shared_resources,
 };
@@ -828,11 +811,9 @@ static struct platform_device orion_ehci = {
         },
 };
 
-void __init orion_ehci_init(struct mbus_dram_target_info *mbus_dram_info,
-                            unsigned long mapbase,
+void __init orion_ehci_init(unsigned long mapbase,
                             unsigned long irq)
 {
-        orion_ehci_data.dram = mbus_dram_info;
         fill_resources(&orion_ehci, orion_ehci_resources, mapbase, SZ_4K - 1,
                        irq);
 
@@ -854,11 +835,9 @@ static struct platform_device orion_ehci_1 = {
         },
 };
 
-void __init orion_ehci_1_init(struct mbus_dram_target_info *mbus_dram_info,
-                              unsigned long mapbase,
+void __init orion_ehci_1_init(unsigned long mapbase,
                               unsigned long irq)
 {
-        orion_ehci_data.dram = mbus_dram_info;
         fill_resources(&orion_ehci_1, orion_ehci_1_resources,
                        mapbase, SZ_4K - 1, irq);
 
@@ -880,11 +859,9 @@ static struct platform_device orion_ehci_2 = {
         },
 };
 
-void __init orion_ehci_2_init(struct mbus_dram_target_info *mbus_dram_info,
-                              unsigned long mapbase,
+void __init orion_ehci_2_init(unsigned long mapbase,
                               unsigned long irq)
 {
-        orion_ehci_data.dram = mbus_dram_info;
         fill_resources(&orion_ehci_2, orion_ehci_2_resources,
                        mapbase, SZ_4K - 1, irq);
 
@@ -911,11 +888,9 @@ static struct platform_device orion_sata = {
 };
 
 void __init orion_sata_init(struct mv_sata_platform_data *sata_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq)
 {
-        sata_data->dram = mbus_dram_info;
         orion_sata.dev.platform_data = sata_data;
         fill_resources(&orion_sata, orion_sata_resources,
                        mapbase, 0x5000 - 1, irq);
diff --git a/arch/arm/plat-orion/include/plat/audio.h b/arch/arm/plat-orion/include/plat/audio.h
index 9cf1f781329..885f8abd927 100644
--- a/arch/arm/plat-orion/include/plat/audio.h
+++ b/arch/arm/plat-orion/include/plat/audio.h
@@ -1,11 +1,8 @@
 #ifndef __PLAT_AUDIO_H
 #define __PLAT_AUDIO_H
 
-#include <linux/mbus.h>
-
 struct kirkwood_asoc_platform_data {
         u32 tclk;
-        struct mbus_dram_target_info *dram;
         int burst;
 };
 #endif
diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
index a63c357e2ab..0fe08d77e83 100644
--- a/arch/arm/plat-orion/include/plat/common.h
+++ b/arch/arm/plat-orion/include/plat/common.h
@@ -37,28 +37,24 @@ void __init orion_rtc_init(unsigned long mapbase,
                            unsigned long irq);
 
 void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
                             int tclk);
 
 void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
                             int tclk);
 
 void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
                             int tclk);
 
 void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
@@ -82,8 +78,7 @@ void __init orion_spi_1_init(unsigned long mapbase,
 
 void __init orion_wdt_init(unsigned long tclk);
 
-void __init orion_xor0_init(struct mbus_dram_target_info *mbus_dram_info,
-                            unsigned long mapbase_low,
+void __init orion_xor0_init(unsigned long mapbase_low,
                             unsigned long mapbase_high,
                             unsigned long irq_0,
                             unsigned long irq_1);
@@ -93,20 +88,16 @@ void __init orion_xor1_init(unsigned long mapbase_low,
                             unsigned long irq_0,
                             unsigned long irq_1);
 
-void __init orion_ehci_init(struct mbus_dram_target_info *mbus_dram_info,
-                            unsigned long mapbase,
+void __init orion_ehci_init(unsigned long mapbase,
                             unsigned long irq);
 
-void __init orion_ehci_1_init(struct mbus_dram_target_info *mbus_dram_info,
-                              unsigned long mapbase,
+void __init orion_ehci_1_init(unsigned long mapbase,
                               unsigned long irq);
 
-void __init orion_ehci_2_init(struct mbus_dram_target_info *mbus_dram_info,
-                              unsigned long mapbase,
+void __init orion_ehci_2_init(unsigned long mapbase,
                               unsigned long irq);
 
 void __init orion_sata_init(struct mv_sata_platform_data *sata_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq);
 
diff --git a/arch/arm/plat-orion/include/plat/ehci-orion.h b/arch/arm/plat-orion/include/plat/ehci-orion.h
index 4ec668e7746..6fc78e43042 100644
--- a/arch/arm/plat-orion/include/plat/ehci-orion.h
+++ b/arch/arm/plat-orion/include/plat/ehci-orion.h
@@ -19,7 +19,6 @@ enum orion_ehci_phy_ver {
 };
 
 struct orion_ehci_data {
-        struct mbus_dram_target_info    *dram;
         enum orion_ehci_phy_ver phy_version;
 };
 
diff --git a/arch/arm/plat-orion/include/plat/mv_xor.h b/arch/arm/plat-orion/include/plat/mv_xor.h
index bd5f3bdb4ae..2ba1f7d76ee 100644
--- a/arch/arm/plat-orion/include/plat/mv_xor.h
+++ b/arch/arm/plat-orion/include/plat/mv_xor.h
@@ -13,12 +13,6 @@
 #define MV_XOR_SHARED_NAME      "mv_xor_shared"
 #define MV_XOR_NAME             "mv_xor"
 
-struct mbus_dram_target_info;
-
-struct mv_xor_platform_shared_data {
-        struct mbus_dram_target_info    *dram;
-};
-
 struct mv_xor_platform_data {
         struct platform_device          *shared;
         int                             hw_id;
diff --git a/arch/arm/plat-orion/include/plat/mvsdio.h b/arch/arm/plat-orion/include/plat/mvsdio.h
index 14ca8867600..1190efedcb9 100644
--- a/arch/arm/plat-orion/include/plat/mvsdio.h
+++ b/arch/arm/plat-orion/include/plat/mvsdio.h
@@ -12,7 +12,6 @@
 #include <linux/mbus.h>
 
 struct mvsdio_platform_data {
-        struct mbus_dram_target_info *dram;
         unsigned int clock;
         int gpio_card_detect;
         int gpio_write_protect;