drivers/video: use strings to specify the Freescale DIU monitor port

Instead of using ill-defined numbers (0, 1, and 2) for the monitor port, allow
the user to specify the port by name ("dvi", "lvds", or "dlvds").  This works
on the kernel command line, the module command-line, and the sysfs "monitor"
device.

Note that changing the monitor port does not currently work on the P1022DS,
because the code that talks to the PIXIS FPGA is broken.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

4 files changed, 73 insertions, 76 deletions

diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index e41ebbdb3e12..3dc62f907a1e 100644
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -66,8 +66,8 @@ struct fsl_diu_shared_fb {
         bool            in_use;
 };
 
-unsigned int mpc512x_get_pixel_format(unsigned int bits_per_pixel,
-                                      int monitor_port)
+u32 mpc512x_get_pixel_format(enum fsl_diu_monitor_port port,
+                             unsigned int bits_per_pixel)
 {
         switch (bits_per_pixel) {
         case 32:
@@ -80,11 +80,12 @@ unsigned int mpc512x_get_pixel_format(unsigned int bits_per_pixel,
         return 0x00000400;
 }
 
-void mpc512x_set_gamma_table(int monitor_port, char *gamma_table_base)
+void mpc512x_set_gamma_table(enum fsl_diu_monitor_port port,
+                             char *gamma_table_base)
 {
 }
 
-void mpc512x_set_monitor_port(int monitor_port)
+void mpc512x_set_monitor_port(enum fsl_diu_monitor_port port)
 {
 }
 
@@ -182,14 +183,10 @@ void mpc512x_set_pixel_clock(unsigned int pixclock)
         iounmap(ccm);
 }
 
-ssize_t mpc512x_show_monitor_port(int monitor_port, char *buf)
+enum fsl_diu_monitor_port
+mpc512x_valid_monitor_port(enum fsl_diu_monitor_port port)
 {
-        return sprintf(buf, "0 - 5121 LCD\n");
-}
-
-int mpc512x_set_sysfs_monitor_port(int val)
-{
-        return 0;
+        return FSL_DIU_PORT_DVI;
 }
 
 static struct fsl_diu_shared_fb __attribute__ ((__aligned__(8))) diu_shared_fb;
@@ -332,8 +329,7 @@ void __init mpc512x_setup_diu(void)
         diu_ops.set_gamma_table         = mpc512x_set_gamma_table;
         diu_ops.set_monitor_port        = mpc512x_set_monitor_port;
         diu_ops.set_pixel_clock         = mpc512x_set_pixel_clock;
-        diu_ops.show_monitor_port       = mpc512x_show_monitor_port;
-        diu_ops.set_sysfs_monitor_port  = mpc512x_set_sysfs_monitor_port;
+        diu_ops.valid_monitor_port      = mpc512x_valid_monitor_port;
         diu_ops.release_bootmem         = mpc512x_release_bootmem;
 #endif
 }
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 7eb5c40c069f..a13d3cce413c 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -93,8 +93,8 @@
  * The Area Descriptor is a 32-bit value that determine which bits in each
  * pixel are to be used for each color.
  */
-static unsigned int p1022ds_get_pixel_format(unsigned int bits_per_pixel,
-        int monitor_port)
+static u32 p1022ds_get_pixel_format(enum fsl_diu_monitor_port port,
+                                    unsigned int bits_per_pixel)
 {
         switch (bits_per_pixel) {
         case 32:
@@ -118,7 +118,8 @@ static unsigned int p1022ds_get_pixel_format(unsigned int bits_per_pixel,
  * On some boards, the gamma table for some ports may need to be modified.
  * This is not the case on the P1022DS, so we do nothing.
 */
-static void p1022ds_set_gamma_table(int monitor_port, char *gamma_table_base)
+static void p1022ds_set_gamma_table(enum fsl_diu_monitor_port port,
+                                    char *gamma_table_base)
 {
 }
 
@@ -126,7 +127,7 @@ static void p1022ds_set_gamma_table(int monitor_port, char *gamma_table_base)
  * p1022ds_set_monitor_port: switch the output to a different monitor port
  *
  */
-static void p1022ds_set_monitor_port(int monitor_port)
+static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port)
 {
         struct device_node *pixis_node;
         u8 __iomem *brdcfg1;
@@ -144,19 +145,21 @@ static void p1022ds_set_monitor_port(int monitor_port)
         }
         brdcfg1 += 9;   /* BRDCFG1 is at offset 9 in the ngPIXIS */
 
-        switch (monitor_port) {
-        case 0: /* DVI */
+        switch (port) {
+        case FSL_DIU_PORT_DVI:
+                printk(KERN_INFO "%s:%u\n", __func__, __LINE__);
                 /* Enable the DVI port, disable the DFP and the backlight */
                 clrsetbits_8(brdcfg1, PX_BRDCFG1_DFPEN | PX_BRDCFG1_BACKLIGHT,
                              PX_BRDCFG1_DVIEN);
                 break;
-        case 1: /* Single link LVDS */
+        case FSL_DIU_PORT_LVDS:
+                printk(KERN_INFO "%s:%u\n", __func__, __LINE__);
                 /* Enable the DFP port, disable the DVI and the backlight */
                 clrsetbits_8(brdcfg1, PX_BRDCFG1_DVIEN | PX_BRDCFG1_BACKLIGHT,
                              PX_BRDCFG1_DFPEN);
                 break;
         default:
-                pr_err("p1022ds: unsupported monitor port %i\n", monitor_port);
+                pr_err("p1022ds: unsupported monitor port %i\n", port);
         }
 }
 
@@ -204,23 +207,18 @@ void p1022ds_set_pixel_clock(unsigned int pixclock)
 }
 
 /**
- * p1022ds_show_monitor_port: show the current monitor
- *
- * This function returns a string indicating whether the current monitor is
- * set to DVI or LVDS.
- */
-ssize_t p1022ds_show_monitor_port(int monitor_port, char *buf)
-{
-        return sprintf(buf, "%c0 - DVI\n%c1 - Single link LVDS\n",
-                monitor_port == 0 ? '*' : ' ', monitor_port == 1 ? '*' : ' ');
-}
-
-/**
- * p1022ds_set_sysfs_monitor_port: set the monitor port for sysfs
+ * p1022ds_valid_monitor_port: set the monitor port for sysfs
  */
-int p1022ds_set_sysfs_monitor_port(int val)
+enum fsl_diu_monitor_port
+p1022ds_valid_monitor_port(enum fsl_diu_monitor_port port)
 {
-        return val < 2 ? val : 0;
+        switch (port) {
+        case FSL_DIU_PORT_DVI:
+        case FSL_DIU_PORT_LVDS:
+                return port;
+        default:
+                return FSL_DIU_PORT_DVI; /* Dual-link LVDS is not supported */
+        }
 }
 
 #endif
@@ -295,8 +293,7 @@ static void __init p1022_ds_setup_arch(void)
         diu_ops.set_gamma_table         = p1022ds_set_gamma_table;
         diu_ops.set_monitor_port        = p1022ds_set_monitor_port;
         diu_ops.set_pixel_clock         = p1022ds_set_pixel_clock;
-        diu_ops.show_monitor_port       = p1022ds_show_monitor_port;
-        diu_ops.set_sysfs_monitor_port  = p1022ds_set_sysfs_monitor_port;
+        diu_ops.valid_monitor_port      = p1022ds_valid_monitor_port;
 #endif
 
 #ifdef CONFIG_SMP
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index a896511690c2..0d80e9614f31 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -145,10 +145,10 @@ machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
         (c2 << AD_COMP_2_SHIFT) | (c1 << AD_COMP_1_SHIFT) | \
         (c0 << AD_COMP_0_SHIFT) | (size << AD_PIXEL_S_SHIFT))
 
-unsigned int mpc8610hpcd_get_pixel_format(unsigned int bits_per_pixel,
-                                                int monitor_port)
+u32 mpc8610hpcd_get_pixel_format(enum fsl_diu_monitor_port port,
+                                 unsigned int bits_per_pixel)
 {
-        static const unsigned long pixelformat[][3] = {
+        static const u32 pixelformat[][3] = {
                 {
                         MAKE_AD(3, 0, 2, 1, 3, 8, 8, 8, 8),
                         MAKE_AD(4, 2, 0, 1, 2, 8, 8, 8, 0),
@@ -163,7 +163,8 @@ unsigned int mpc8610hpcd_get_pixel_format(unsigned int bits_per_pixel,
         unsigned int arch_monitor;
 
         /* The DVI port is mis-wired on revision 1 of this board. */
-        arch_monitor = ((*pixis_arch == 0x01) && (monitor_port == 0))? 0 : 1;
+        arch_monitor =
+                ((*pixis_arch == 0x01) && (port == FSL_DIU_PORT_DVI)) ? 0 : 1;
 
         switch (bits_per_pixel) {
         case 32:
@@ -178,10 +179,11 @@ unsigned int mpc8610hpcd_get_pixel_format(unsigned int bits_per_pixel,
         }
 }
 
-void mpc8610hpcd_set_gamma_table(int monitor_port, char *gamma_table_base)
+void mpc8610hpcd_set_gamma_table(enum fsl_diu_monitor_port port,
+                                 char *gamma_table_base)
 {
         int i;
-        if (monitor_port == 2) {                /* dual link LVDS */
+        if (port == FSL_DIU_PORT_DLVDS) {
                 for (i = 0; i < 256*3; i++)
                         gamma_table_base[i] = (gamma_table_base[i] << 2) |
                                          ((gamma_table_base[i] >> 6) & 0x03);
@@ -192,17 +194,21 @@ void mpc8610hpcd_set_gamma_table(int monitor_port, char *gamma_table_base)
 #define PX_BRDCFG0_DLINK        (1 << 4)
 #define PX_BRDCFG0_DIU_MASK     (PX_BRDCFG0_DVISEL | PX_BRDCFG0_DLINK)
 
-void mpc8610hpcd_set_monitor_port(int monitor_port)
+void mpc8610hpcd_set_monitor_port(enum fsl_diu_monitor_port port)
 {
-        static const u8 bdcfg[] = {
-                PX_BRDCFG0_DVISEL | PX_BRDCFG0_DLINK,
-                PX_BRDCFG0_DLINK,
-                0,
-        };
-
-        if (monitor_port < 3)
+        switch (port) {
+        case FSL_DIU_PORT_DVI:
                 clrsetbits_8(pixis_bdcfg0, PX_BRDCFG0_DIU_MASK,
-                             bdcfg[monitor_port]);
+                             PX_BRDCFG0_DVISEL | PX_BRDCFG0_DLINK);
+                break;
+        case FSL_DIU_PORT_LVDS:
+                clrsetbits_8(pixis_bdcfg0, PX_BRDCFG0_DIU_MASK,
+                             PX_BRDCFG0_DLINK);
+                break;
+        case FSL_DIU_PORT_DLVDS:
+                clrbits8(pixis_bdcfg0, PX_BRDCFG0_DIU_MASK);
+                break;
+        }
 }
 
 void mpc8610hpcd_set_pixel_clock(unsigned int pixclock)
@@ -273,20 +279,10 @@ void mpc8610hpcd_set_pixel_clock(unsigned int pixclock)
         iounmap(clkdvdr);
 }
 
-ssize_t mpc8610hpcd_show_monitor_port(int monitor_port, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE,
-                        "%c0 - DVI\n"
-                        "%c1 - Single link LVDS\n"
-                        "%c2 - Dual link LVDS\n",
-                        monitor_port == 0 ? '*' : ' ',
-                        monitor_port == 1 ? '*' : ' ',
-                        monitor_port == 2 ? '*' : ' ');
-}
-
-int mpc8610hpcd_set_sysfs_monitor_port(int val)
+enum fsl_diu_monitor_port
+mpc8610hpcd_valid_monitor_port(enum fsl_diu_monitor_port port)
 {
-        return val < 3 ? val : 0;
+        return port;
 }
 
 #endif
@@ -318,8 +314,7 @@ static void __init mpc86xx_hpcd_setup_arch(void)
         diu_ops.set_gamma_table         = mpc8610hpcd_set_gamma_table;
         diu_ops.set_monitor_port        = mpc8610hpcd_set_monitor_port;
         diu_ops.set_pixel_clock         = mpc8610hpcd_set_pixel_clock;
-        diu_ops.show_monitor_port       = mpc8610hpcd_show_monitor_port;
-        diu_ops.set_sysfs_monitor_port  = mpc8610hpcd_set_sysfs_monitor_port;
+        diu_ops.valid_monitor_port      = mpc8610hpcd_valid_monitor_port;
 #endif
 
         pixis_node = of_find_compatible_node(NULL, NULL, "fsl,fpga-pixis");
diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h
index 53609489a62b..064bc7089134 100644
--- a/arch/powerpc/sysdev/fsl_soc.h
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@ -22,15 +22,24 @@ struct device_node;
 extern void fsl_rstcr_restart(char *cmd);
 
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
+
+/* The different ports that the DIU can be connected to */
+enum fsl_diu_monitor_port {
+        FSL_DIU_PORT_DVI,       /* DVI */
+        FSL_DIU_PORT_LVDS,      /* Single-link LVDS */
+        FSL_DIU_PORT_DLVDS      /* Dual-link LVDS */
+};
+
 struct platform_diu_data_ops {
-        unsigned int (*get_pixel_format) (unsigned int bits_per_pixel,
-                int monitor_port);
-        void (*set_gamma_table) (int monitor_port, char *gamma_table_base);
-        void (*set_monitor_port) (int monitor_port);
-        void (*set_pixel_clock) (unsigned int pixclock);
-        ssize_t (*show_monitor_port) (int monitor_port, char *buf);
-        int (*set_sysfs_monitor_port) (int val);
-        void (*release_bootmem) (void);
+        u32 (*get_pixel_format)(enum fsl_diu_monitor_port port,
+                unsigned int bpp);
+        void (*set_gamma_table)(enum fsl_diu_monitor_port port,
+                char *gamma_table_base);
+        void (*set_monitor_port)(enum fsl_diu_monitor_port port);
+        void (*set_pixel_clock)(unsigned int pixclock);
+        enum fsl_diu_monitor_port (*valid_monitor_port)
+                (enum fsl_diu_monitor_port port);
+        void (*release_bootmem)(void);
 };
 
 extern struct platform_diu_data_ops diu_ops;