1 files changed, 25 insertions, 30 deletions

diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 74e018ef724..13fa9a6403e 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -152,10 +152,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),
@@ -170,7 +170,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:
@@ -185,10 +186,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);
@@ -199,17 +201,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;
+        }
 }
 
 /**
@@ -262,20 +268,10 @@ void mpc8610hpcd_set_pixel_clock(unsigned int pixclock)
         iounmap(guts);
 }
 
-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
@@ -307,8 +303,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");