MIPS: Loongson32: Remove DMA & NAND devices from ls1b/board.c
authorPaul Burton <paul.burton@mips.com>
Mon, 4 Feb 2019 22:44:33 +0000 (14:44 -0800)
committerPaul Burton <paul.burton@mips.com>
Mon, 4 Feb 2019 22:44:33 +0000 (14:44 -0800)
Commit 7b3415f581c7 ("MIPS: Loongson32: Remove unused platform devices")
removed the definitions of platform devices which have no in tree
drivers from common Loongson32 code, but missed their removal from
Loongson 1B board code in arch/mips/loongson32/ls1b/board.c. This causes
build failures due to the missing declarations of ls1x_dma_pdev,
ls1x_nand_pdev & their associated *_set_platdata functions.

Remove the dead code from arch/mips/loongson32/ls1b/board.c to fix the
build.

Signed-off-by: Paul Burton <paul.burton@mips.com>
Fixes: 7b3415f581c7 ("MIPS: Loongson32: Remove unused platform devices")
arch/mips/loongson32/ls1b/board.c

index 01aceaace314d0f57fd8d82cc453eac499f8ca4f..447b15fc0a2ba2d2c33392702b8de11132b36bd0 100644 (file)
 #include <nand.h>
 #include <platform.h>
 
-struct plat_ls1x_dma ls1x_dma_pdata = {
-       .nr_channels    = 3,
-};
-
-static struct mtd_partition ls1x_nand_parts[] = {
-       {
-               .name        = "kernel",
-               .offset      = 0,
-               .size        = SZ_16M,
-       },
-       {
-               .name        = "rootfs",
-               .offset      = MTDPART_OFS_APPEND,
-               .size        = MTDPART_SIZ_FULL,
-       },
-};
-
-struct plat_ls1x_nand ls1x_nand_pdata = {
-       .parts          = ls1x_nand_parts,
-       .nr_parts       = ARRAY_SIZE(ls1x_nand_parts),
-       .hold_cycle     = 0x2,
-       .wait_cycle     = 0xc,
-};
-
 static const struct gpio_led ls1x_gpio_leds[] __initconst = {
        {
                .name                   = "LED9",
@@ -64,13 +40,11 @@ static const struct gpio_led_platform_data ls1x_led_pdata __initconst = {
 static struct platform_device *ls1b_platform_devices[] __initdata = {
        &ls1x_uart_pdev,
        &ls1x_cpufreq_pdev,
-       &ls1x_dma_pdev,
        &ls1x_eth0_pdev,
        &ls1x_eth1_pdev,
        &ls1x_ehci_pdev,
        &ls1x_gpio0_pdev,
        &ls1x_gpio1_pdev,
-       &ls1x_nand_pdev,
        &ls1x_rtc_pdev,
        &ls1x_wdt_pdev,
 };
@@ -78,8 +52,6 @@ static struct platform_device *ls1b_platform_devices[] __initdata = {
 static int __init ls1b_platform_init(void)
 {
        ls1x_serial_set_uartclk(&ls1x_uart_pdev);
-       ls1x_dma_set_platdata(&ls1x_dma_pdata);
-       ls1x_nand_set_platdata(&ls1x_nand_pdata);
 
        gpio_led_register_device(-1, &ls1x_led_pdata);