diff options
| author | Vinod Koul <vkoul@kernel.org> | 2022-02-07 10:24:00 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-02-07 10:24:00 +0530 |
| commit | 1e805d190ba59e870a316c603f11e16de5a04131 (patch) | |
| tree | 8f3274273c203bb38f3c9411813f0f5a534d4939 /drivers/phy/amlogic | |
| parent | 1f1b0c105b19ac0d90975e2569040da1216489b7 (diff) | |
| parent | 9a8406ba1a9a2965c27e0db1d7753471d12ee9ff (diff) | |
Merge tag 'phy-fixes-5.17' into next
Merge phy fixes for 5.17 into next branch to resolve the conflict
between fixes and next for upcoming patches
Diffstat (limited to 'drivers/phy/amlogic')
| -rw-r--r-- | drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c b/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c index cd2332bf0e31..fdbd64c03e12 100644 --- a/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c +++ b/drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c @@ -9,6 +9,7 @@ #include <linux/bitfield.h> #include <linux/bitops.h> +#include <linux/bits.h> #include <linux/clk.h> #include <linux/delay.h> #include <linux/io.h> @@ -250,7 +251,7 @@ static int phy_meson_axg_mipi_dphy_power_on(struct phy *phy) (DIV_ROUND_UP(priv->config.clk_zero, temp) << 16) | (DIV_ROUND_UP(priv->config.clk_prepare, temp) << 24)); regmap_write(priv->regmap, MIPI_DSI_CLK_TIM1, - DIV_ROUND_UP(priv->config.clk_pre, temp)); + DIV_ROUND_UP(priv->config.clk_pre, BITS_PER_BYTE)); regmap_write(priv->regmap, MIPI_DSI_HS_TIM, DIV_ROUND_UP(priv->config.hs_exit, temp) | |