Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / drivers / video / sh_mipi_dsi.c

diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c
index 42ad0f7..4c6b844 100644 (file)
--- a/drivers/video/sh_mipi_dsi.c
+++ b/drivers/video/sh_mipi_dsi.c
@@ -273,7 +273,7 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
        iowrite32(0x00000001, base + PHYCTRL);
        udelay(200);
        /* Deassert resets, power on */
-       iowrite32(0x03070001, base + PHYCTRL);
+       iowrite32(0x03070001 | pdata->phyctrl, base + PHYCTRL);
 
        /*
         * Default = ULPS enable |