ARM: imx: dynamically allocate imx-ssi devices

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

7 files changed, 16 insertions, 45 deletions

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 19ed16d0017e..9b45f1f523fa 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -146,8 +146,8 @@ choice
         default MACH_EUKREA_MBIMX27_BASEBOARD
 
 config MACH_EUKREA_MBIMX27_BASEBOARD
-        prompt "Eukrea MBIMX27 development board"
-        bool
+        bool "Eukrea MBIMX27 development board"
+        select IMX_HAVE_PLATFORM_IMX_SSI
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_SPI_IMX
         help
@@ -182,6 +182,7 @@ config MACH_IMX27LITE
 config MACH_PCA100
         bool "Phytec phyCARD-s (pca100)"
         select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_SSI
         select IMX_HAVE_PLATFORM_IMX_UART
         select IMX_HAVE_PLATFORM_MXC_NAND
         select IMX_HAVE_PLATFORM_SPI_IMX
diff --git a/arch/arm/mach-imx/devices-imx21.h b/arch/arm/mach-imx/devices-imx21.h
index f75b5e4d0ed5..24868c36d824 100644
--- a/arch/arm/mach-imx/devices-imx21.h
+++ b/arch/arm/mach-imx/devices-imx21.h
@@ -12,6 +12,10 @@
 #define imx21_add_i2c_imx(pdata)        \
         imx_add_imx_i2c(0, MX2x_I2C_BASE_ADDR, SZ_4K, MX2x_INT_I2C, pdata)
 
+extern const struct imx_imx_ssi_data imx21_imx_ssi_data[] __initconst;
+#define imx21_add_imx_ssi(id, pdata)    \
+        imx_add_imx_ssi(&imx21_imx_ssi_data[id], pdata)
+
 extern const struct imx_imx_uart_1irq_data imx21_imx_uart_data[] __initconst;
 #define imx21_add_imx_uart(id, pdata)   \
         imx_add_imx_uart_1irq(&imx21_imx_uart_data[id], pdata)
diff --git a/arch/arm/mach-imx/devices-imx27.h b/arch/arm/mach-imx/devices-imx27.h
index bf9dab3a0858..2972e6912af4 100644
--- a/arch/arm/mach-imx/devices-imx27.h
+++ b/arch/arm/mach-imx/devices-imx27.h
@@ -14,6 +14,10 @@
 #define imx27_add_i2c_imx1(pdata)       \
         imx_add_imx_i2c(1, MX27_I2C2_BASE_ADDR, SZ_4K, MX27_INT_I2C2, pdata)
 
+extern const struct imx_imx_ssi_data imx27_imx_ssi_data[] __initconst;
+#define imx27_add_imx_ssi(id, pdata)    \
+        imx_add_imx_ssi(&imx27_imx_ssi_data[id], pdata)
+
 extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[] __initconst;
 #define imx27_add_imx_uart(id, pdata)   \
         imx_add_imx_uart_1irq(&imx27_imx_uart_data[id], pdata)
diff --git a/arch/arm/mach-imx/devices.c b/arch/arm/mach-imx/devices.c
index 9c271a752b84..423fa05dabd0 100644
--- a/arch/arm/mach-imx/devices.c
+++ b/arch/arm/mach-imx/devices.c
@@ -480,41 +480,6 @@ struct platform_device mxc_usbh2 = {
 };
 #endif
 
-#define DEFINE_IMX_SSI_DMARES(_name, ssin, suffix)                      \
-        {                                                               \
-                .name = _name,                                          \
-                .start = MX2x_DMA_REQ_SSI ## ssin ## _ ## suffix,       \
-                .end = MX2x_DMA_REQ_SSI ## ssin ## _ ## suffix,         \
-                .flags = IORESOURCE_DMA,                                \
-        }
-
-#define DEFINE_IMX_SSI_DEVICE(n, ssin, baseaddr, irq)                   \
-        static struct resource imx_ssi_resources ## n[] = {             \
-                {                                                       \
-                        .start = MX2x_SSI ## ssin ## _BASE_ADDR,        \
-                        .end = MX2x_SSI ## ssin ## _BASE_ADDR + 0x6f,   \
-                        .flags = IORESOURCE_MEM,                        \
-                }, {                                                    \
-                        .start = MX2x_INT_SSI1,                         \
-                        .end = MX2x_INT_SSI1,                           \
-                        .flags = IORESOURCE_IRQ,                        \
-                },                                                      \
-                DEFINE_IMX_SSI_DMARES("tx0", ssin, TX0),                \
-                DEFINE_IMX_SSI_DMARES("rx0", ssin, RX0),                \
-                DEFINE_IMX_SSI_DMARES("tx1", ssin, TX1),                \
-                DEFINE_IMX_SSI_DMARES("rx1", ssin, RX1),                \
-        };                                                              \
-                                                                        \
-        struct platform_device imx_ssi_device ## n = {                  \
-                .name = "imx-ssi",                                      \
-                .id = n,                                                \
-                .num_resources = ARRAY_SIZE(imx_ssi_resources ## n),    \
-                .resource = imx_ssi_resources ## n,                     \
-        }
-
-DEFINE_IMX_SSI_DEVICE(0, 1, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1);
-DEFINE_IMX_SSI_DEVICE(1, 2, MX2x_SSI1_BASE_ADDR, MX2x_INT_SSI1);
-
 /* GPIO port description */
 #define DEFINE_MXC_GPIO_PORT_IRQ(SOC, n, _irq)                          \
         {                                                               \
diff --git a/arch/arm/mach-imx/devices.h b/arch/arm/mach-imx/devices.h
index efd4527506a5..57d4b1cac039 100644
--- a/arch/arm/mach-imx/devices.h
+++ b/arch/arm/mach-imx/devices.h
@@ -26,7 +26,5 @@ extern struct platform_device mxc_otg_host;
 extern struct platform_device mxc_usbh1;
 extern struct platform_device mxc_usbh2;
 extern struct platform_device mx21_usbhc_device;
-extern struct platform_device imx_ssi_device0;
-extern struct platform_device imx_ssi_device1;
 extern struct platform_device imx_kpp_device;
 #endif
diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
index 4edc5f439201..cb433aeec939 100644
--- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
@@ -36,7 +36,6 @@
 #include <mach/hardware.h>
 #include <mach/mmc.h>
 #include <mach/spi.h>
-#include <mach/ssi.h>
 #include <mach/audmux.h>
 
 #include "devices-imx27.h"
@@ -311,7 +310,8 @@ static struct imxmmc_platform_data sdhc_pdata = {
         .dat3_card_detect = 1,
 };
 
-struct imx_ssi_platform_data eukrea_mbimx27_ssi_pdata = {
+static const
+struct imx_ssi_platform_data eukrea_mbimx27_ssi_pdata __initconst = {
         .flags = IMX_SSI_DMA | IMX_SSI_USE_I2S_SLAVE,
 };
 
@@ -357,7 +357,7 @@ void __init eukrea_mbimx27_baseboard_init(void)
         i2c_register_board_info(0, eukrea_mbimx27_i2c_devices,
                                 ARRAY_SIZE(eukrea_mbimx27_i2c_devices));
 
-        mxc_register_device(&imx_ssi_device0, &eukrea_mbimx27_ssi_pdata);
+        imx27_add_imx_ssi(0, &eukrea_mbimx27_ssi_pdata);
 
 #if defined(CONFIG_TOUCHSCREEN_ADS7846) \
         || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index 23c9e1f37b9c..93e0d66e37dc 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -38,7 +38,6 @@
 #include <mach/iomux-mx27.h>
 #include <asm/mach/time.h>
 #include <mach/audmux.h>
-#include <mach/ssi.h>
 #include <mach/mxc_nand.h>
 #include <mach/irqs.h>
 #include <mach/mmc.h>
@@ -252,7 +251,7 @@ static void pca100_ac97_cold_reset(struct snd_ac97 *ac97)
         msleep(2);
 }
 
-static struct imx_ssi_platform_data pca100_ssi_pdata = {
+static const struct imx_ssi_platform_data pca100_ssi_pdata __initconst = {
         .ac97_reset             = pca100_ac97_cold_reset,
         .ac97_warm_reset        = pca100_ac97_warm_reset,
         .flags                  = IMX_SSI_USE_AC97,
@@ -389,7 +388,7 @@ static void __init pca100_init(void)
         if (ret)
                 printk(KERN_ERR "pca100: Failed to setup pins (%d)\n", ret);
 
-        mxc_register_device(&imx_ssi_device0, &pca100_ssi_pdata);
+        imx27_add_imx_ssi(0, &pca100_ssi_pdata);
 
         imx27_add_imx_uart0(&uart_pdata);