Merge branch 'common/fbdev' of master.kernel.org:/pub/scm/linux/kernel/git/lethal...

[sfrench/cifs-2.6.git] / arch / arm / mach-davinci / devices-tnetv107x.c

diff --git a/arch/arm/mach-davinci/devices-tnetv107x.c b/arch/arm/mach-davinci/devices-tnetv107x.c
index 85503debda51084090010b57f212b28b8e5b397c..6162cae7f868e2febb07f4c3496ff61443356bb1 100644 (file)
--- a/arch/arm/mach-davinci/devices-tnetv107x.c
+++ b/arch/arm/mach-davinci/devices-tnetv107x.c
@@ -35,6 +35,7 @@
 #define TNETV107X_SDIO0_BASE                   0x08088700
 #define TNETV107X_SDIO1_BASE                   0x08088800
 #define TNETV107X_KEYPAD_BASE                  0x08088a00
+#define TNETV107X_SSP_BASE                     0x08088c00
 #define TNETV107X_ASYNC_EMIF_CNTRL_BASE                0x08200000
 #define TNETV107X_ASYNC_EMIF_DATA_CE0_BASE     0x30000000
 #define TNETV107X_ASYNC_EMIF_DATA_CE1_BASE     0x40000000
@@ -342,6 +343,25 @@ static struct platform_device tsc_device = {
        .resource       = tsc_resources,
 };
 
+static struct resource ssp_resources[] = {
+       {
+               .start  = TNETV107X_SSP_BASE,
+               .end    = TNETV107X_SSP_BASE + 0x1ff,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = IRQ_TNETV107X_SSP,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device ssp_device = {
+       .name           = "ti-ssp",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(ssp_resources),
+       .resource       = ssp_resources,
+};
+
 void __init tnetv107x_devices_init(struct tnetv107x_device_info *info)
 {
        int i, error;
@@ -380,4 +400,9 @@ void __init tnetv107x_devices_init(struct tnetv107x_device_info *info)
                keypad_device.dev.platform_data = info->keypad_config;
                platform_device_register(&keypad_device);
        }
+
+       if (info->ssp_config) {
+               ssp_device.dev.platform_data = info->ssp_config;
+               platform_device_register(&ssp_device);
+       }
 }