On 11/29/2012 10:01 AM, Daniel Mack wrote:
> On DT driven boards, the gpmc node will match the driver. Hence, there's
> no need to do that unconditionally from the initcall.
> 
> Signed-off-by: Daniel Mack <[email protected]>
> ---
>  arch/arm/mach-omap2/gpmc.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
> index 60f1cce..1dcb30c 100644
> --- a/arch/arm/mach-omap2/gpmc.c
> +++ b/arch/arm/mach-omap2/gpmc.c
> @@ -844,6 +844,13 @@ static int __init omap_gpmc_init(void)
>       struct platform_device *pdev;
>       char *oh_name = "gpmc";
>  
> +     /*
> +      * if the board boots up with a populated DT, do not
> +      * manually add the device from this initcall
> +      */
> +     if (of_have_populated_dt())
> +             return -ENODEV;
> +
>       oh = omap_hwmod_lookup(oh_name);
>       if (!oh) {
>               pr_err("Could not look up %s\n", oh_name);

Acked-by: Jon Hunter <[email protected]>

Thanks
Jon

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to