MIPS: Alchemy: move au1200fb global functions to platform data

au1200fb calls 3 functions which have to be defined in board code.
Fix this ugliness with the introduction of platform_data.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: linux-fbdev@vger.kernel.org
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2871/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 89 insertions, 69 deletions

diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
index 43f5f1be9d68..e2cc5f921538 100644
--- a/arch/mips/alchemy/devboards/db1200.c
+++ b/arch/mips/alchemy/devboards/db1200.c
@@ -37,6 +37,7 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1100_mmc.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
+#include <asm/mach-au1x00/au1200fb.h>
 #include <asm/mach-au1x00/au1550_spi.h>
 #include <asm/mach-db1x00/bcsr.h>
 #include <asm/mach-db1x00/db1200.h>
@@ -422,6 +423,33 @@ static struct platform_device db1200_mmc0_dev = {
 
 /**********************************************************************/
 
+static int db1200fb_panel_index(void)
+{
+        return (bcsr_read(BCSR_SWITCHES) >> 8) & 0x0f;
+}
+
+static int db1200fb_panel_init(void)
+{
+        /* Apply power */
+        bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |
+                                BCSR_BOARD_LCDBL);
+        return 0;
+}
+
+static int db1200fb_panel_shutdown(void)
+{
+        /* Remove power */
+        bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |
+                             BCSR_BOARD_LCDBL, 0);
+        return 0;
+}
+
+static struct au1200fb_platdata db1200fb_pd = {
+        .panel_index    = db1200fb_panel_index,
+        .panel_init     = db1200fb_panel_init,
+        .panel_shutdown = db1200fb_panel_shutdown,
+};
+
 static struct resource au1200_lcd_res[] = {
         [0] = {
                 .start  = AU1200_LCD_PHYS_ADDR,
@@ -443,6 +471,7 @@ static struct platform_device au1200_lcd_dev = {
         .dev = {
                 .dma_mask               = &au1200_lcd_dmamask,
                 .coherent_dma_mask      = DMA_BIT_MASK(32),
+                .platform_data          = &db1200fb_pd,
         },
         .num_resources  = ARRAY_SIZE(au1200_lcd_res),
         .resource       = au1200_lcd_res,
@@ -681,25 +710,3 @@ static int __init db1200_dev_init(void)
         return platform_add_devices(db1200_devs, ARRAY_SIZE(db1200_devs));
 }
 device_initcall(db1200_dev_init);
-
-/* au1200fb calls these: STERBT EINEN TRAGISCHEN TOD!!! */
-int board_au1200fb_panel(void)
-{
-        return (bcsr_read(BCSR_SWITCHES) >> 8) & 0x0f;
-}
-
-int board_au1200fb_panel_init(void)
-{
-        /* Apply power */
-        bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |
-                                BCSR_BOARD_LCDBL);
-        return 0;
-}
-
-int board_au1200fb_panel_shutdown(void)
-{
-        /* Remove power */
-        bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |
-                             BCSR_BOARD_LCDBL, 0);
-        return 0;
-}
diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index c41788c59278..7f3dacb60ea5 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -23,6 +23,7 @@
 
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1100_mmc.h>
+#include <asm/mach-au1x00/au1200fb.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
 #include <asm/mach-au1x00/au1xxx_psc.h>
 #include <asm/mach-db1x00/db1300.h>
@@ -636,6 +637,33 @@ static struct platform_device db1300_sndi2s_dev = {
 
 /**********************************************************************/
 
+static int db1300fb_panel_index(void)
+{
+        return 9;       /* DB1300_800x480 */
+}
+
+static int db1300fb_panel_init(void)
+{
+        /* Apply power (Vee/Vdd logic is inverted on Panel DB1300_800x480) */
+        bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD,
+                             BCSR_BOARD_LCDBL);
+        return 0;
+}
+
+static int db1300fb_panel_shutdown(void)
+{
+        /* Remove power (Vee/Vdd logic is inverted on Panel DB1300_800x480) */
+        bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDBL,
+                             BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD);
+        return 0;
+}
+
+static struct au1200fb_platdata db1300fb_pd = {
+        .panel_index    = db1300fb_panel_index,
+        .panel_init     = db1300fb_panel_init,
+        .panel_shutdown = db1300fb_panel_shutdown,
+};
+
 static struct resource au1300_lcd_res[] = {
         [0] = {
                 .start  = AU1200_LCD_PHYS_ADDR,
@@ -657,6 +685,7 @@ static struct platform_device db1300_lcd_dev = {
         .dev = {
                 .dma_mask               = &au1300_lcd_dmamask,
                 .coherent_dma_mask      = DMA_BIT_MASK(32),
+                .platform_data          = &db1300fb_pd,
         },
         .num_resources  = ARRAY_SIZE(au1300_lcd_res),
         .resource       = au1300_lcd_res,
@@ -762,26 +791,3 @@ void __init board_setup(void)
         alchemy_uart_enable(AU1300_UART1_PHYS_ADDR);
         alchemy_uart_enable(AU1300_UART3_PHYS_ADDR);
 }
-
-
-/* au1200fb calls these: STERBT EINEN TRAGISCHEN TOD!!! */
-int board_au1200fb_panel(void)
-{
-        return 9;       /* DB1300_800x480 */
-}
-
-int board_au1200fb_panel_init(void)
-{
-        /* Apply power (Vee/Vdd logic is inverted on Panel DB1300_800x480) */
-        bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD,
-                             BCSR_BOARD_LCDBL);
-        return 0;
-}
-
-int board_au1200fb_panel_shutdown(void)
-{
-        /* Remove power (Vee/Vdd logic is inverted on Panel DB1300_800x480) */
-        bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDBL,
-                             BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD);
-        return 0;
-}
diff --git a/arch/mips/alchemy/devboards/pb1200.c b/arch/mips/alchemy/devboards/pb1200.c
index a1b64977b471..a2676c95053b 100644
--- a/arch/mips/alchemy/devboards/pb1200.c
+++ b/arch/mips/alchemy/devboards/pb1200.c
@@ -26,6 +26,7 @@
 #include <linux/smc91x.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1100_mmc.h>
+#include <asm/mach-au1x00/au1200fb.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
 #include <asm/mach-db1x00/bcsr.h>
 #include <asm/mach-pb1x00/pb1200.h>
@@ -351,6 +352,33 @@ static struct platform_device pb1200_i2c_dev = {
         .resource       = au1200_psc0_res,
 };
 
+static int pb1200fb_panel_index(void)
+{
+        return (bcsr_read(BCSR_SWITCHES) >> 8) & 0x0f;
+}
+
+static int pb1200fb_panel_init(void)
+{
+        /* Apply power */
+        bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |
+                                BCSR_BOARD_LCDBL);
+        return 0;
+}
+
+static int pb1200fb_panel_shutdown(void)
+{
+        /* Remove power */
+        bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |
+                             BCSR_BOARD_LCDBL, 0);
+        return 0;
+}
+
+static struct au1200fb_platdata pb1200fb_pd = {
+        .panel_index    = pb1200fb_panel_index,
+        .panel_init     = pb1200fb_panel_init,
+        .panel_shutdown = pb1200fb_panel_shutdown,
+};
+
 static struct resource au1200_lcd_res[] = {
         [0] = {
                 .start  = AU1200_LCD_PHYS_ADDR,
@@ -366,12 +394,13 @@ static struct resource au1200_lcd_res[] = {
 
 static u64 au1200_lcd_dmamask = DMA_BIT_MASK(32);
 
-static struct platform_device au1200_lcd_dev = {
+static struct platform_device pb1200_lcd_dev = {
         .name           = "au1200-lcd",
         .id             = 0,
         .dev = {
                 .dma_mask               = &au1200_lcd_dmamask,
                 .coherent_dma_mask      = DMA_BIT_MASK(32),
+                .platform_data          = &pb1200fb_pd,
         },
         .num_resources  = ARRAY_SIZE(au1200_lcd_res),
         .resource       = au1200_lcd_res,
@@ -383,7 +412,7 @@ static struct platform_device *board_platform_devices[] __initdata = {
         &pb1200_i2c_dev,
         &pb1200_mmc0_dev,
         &pb1200_mmc1_dev,
-        &au1200_lcd_dev,
+        &pb1200_lcd_dev,
 };
 
 static int __init board_register_devices(void)
@@ -440,25 +469,3 @@ static int __init board_register_devices(void)
                                     ARRAY_SIZE(board_platform_devices));
 }
 device_initcall(board_register_devices);
-
-
-int board_au1200fb_panel(void)
-{
-        return (bcsr_read(BCSR_SWITCHES) >> 8) & 0x0f;
-}
-
-int board_au1200fb_panel_init(void)
-{
-        /* Apply power */
-        bcsr_mod(BCSR_BOARD, 0, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |
-                                BCSR_BOARD_LCDBL);
-        return 0;
-}
-
-int board_au1200fb_panel_shutdown(void)
-{
-        /* Remove power */
-        bcsr_mod(BCSR_BOARD, BCSR_BOARD_LCDVEE | BCSR_BOARD_LCDVDD |
-                             BCSR_BOARD_LCDBL, 0);
-        return 0;
-}