phy: dphy: Change units of wakeup and init parameters

The Init and wakeup D-PHY parameters are in the micro/milliseconds range,
putting the values real close to the types limits if they were in
picoseconds.

Move them to microseconds which should be better fit.

Suggested-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

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;

diff --git a/include/linux/phy/phy-mipi-dphy.h b/include/linux/phy/phy-mipi-dphy.h
index 9cf97cd..627d280 100644 (file)
--- a/include/linux/phy/phy-mipi-dphy.h
+++ b/include/linux/phy/phy-mipi-dphy.h
@@ -190,10 +190,10 @@ struct phy_configure_opts_mipi_dphy {
        /**
         * @init:
         *
-        * Time, in picoseconds for the initialization period to
+        * Time, in microseconds for the initialization period to
         * complete.
         *
-        * Minimum value: 100000000 ps
+        * Minimum value: 100 us
         */
        unsigned int            init;
 
@@ -244,11 +244,11 @@ struct phy_configure_opts_mipi_dphy {
        /**
         * @wakeup:
         *
-        * Time, in picoseconds, that a transmitter drives a Mark-1
+        * Time, in microseconds, that a transmitter drives a Mark-1
         * state prior to a Stop state in order to initiate an exit
         * from ULPS.
         *
-        * Minimum value: 1000000000 ps
+        * Minimum value: 1000 us
         */
        unsigned int            wakeup;