driver: pwm: pwm-imx: fix probing on imx6
Subsystems (2)
PATCH 1/1 driver: pwm: pwm-imx: fix probing on imx6
U-Boot 2024.07 drops on aristainetos2 board the following warning:
Failed to enable per_clk
and bootlogo is not seen on LVDS display.
This patch uses old behaviour for systems without clock framework if CONFIG_CLK is not enabled.
---
drivers/pwm/pwm-imx.c | 56 ++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 25 deletions(-)
drivers/pwm/pwm-imx.c +31 -25
@@ -160,7 +160,11 @@ int pwm_dm_imx_get_parms(struct imx_pwm_priv *priv, int period_ns, {unsigned long long c; - c =clk_get_rate (&priv->per_clk); +if (IS_ENABLED (CONFIG_CLK )) + c =clk_get_rate (&priv->per_clk); +else + c =CFG_IMX6_PWM_PER_CLK ; + c = c * period_ns;do_div (c,1000000000 ); *period_c = c;
@@ -227,43 +231,45 @@ static int imx_pwm_set_enable(struct udevice *dev, uint channel, bool enable)static int imx_pwm_of_to_plat (struct udevice *dev) { -int ret; +int __maybe_unused ret;struct imx_pwm_priv *priv =dev_get_priv (dev); priv->regs =dev_read_addr_ptr (dev); - ret =clk_get_by_name (dev,"per" , &priv->per_clk); -if (ret) { -printf ("Failed to get per_clk\n" ); -return ret; - } - - ret =clk_get_by_name (dev,"ipg" , &priv->ipg_clk); -if (ret) { -printf ("Failed to get ipg_clk\n" ); -return ret; +if (IS_ENABLED (CONFIG_CLK )) { + ret =clk_get_by_name (dev,"per" , &priv->per_clk); +if (ret) { +printf ("Failed to get per_clk\n" ); +return ret; + } + + ret =clk_get_by_name (dev,"ipg" , &priv->ipg_clk); +if (ret) { +printf ("Failed to get ipg_clk\n" ); +return ret; + } } -return 0 ; }static int imx_pwm_probe (struct udevice *dev) { -int ret; +int __maybe_unused ret;struct imx_pwm_priv *priv =dev_get_priv (dev); - ret =clk_enable (&priv->per_clk); -if (ret) { -printf ("Failed to enable per_clk\n" ); -return ret; - } - - ret =clk_enable (&priv->ipg_clk); -if (ret) { -printf ("Failed to enable ipg_clk\n" ); -return ret; +if (IS_ENABLED (CONFIG_CLK )) { + ret =clk_enable (&priv->per_clk); +if (ret) { +printf ("Failed to enable per_clk\n" ); +return ret; + } + + ret =clk_enable (&priv->ipg_clk); +if (ret) { +printf ("Failed to enable ipg_clk\n" ); +return ret; + } } -return 0 ; }
Signature · 1 line
2.20.1
Hi Heiko,
Quoted 23 lines · On Wed, 7 Aug 2024 10:58:11 +0200 Heiko Schocher [email protected] wrote:
U-Boot 2024.07 drops on aristainetos2 board the following warning:
Failed to enable
per_clkand bootlogo is not seen on LVDS display.
This patch uses old behaviour for systems without clock framework if
CONFIG_CLKis not enabled.Fixes bfc778cb93a3 ("driver: pwm: pwm-imx: get and enable per/ipg clock using dm")Signed-off-by Heiko Schocher <[email protected]>---
drivers/pwm/pwm-imx.c | 56 ++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 25 deletions(-)drivers/pwm/pwm-imx.c +0
-0
drivers/pwm/pwm-imx.c int pwm_dm_imx_get_parms(struct imx_pwm_priv *priv, int period_ns, · line 163
Quoted 5 lines
drivers/pwm/pwm-imx.c +1
-1@@ -160,7 +160,11 @@ int pwm_dm_imx_get_parms(struct imx_pwm_priv *priv, int period_ns, {unsigned long long c; - c =clk_get_rate (&priv->per_clk); +if (IS_ENABLED (CONFIG_CLK ))
Can we please use if (CONFIG_IS_ENABLED(CLK)) ? So it will also work with SPL. Thanks!
--
Anatolij
Hello Anatolij,
Quoted 31 lines · Anatolij Gustschin
Hi Heiko,
Quoted 26 lines · On Wed, 7 Aug 2024 10:58:11 +0200 Heiko Schocher [email protected] wrote:
U-Boot 2024.07 drops on aristainetos2 board the following warning:
Failed to enable
per_clkand bootlogo is not seen on LVDS display.
This patch uses old behaviour for systems without clock framework if
CONFIG_CLKis not enabled.Fixes bfc778cb93a3 ("driver: pwm: pwm-imx: get and enable per/ipg clock using dm")Signed-off-by Heiko Schocher <[email protected]>---
drivers/pwm/pwm-imx.c | 56 ++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 25 deletions(-)drivers/pwm/pwm-imx.c +0
-0@@ -160,7 +160,11 @@ int pwm_dm_imx_get_parms(struct imx_pwm_priv *priv, int period_ns, {unsigned long long c;
Quoted 5 lines
drivers/pwm/pwm-imx.c int pwm_dm_imx_get_parms(struct imx_pwm_priv *priv, int period_ns, · line 163
Quoted 2 lines
drivers/pwm/pwm-imx.c +1
-1- c =clk_get_rate (&priv->per_clk); +if (IS_ENABLED (CONFIG_CLK ))Can we please use if (
CONFIG_IS_ENABLED(CLK)) ? So it will also work with SPL. Thanks!
Yep, of course, changed locally... wait for some more comments before posting v2.
bye,
Heiko
Signature · 4 lines
-- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: [email protected]