MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines

Now that no driver any longer depends on the CONFIG_SOC_AU1???  symbols,
it's time to get rid of them: Move some of the platform devices to the
boards which can use them, Rename a few (unused) constants in the header,
Replace them with MIPS_ALCHEMY in the various Kconfig files.  Finally
delete them altogether from the Alchemy Kconfig file.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/2707/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 71 insertions, 7 deletions

diff --git a/arch/mips/alchemy/devboards/db1200/platform.c b/arch/mips/alchemy/devboards/db1200/platform.c
index 1bc16f0e3651..aae08c1e876e 100644
--- a/arch/mips/alchemy/devboards/db1200/platform.c
+++ b/arch/mips/alchemy/devboards/db1200/platform.c
@@ -333,15 +333,77 @@ static struct led_classdev db1200_mmc_led = {
         .brightness_set = db1200_mmcled_set,
 };
 
-/* needed by arch/mips/alchemy/common/platform.c */
-struct au1xmmc_platform_data au1xmmc_platdata[] = {
+static struct au1xmmc_platform_data db1200mmc_platdata = {
+        .cd_setup       = db1200_mmc_cd_setup,
+        .set_power      = db1200_mmc_set_power,
+        .card_inserted  = db1200_mmc_card_inserted,
+        .card_readonly  = db1200_mmc_card_readonly,
+        .led            = &db1200_mmc_led,
+};
+
+static struct resource au1200_mmc0_resources[] = {
+        [0] = {
+                .start  = AU1100_SD0_PHYS_ADDR,
+                .end    = AU1100_SD0_PHYS_ADDR + 0xfff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AU1200_SD_INT,
+                .end    = AU1200_SD_INT,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                .start  = AU1200_DSCR_CMD0_SDMS_TX0,
+                .end    = AU1200_DSCR_CMD0_SDMS_TX0,
+                .flags  = IORESOURCE_DMA,
+        },
+        [3] = {
+                .start  = AU1200_DSCR_CMD0_SDMS_RX0,
+                .end    = AU1200_DSCR_CMD0_SDMS_RX0,
+                .flags  = IORESOURCE_DMA,
+        }
+};
+
+static u64 au1xxx_mmc_dmamask =  DMA_BIT_MASK(32);
+
+static struct platform_device db1200_mmc0_dev = {
+        .name           = "au1xxx-mmc",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = &au1xxx_mmc_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+                .platform_data          = &db1200mmc_platdata,
+        },
+        .num_resources  = ARRAY_SIZE(au1200_mmc0_resources),
+        .resource       = au1200_mmc0_resources,
+};
+
+/**********************************************************************/
+
+static struct resource au1200_lcd_res[] = {
         [0] = {
-                .cd_setup       = db1200_mmc_cd_setup,
-                .set_power      = db1200_mmc_set_power,
-                .card_inserted  = db1200_mmc_card_inserted,
-                .card_readonly  = db1200_mmc_card_readonly,
-                .led            = &db1200_mmc_led,
+                .start  = AU1200_LCD_PHYS_ADDR,
+                .end    = AU1200_LCD_PHYS_ADDR + 0x800 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AU1200_LCD_INT,
+                .end    = AU1200_LCD_INT,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+
+static u64 au1200_lcd_dmamask = DMA_BIT_MASK(32);
+
+static struct platform_device au1200_lcd_dev = {
+        .name           = "au1200-lcd",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = &au1200_lcd_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
         },
+        .num_resources  = ARRAY_SIZE(au1200_lcd_res),
+        .resource       = au1200_lcd_res,
 };
 
 /**********************************************************************/
@@ -442,6 +504,8 @@ static struct platform_device db1200_stac_dev = {
 static struct platform_device *db1200_devs[] __initdata = {
         NULL,           /* PSC0, selected by S6.8 */
         &db1200_ide_dev,
+        &db1200_mmc0_dev,
+        &au1200_lcd_dev,
         &db1200_eth_dev,
         &db1200_rtc_dev,
         &db1200_nand_dev,