mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe()
@ 2022-06-27 10:33 Uwe Kleine-König
  2022-06-27 10:33 ` [PATCH 2/3] clk: imx25: Add comments to clk list with offsets Uwe Kleine-König
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Uwe Kleine-König @ 2022-06-27 10:33 UTC (permalink / raw)
  To: barebox

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/watchdog/imxwd.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
index 31ea388c2cf2..3e596b55f8f7 100644
--- a/drivers/watchdog/imxwd.c
+++ b/drivers/watchdog/imxwd.c
@@ -245,12 +245,16 @@ static int imx_wd_probe(struct device_d *dev)
 	}
 
 	clk = clk_get(dev, NULL);
-	if (IS_ERR(clk))
+	if (IS_ERR(clk)) {
+		dev_err(dev, "Failed to get clk: %d\n", PTR_ERR(clk));
 		return PTR_ERR(clk);
+	}
 
 	ret = clk_enable(clk);
-	if (ret)
+	if (ret) {
+		dev_err(dev, "Failed to enable clk: %d\n", ret);
 		return ret;
+	}
 
 	priv->base = IOMEM(iores->start);
 	priv->ops = ops;
@@ -272,14 +276,16 @@ static int imx_wd_probe(struct device_d *dev)
 		}
 
 		ret = watchdog_register(&priv->wd);
-		if (ret)
+		if (ret) {
+			dev_err(dev, "Failed to register watchdog device: %d\n", ret);
 			goto on_error;
+		}
 	}
 
 	if (priv->ops->init) {
 		ret = priv->ops->init(priv);
 		if (ret) {
-			dev_err(dev, "Failed to init watchdog device %d\n", ret);
+			dev_err(dev, "Failed to init watchdog device: %d\n", ret);
 			goto error_unregister;
 		}
 	}

base-commit: 512d036587a38c57a30cc63ce48c19c895b9d729
-- 
2.36.1




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/3] clk: imx25: Add comments to clk list with offsets
  2022-06-27 10:33 [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe() Uwe Kleine-König
@ 2022-06-27 10:33 ` Uwe Kleine-König
  2022-06-27 13:13   ` Alexander Shiyan
  2022-06-27 10:33 ` [PATCH 3/3] clk: imx25: Add support for watchdog clock Uwe Kleine-König
  2022-06-27 10:51 ` [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe() Ahmad Fatoum
  2 siblings, 1 reply; 7+ messages in thread
From: Uwe Kleine-König @ 2022-06-27 10:33 UTC (permalink / raw)
  To: barebox

This greatly simplifies to determine the offset of a given clk.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/clk/imx/clk-imx25.c | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/drivers/clk/imx/clk-imx25.c b/drivers/clk/imx/clk-imx25.c
index 8aa87a520000..612edb222789 100644
--- a/drivers/clk/imx/clk-imx25.c
+++ b/drivers/clk/imx/clk-imx25.c
@@ -37,25 +37,25 @@
 #define CCM_MCR		0x64
 
 enum mx25_clks {
-	dummy, osc, mpll, upll, mpll_cpu_3_4, cpu_sel, cpu, ahb, usb_div, ipg,
-	per0_sel, per1_sel, per2_sel, per3_sel, per4_sel, per5_sel, per6_sel,
-	per7_sel, per8_sel, per9_sel, per10_sel, per11_sel, per12_sel,
-	per13_sel, per14_sel, per15_sel, per0, per1, per2, per3, per4, per5,
-	per6, per7, per8, per9, per10, per11, per12, per13, per14, per15,
-	csi_ipg_per, epit_ipg_per, esai_ipg_per, esdhc1_ipg_per, esdhc2_ipg_per,
-	gpt_ipg_per, i2c_ipg_per, lcdc_ipg_per, nfc_ipg_per, owire_ipg_per,
-	pwm_ipg_per, sim1_ipg_per, sim2_ipg_per, ssi1_ipg_per, ssi2_ipg_per,
-	uart_ipg_per, ata_ahb, reserved1, csi_ahb, emi_ahb, esai_ahb, esdhc1_ahb,
-	esdhc2_ahb, fec_ahb, lcdc_ahb, rtic_ahb, sdma_ahb, slcdc_ahb, usbotg_ahb,
-	reserved2, reserved3, reserved4, reserved5, can1_ipg, can2_ipg, csi_ipg,
-	cspi1_ipg, cspi2_ipg, cspi3_ipg, dryice_ipg, ect_ipg, epit1_ipg, epit2_ipg,
-	reserved6, esdhc1_ipg, esdhc2_ipg, fec_ipg, reserved7, reserved8, reserved9,
-	gpt1_ipg, gpt2_ipg, gpt3_ipg, gpt4_ipg, reserved10, reserved11, reserved12,
-	iim_ipg, reserved13, reserved14, kpp_ipg, lcdc_ipg, reserved15, pwm1_ipg,
-	pwm2_ipg, pwm3_ipg, pwm4_ipg, rngb_ipg, reserved16, scc_ipg, sdma_ipg,
-	sim1_ipg, sim2_ipg, slcdc_ipg, spba_ipg, ssi1_ipg, ssi2_ipg, tsc_ipg,
-	uart1_ipg, uart2_ipg, uart3_ipg, uart4_ipg, uart5_ipg, reserved17,
-	wdt_ipg, clk_max
+	/*   0 */ dummy, osc, mpll, upll, mpll_cpu_3_4, cpu_sel, cpu, ahb, usb_div, ipg,
+	/*  10 */ per0_sel, per1_sel, per2_sel, per3_sel, per4_sel, per5_sel, per6_sel,
+	/*  17 */ per7_sel, per8_sel, per9_sel, per10_sel, per11_sel, per12_sel,
+	/*  23 */ per13_sel, per14_sel, per15_sel, per0, per1, per2, per3, per4, per5,
+	/*  32 */ per6, per7, per8, per9, per10, per11, per12, per13, per14, per15,
+	/*  42 */ csi_ipg_per, epit_ipg_per, esai_ipg_per, esdhc1_ipg_per, esdhc2_ipg_per,
+	/*  47 */ gpt_ipg_per, i2c_ipg_per, lcdc_ipg_per, nfc_ipg_per, owire_ipg_per,
+	/*  52 */ pwm_ipg_per, sim1_ipg_per, sim2_ipg_per, ssi1_ipg_per, ssi2_ipg_per,
+	/*  57 */ uart_ipg_per, ata_ahb, reserved1, csi_ahb, emi_ahb, esai_ahb, esdhc1_ahb,
+	/*  64 */ esdhc2_ahb, fec_ahb, lcdc_ahb, rtic_ahb, sdma_ahb, slcdc_ahb, usbotg_ahb,
+	/*  71 */ reserved2, reserved3, reserved4, reserved5, can1_ipg, can2_ipg, csi_ipg,
+	/*  78 */ cspi1_ipg, cspi2_ipg, cspi3_ipg, dryice_ipg, ect_ipg, epit1_ipg, epit2_ipg,
+	/*  85 */ reserved6, esdhc1_ipg, esdhc2_ipg, fec_ipg, reserved7, reserved8, reserved9,
+	/*  92 */ gpt1_ipg, gpt2_ipg, gpt3_ipg, gpt4_ipg, reserved10, reserved11, reserved12,
+	/*  99 */ iim_ipg, reserved13, reserved14, kpp_ipg, lcdc_ipg, reserved15, pwm1_ipg,
+	/* 106 */ pwm2_ipg, pwm3_ipg, pwm4_ipg, rngb_ipg, reserved16, scc_ipg, sdma_ipg,
+	/* 113 */ sim1_ipg, sim2_ipg, slcdc_ipg, spba_ipg, ssi1_ipg, ssi2_ipg, tsc_ipg,
+	/* 120 */ uart1_ipg, uart2_ipg, uart3_ipg, uart4_ipg, uart5_ipg, reserved17,
+	/* 126 */ wdt_ipg, clk_max
 };
 
 static struct clk *clks[clk_max];
-- 
2.36.1




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 3/3] clk: imx25: Add support for watchdog clock
  2022-06-27 10:33 [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe() Uwe Kleine-König
  2022-06-27 10:33 ` [PATCH 2/3] clk: imx25: Add comments to clk list with offsets Uwe Kleine-König
@ 2022-06-27 10:33 ` Uwe Kleine-König
  2022-06-27 10:51 ` [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe() Ahmad Fatoum
  2 siblings, 0 replies; 7+ messages in thread
From: Uwe Kleine-König @ 2022-06-27 10:33 UTC (permalink / raw)
  To: barebox

This is necessary to make the watchdog driver probe successfully.

Fixes: 87cad179648c ("watchdog: imxwd: get and enable clock")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 arch/arm/mach-imx/include/mach/imx25-regs.h | 1 +
 drivers/clk/imx/clk-imx25.c                 | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/arch/arm/mach-imx/include/mach/imx25-regs.h b/arch/arm/mach-imx/include/mach/imx25-regs.h
index d63669e1e0e7..bf89701fe048 100644
--- a/arch/arm/mach-imx/include/mach/imx25-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx25-regs.h
@@ -56,6 +56,7 @@
 #define MX25_KPP_BASE_ADDR		0x43fa8000
 #define MX25_RNGB_BASE_ADDR		0x53fb0000
 #define MX25_SDMA_BASE_ADDR		0x53fd4000
+#define MX25_WATCHDOG_BASE_ADDR		0x53fdc000
 #define MX25_USB_BASE_ADDR		0x53ff4000
 #define MX25_USB_OTG_BASE_ADDR			(MX25_USB_BASE_ADDR + 0x0000)
 /*
diff --git a/drivers/clk/imx/clk-imx25.c b/drivers/clk/imx/clk-imx25.c
index 612edb222789..2bd0d6004b52 100644
--- a/drivers/clk/imx/clk-imx25.c
+++ b/drivers/clk/imx/clk-imx25.c
@@ -143,6 +143,9 @@ static int imx25_ccm_probe(struct device_d *dev)
 	clks[rngb_ipg] = imx_clk_gate("rngb_ipg", "ipg", base + CCM_CGCR2, 3);
 	clks[dryice_ipg] = imx_clk_gate("dryice_ipg", "ipg", base + CCM_CGCR1, 8);
 
+	/* reserved in datasheet, but used as wdt in FSL kernel */
+	clks[wdt_ipg] = imx_clk_gate("wdt_ipg", "ipg", base + CCM_CGCR2, 19);
+
 	clkdev_add_physbase(clks[per15], MX25_UART1_BASE_ADDR, NULL);
 	clkdev_add_physbase(clks[per15], MX25_UART2_BASE_ADDR, NULL);
 	clkdev_add_physbase(clks[per15], MX25_UART3_BASE_ADDR, NULL);
@@ -168,6 +171,7 @@ static int imx25_ccm_probe(struct device_d *dev)
 	clkdev_add_physbase(clks[scc_ipg], MX25_SCC_BASE_ADDR, "ipg");
 	clkdev_add_physbase(clks[rngb_ipg], MX25_RNGB_BASE_ADDR, "ipg");
 	clkdev_add_physbase(clks[dryice_ipg], MX25_DRYICE_BASE_ADDR, NULL);
+	clkdev_add_physbase(clks[wdt_ipg], MX25_WATCHDOG_BASE_ADDR, NULL);
 
 	return 0;
 }
-- 
2.36.1




^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe()
  2022-06-27 10:33 [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe() Uwe Kleine-König
  2022-06-27 10:33 ` [PATCH 2/3] clk: imx25: Add comments to clk list with offsets Uwe Kleine-König
  2022-06-27 10:33 ` [PATCH 3/3] clk: imx25: Add support for watchdog clock Uwe Kleine-König
@ 2022-06-27 10:51 ` Ahmad Fatoum
  2022-06-29  8:54   ` Uwe Kleine-König
  2 siblings, 1 reply; 7+ messages in thread
From: Ahmad Fatoum @ 2022-06-27 10:51 UTC (permalink / raw)
  To: Uwe Kleine-König, barebox

Hello Uwe,

On 27.06.22 12:33, Uwe Kleine-König wrote:
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  drivers/watchdog/imxwd.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
> index 31ea388c2cf2..3e596b55f8f7 100644
> --- a/drivers/watchdog/imxwd.c
> +++ b/drivers/watchdog/imxwd.c
> @@ -245,12 +245,16 @@ static int imx_wd_probe(struct device_d *dev)
>  	}
>  
>  	clk = clk_get(dev, NULL);
> -	if (IS_ERR(clk))
> +	if (IS_ERR(clk)) {
> +		dev_err(dev, "Failed to get clk: %d\n", PTR_ERR(clk));

Can you use dev_err_probe instead? Same for the messages below.

>  		return PTR_ERR(clk);
> +	}
>  
>  	ret = clk_enable(clk);
> -	if (ret)
> +	if (ret) {
> +		dev_err(dev, "Failed to enable clk: %d\n", ret);
>  		return ret;
> +	}
>  
>  	priv->base = IOMEM(iores->start);
>  	priv->ops = ops;
> @@ -272,14 +276,16 @@ static int imx_wd_probe(struct device_d *dev)
>  		}
>  
>  		ret = watchdog_register(&priv->wd);
> -		if (ret)
> +		if (ret) {
> +			dev_err(dev, "Failed to register watchdog device: %d\n", ret);
>  			goto on_error;
> +		}
>  	}
>  
>  	if (priv->ops->init) {
>  		ret = priv->ops->init(priv);
>  		if (ret) {
> -			dev_err(dev, "Failed to init watchdog device %d\n", ret);
> +			dev_err(dev, "Failed to init watchdog device: %d\n", ret);
>  			goto error_unregister;
>  		}
>  	}
> 
> base-commit: 512d036587a38c57a30cc63ce48c19c895b9d729


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/3] clk: imx25: Add comments to clk list with offsets
  2022-06-27 10:33 ` [PATCH 2/3] clk: imx25: Add comments to clk list with offsets Uwe Kleine-König
@ 2022-06-27 13:13   ` Alexander Shiyan
  2022-06-29  7:40     ` Sascha Hauer
  0 siblings, 1 reply; 7+ messages in thread
From: Alexander Shiyan @ 2022-06-27 13:13 UTC (permalink / raw)
  To: Uwe Kleine-König; +Cc: Barebox List

Hello.

пн, 27 июн. 2022 г. в 13:34, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
> This greatly simplifies to determine the offset of a given clk.
...
>  enum mx25_clks {
> -       dummy, osc, mpll, upll, mpll_cpu_3_4, cpu_sel, cpu, ahb, usb_div, ipg,
> -       per0_sel, per1_sel, per2_sel, per3_sel, per4_sel, per5_sel, per6_sel,
> -       per7_sel, per8_sel, per9_sel, per10_sel, per11_sel, per12_sel,
> -       per13_sel, per14_sel, per15_sel, per0, per1, per2, per3, per4, per5,
> -       per6, per7, per8, per9, per10, per11, per12, per13, per14, per15,
> -       csi_ipg_per, epit_ipg_per, esai_ipg_per, esdhc1_ipg_per, esdhc2_ipg_per,
> -       gpt_ipg_per, i2c_ipg_per, lcdc_ipg_per, nfc_ipg_per, owire_ipg_per,
> -       pwm_ipg_per, sim1_ipg_per, sim2_ipg_per, ssi1_ipg_per, ssi2_ipg_per,
> -       uart_ipg_per, ata_ahb, reserved1, csi_ahb, emi_ahb, esai_ahb, esdhc1_ahb,
> -       esdhc2_ahb, fec_ahb, lcdc_ahb, rtic_ahb, sdma_ahb, slcdc_ahb, usbotg_ahb,
> -       reserved2, reserved3, reserved4, reserved5, can1_ipg, can2_ipg, csi_ipg,
> -       cspi1_ipg, cspi2_ipg, cspi3_ipg, dryice_ipg, ect_ipg, epit1_ipg, epit2_ipg,
> -       reserved6, esdhc1_ipg, esdhc2_ipg, fec_ipg, reserved7, reserved8, reserved9,
> -       gpt1_ipg, gpt2_ipg, gpt3_ipg, gpt4_ipg, reserved10, reserved11, reserved12,
> -       iim_ipg, reserved13, reserved14, kpp_ipg, lcdc_ipg, reserved15, pwm1_ipg,
> -       pwm2_ipg, pwm3_ipg, pwm4_ipg, rngb_ipg, reserved16, scc_ipg, sdma_ipg,
> -       sim1_ipg, sim2_ipg, slcdc_ipg, spba_ipg, ssi1_ipg, ssi2_ipg, tsc_ipg,
> -       uart1_ipg, uart2_ipg, uart3_ipg, uart4_ipg, uart5_ipg, reserved17,
> -       wdt_ipg, clk_max
> +       /*   0 */ dummy, osc, mpll, upll, mpll_cpu_3_4, cpu_sel, cpu, ahb, usb_div, ipg,
> +       /*  10 */ per0_sel, per1_sel, per2_sel, per3_sel, per4_sel, per5_sel, per6_sel,
> +       /*  17 */ per7_sel, per8_sel, per9_sel, per10_sel, per11_sel, per12_sel,
> +       /*  23 */ per13_sel, per14_sel, per15_sel, per0, per1, per2, per3, per4, per5,
> +       /*  32 */ per6, per7, per8, per9, per10, per11, per12, per13, per14, per15,
> +       /*  42 */ csi_ipg_per, epit_ipg_per, esai_ipg_per, esdhc1_ipg_per, esdhc2_ipg_per,
> +       /*  47 */ gpt_ipg_per, i2c_ipg_per, lcdc_ipg_per, nfc_ipg_per, owire_ipg_per,
> +       /*  52 */ pwm_ipg_per, sim1_ipg_per, sim2_ipg_per, ssi1_ipg_per, ssi2_ipg_per,
> +       /*  57 */ uart_ipg_per, ata_ahb, reserved1, csi_ahb, emi_ahb, esai_ahb, esdhc1_ahb,
> +       /*  64 */ esdhc2_ahb, fec_ahb, lcdc_ahb, rtic_ahb, sdma_ahb, slcdc_ahb, usbotg_ahb,
> +       /*  71 */ reserved2, reserved3, reserved4, reserved5, can1_ipg, can2_ipg, csi_ipg,
> +       /*  78 */ cspi1_ipg, cspi2_ipg, cspi3_ipg, dryice_ipg, ect_ipg, epit1_ipg, epit2_ipg,
> +       /*  85 */ reserved6, esdhc1_ipg, esdhc2_ipg, fec_ipg, reserved7, reserved8, reserved9,
> +       /*  92 */ gpt1_ipg, gpt2_ipg, gpt3_ipg, gpt4_ipg, reserved10, reserved11, reserved12,
> +       /*  99 */ iim_ipg, reserved13, reserved14, kpp_ipg, lcdc_ipg, reserved15, pwm1_ipg,
> +       /* 106 */ pwm2_ipg, pwm3_ipg, pwm4_ipg, rngb_ipg, reserved16, scc_ipg, sdma_ipg,
> +       /* 113 */ sim1_ipg, sim2_ipg, slcdc_ipg, spba_ipg, ssi1_ipg, ssi2_ipg, tsc_ipg,
> +       /* 120 */ uart1_ipg, uart2_ipg, uart3_ipg, uart4_ipg, uart5_ipg, reserved17,
> +       /* 126 */ wdt_ipg, clk_max
>  };

Maybe this enum should be updated from linux/drivers/clk/imx/clk-imx25.c first?



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/3] clk: imx25: Add comments to clk list with offsets
  2022-06-27 13:13   ` Alexander Shiyan
@ 2022-06-29  7:40     ` Sascha Hauer
  0 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2022-06-29  7:40 UTC (permalink / raw)
  To: Alexander Shiyan; +Cc: Uwe Kleine-König, Barebox List

On Mon, Jun 27, 2022 at 04:13:09PM +0300, Alexander Shiyan wrote:
> Hello.
> 
> пн, 27 июн. 2022 г. в 13:34, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
> > This greatly simplifies to determine the offset of a given clk.
> ...
> >  enum mx25_clks {
> > -       dummy, osc, mpll, upll, mpll_cpu_3_4, cpu_sel, cpu, ahb, usb_div, ipg,
> > -       per0_sel, per1_sel, per2_sel, per3_sel, per4_sel, per5_sel, per6_sel,
> > -       per7_sel, per8_sel, per9_sel, per10_sel, per11_sel, per12_sel,
> > -       per13_sel, per14_sel, per15_sel, per0, per1, per2, per3, per4, per5,
> > -       per6, per7, per8, per9, per10, per11, per12, per13, per14, per15,
> > -       csi_ipg_per, epit_ipg_per, esai_ipg_per, esdhc1_ipg_per, esdhc2_ipg_per,
> > -       gpt_ipg_per, i2c_ipg_per, lcdc_ipg_per, nfc_ipg_per, owire_ipg_per,
> > -       pwm_ipg_per, sim1_ipg_per, sim2_ipg_per, ssi1_ipg_per, ssi2_ipg_per,
> > -       uart_ipg_per, ata_ahb, reserved1, csi_ahb, emi_ahb, esai_ahb, esdhc1_ahb,
> > -       esdhc2_ahb, fec_ahb, lcdc_ahb, rtic_ahb, sdma_ahb, slcdc_ahb, usbotg_ahb,
> > -       reserved2, reserved3, reserved4, reserved5, can1_ipg, can2_ipg, csi_ipg,
> > -       cspi1_ipg, cspi2_ipg, cspi3_ipg, dryice_ipg, ect_ipg, epit1_ipg, epit2_ipg,
> > -       reserved6, esdhc1_ipg, esdhc2_ipg, fec_ipg, reserved7, reserved8, reserved9,
> > -       gpt1_ipg, gpt2_ipg, gpt3_ipg, gpt4_ipg, reserved10, reserved11, reserved12,
> > -       iim_ipg, reserved13, reserved14, kpp_ipg, lcdc_ipg, reserved15, pwm1_ipg,
> > -       pwm2_ipg, pwm3_ipg, pwm4_ipg, rngb_ipg, reserved16, scc_ipg, sdma_ipg,
> > -       sim1_ipg, sim2_ipg, slcdc_ipg, spba_ipg, ssi1_ipg, ssi2_ipg, tsc_ipg,
> > -       uart1_ipg, uart2_ipg, uart3_ipg, uart4_ipg, uart5_ipg, reserved17,
> > -       wdt_ipg, clk_max
> > +       /*   0 */ dummy, osc, mpll, upll, mpll_cpu_3_4, cpu_sel, cpu, ahb, usb_div, ipg,
> > +       /*  10 */ per0_sel, per1_sel, per2_sel, per3_sel, per4_sel, per5_sel, per6_sel,
> > +       /*  17 */ per7_sel, per8_sel, per9_sel, per10_sel, per11_sel, per12_sel,
> > +       /*  23 */ per13_sel, per14_sel, per15_sel, per0, per1, per2, per3, per4, per5,
> > +       /*  32 */ per6, per7, per8, per9, per10, per11, per12, per13, per14, per15,
> > +       /*  42 */ csi_ipg_per, epit_ipg_per, esai_ipg_per, esdhc1_ipg_per, esdhc2_ipg_per,
> > +       /*  47 */ gpt_ipg_per, i2c_ipg_per, lcdc_ipg_per, nfc_ipg_per, owire_ipg_per,
> > +       /*  52 */ pwm_ipg_per, sim1_ipg_per, sim2_ipg_per, ssi1_ipg_per, ssi2_ipg_per,
> > +       /*  57 */ uart_ipg_per, ata_ahb, reserved1, csi_ahb, emi_ahb, esai_ahb, esdhc1_ahb,
> > +       /*  64 */ esdhc2_ahb, fec_ahb, lcdc_ahb, rtic_ahb, sdma_ahb, slcdc_ahb, usbotg_ahb,
> > +       /*  71 */ reserved2, reserved3, reserved4, reserved5, can1_ipg, can2_ipg, csi_ipg,
> > +       /*  78 */ cspi1_ipg, cspi2_ipg, cspi3_ipg, dryice_ipg, ect_ipg, epit1_ipg, epit2_ipg,
> > +       /*  85 */ reserved6, esdhc1_ipg, esdhc2_ipg, fec_ipg, reserved7, reserved8, reserved9,
> > +       /*  92 */ gpt1_ipg, gpt2_ipg, gpt3_ipg, gpt4_ipg, reserved10, reserved11, reserved12,
> > +       /*  99 */ iim_ipg, reserved13, reserved14, kpp_ipg, lcdc_ipg, reserved15, pwm1_ipg,
> > +       /* 106 */ pwm2_ipg, pwm3_ipg, pwm4_ipg, rngb_ipg, reserved16, scc_ipg, sdma_ipg,
> > +       /* 113 */ sim1_ipg, sim2_ipg, slcdc_ipg, spba_ipg, ssi1_ipg, ssi2_ipg, tsc_ipg,
> > +       /* 120 */ uart1_ipg, uart2_ipg, uart3_ipg, uart4_ipg, uart5_ipg, reserved17,
> > +       /* 126 */ wdt_ipg, clk_max
> >  };
> 
> Maybe this enum should be updated from linux/drivers/clk/imx/clk-imx25.c first?

There should be no clocks changed, only added at the end. As we do not
support these additional clocks I don't think that's necessary.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe()
  2022-06-27 10:51 ` [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe() Ahmad Fatoum
@ 2022-06-29  8:54   ` Uwe Kleine-König
  0 siblings, 0 replies; 7+ messages in thread
From: Uwe Kleine-König @ 2022-06-29  8:54 UTC (permalink / raw)
  To: Ahmad Fatoum; +Cc: barebox

[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]

On Mon, Jun 27, 2022 at 12:51:45PM +0200, Ahmad Fatoum wrote:
> Hello Uwe,
> 
> On 27.06.22 12:33, Uwe Kleine-König wrote:
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > ---
> >  drivers/watchdog/imxwd.c | 14 ++++++++++----
> >  1 file changed, 10 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
> > index 31ea388c2cf2..3e596b55f8f7 100644
> > --- a/drivers/watchdog/imxwd.c
> > +++ b/drivers/watchdog/imxwd.c
> > @@ -245,12 +245,16 @@ static int imx_wd_probe(struct device_d *dev)
> >  	}
> >  
> >  	clk = clk_get(dev, NULL);
> > -	if (IS_ERR(clk))
> > +	if (IS_ERR(clk)) {
> > +		dev_err(dev, "Failed to get clk: %d\n", PTR_ERR(clk));
> 
> Can you use dev_err_probe instead? Same for the messages below.

Yeah, will send a patch in a separate thread.

@sha: git b4 -P 2- b204e43f-3a98-b666-8a78-3281f5221f17@pengutronix.de # :-)

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-06-29  8:56 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-27 10:33 [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe() Uwe Kleine-König
2022-06-27 10:33 ` [PATCH 2/3] clk: imx25: Add comments to clk list with offsets Uwe Kleine-König
2022-06-27 13:13   ` Alexander Shiyan
2022-06-29  7:40     ` Sascha Hauer
2022-06-27 10:33 ` [PATCH 3/3] clk: imx25: Add support for watchdog clock Uwe Kleine-König
2022-06-27 10:51 ` [PATCH 1/3] watchdog: imxwd: Add error messages for some failure points in .probe() Ahmad Fatoum
2022-06-29  8:54   ` Uwe Kleine-König

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox