Merge tag 'renesas-boards-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / video / fbdev / omap2 / dss / dpi.c

diff --git a/drivers/video/fbdev/omap2/dss/dpi.c b/drivers/video/fbdev/omap2/dss/dpi.c
index 157921db447a4ef3f3d0032feb56e83922867c94..4a3363dae74aa7479722732102ab4e22ca28fbce 100644 (file)
--- a/drivers/video/fbdev/omap2/dss/dpi.c
+++ b/drivers/video/fbdev/omap2/dss/dpi.c
@@ -67,6 +67,7 @@ static struct platform_device *dpi_get_dsidev(enum omap_channel channel)
        case OMAPDSS_VER_OMAP34xx_ES3:
        case OMAPDSS_VER_OMAP3630:
        case OMAPDSS_VER_AM35xx:
+       case OMAPDSS_VER_AM43xx:
                return NULL;
 
        case OMAPDSS_VER_OMAP4430_ES1:
@@ -103,6 +104,8 @@ static enum omap_dss_clk_source dpi_get_alt_clk_src(enum omap_channel channel)
                return OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC;
        case OMAP_DSS_CHANNEL_LCD2:
                return OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC;
+       case OMAP_DSS_CHANNEL_LCD3:
+               return OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC;
        default:
                /* this shouldn't happen */
                WARN_ON(1);
@@ -595,6 +598,7 @@ static enum omap_channel dpi_get_channel(void)
        case OMAPDSS_VER_OMAP34xx_ES3:
        case OMAPDSS_VER_OMAP3630:
        case OMAPDSS_VER_AM35xx:
+       case OMAPDSS_VER_AM43xx:
                return OMAP_DSS_CHANNEL_LCD;
 
        case OMAPDSS_VER_OMAP4430_ES1:
@@ -716,6 +720,7 @@ static struct platform_driver omap_dpi_driver = {
        .driver         = {
                .name   = "omapdss_dpi",
                .owner  = THIS_MODULE,
+               .suppress_bind_attrs = true,
        },
 };