Merge tag 'ovl-update-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

[linux-2.6-microblaze.git] / drivers / phy / phy-core-mipi-dphy.c

diff --git a/drivers/phy/phy-core-mipi-dphy.c b/drivers/phy/phy-core-mipi-dphy.c
index 465fa1b..14e0551 100644 (file)
--- a/drivers/phy/phy-core-mipi-dphy.c
+++ b/drivers/phy/phy-core-mipi-dphy.c
@@ -65,12 +65,12 @@ int phy_mipi_dphy_get_default_config(unsigned long pixel_clock,
         */
        cfg->hs_trail = max(4 * 8 * ui, 60000 + 4 * 4 * ui);
 
-       cfg->init = 100000000;
+       cfg->init = 100;
        cfg->lpx = 60000;
        cfg->ta_get = 5 * cfg->lpx;
        cfg->ta_go = 4 * cfg->lpx;
        cfg->ta_sure = 2 * cfg->lpx;
-       cfg->wakeup = 1000000000;
+       cfg->wakeup = 1000;
 
        cfg->hs_clk_rate = hs_clk_rate;
        cfg->lanes = lanes;
@@ -143,7 +143,7 @@ int phy_mipi_dphy_config_validate(struct phy_configure_opts_mipi_dphy *cfg)
        if (cfg->hs_trail < max(8 * ui, 60000 + 4 * ui))
                return -EINVAL;
 
-       if (cfg->init < 100000000)
+       if (cfg->init < 100)
                return -EINVAL;
 
        if (cfg->lpx < 50000)
@@ -158,7 +158,7 @@ int phy_mipi_dphy_config_validate(struct phy_configure_opts_mipi_dphy *cfg)
        if (cfg->ta_sure < cfg->lpx || cfg->ta_sure > (2 * cfg->lpx))
                return -EINVAL;
 
-       if (cfg->wakeup < 1000000000)
+       if (cfg->wakeup < 1000)
                return -EINVAL;
 
        return 0;