[PATCH] ARM: imx: clocksource: add new DT compatible

[PATCH] ARM: imx: clocksource: add new DT compatible

[Lucas Stach]

The i.MX6 DL/S DT has been changed to use more specific compatibles as
GPTv2 has a different programming model for modes used in Linux. This
difference doesn't matter for Barebox, but the old mx31 compatible has
been dropped from the DT, so we need to match on the one still present.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
This fixes a "Warning: Using dummy clocksource" and resulting wrong
delays present in -next on MX6DL/S.
---
 arch/arm/mach-imx/clocksource.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
index 06d2fba41299..a11b978bf4c8 100644
--- a/arch/arm/mach-imx/clocksource.c
+++ b/arch/arm/mach-imx/clocksource.c
@@ -141,6 +141,9 @@ static __maybe_unused struct of_device_id imx_gpt_dt_ids[] = {
 		.compatible = "fsl,imx31-gpt",
 		.data = &regs_imx31,
 	}, {
+		.compatible = "fsl,imx6q-gpt",
+		.data = &regs_imx31,
+	}, {
 		/* sentinel */
 	}
 };
-- 
2.6.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ARM: imx: clocksource: add new DT compatible

[Sascha Hauer]

On Mon, Oct 26, 2015 at 03:03:08PM +0100, Lucas Stach wrote:
> The i.MX6 DL/S DT has been changed to use more specific compatibles as
> GPTv2 has a different programming model for modes used in Linux. This
> difference doesn't matter for Barebox, but the old mx31 compatible has
> been dropped from the DT, so we need to match on the one still present.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

I also just stumbled upon this, but you were faster sending it ;)

Applied, thanks

Sascha

> ---
> This fixes a "Warning: Using dummy clocksource" and resulting wrong
> delays present in -next on MX6DL/S.
> ---
>  arch/arm/mach-imx/clocksource.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/arch/arm/mach-imx/clocksource.c b/arch/arm/mach-imx/clocksource.c
> index 06d2fba41299..a11b978bf4c8 100644
> --- a/arch/arm/mach-imx/clocksource.c
> +++ b/arch/arm/mach-imx/clocksource.c
> @@ -141,6 +141,9 @@ static __maybe_unused struct of_device_id imx_gpt_dt_ids[] = {
>  		.compatible = "fsl,imx31-gpt",
>  		.data = &regs_imx31,
>  	}, {
> +		.compatible = "fsl,imx6q-gpt",
> +		.data = &regs_imx31,
> +	}, {
>  		/* sentinel */
>  	}
>  };
> -- 
> 2.6.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox