Hi Rajendra,
On Tue, Jul 23, 2013 at 1:24 AM, Rajendra Nayak <rnayak@xxxxxx> wrote:
[...]
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index 5cc5123..12fa589 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -2381,12 +2386,10 @@ static void __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data)
> oh->name);
>
> /* Extract the IO space from device tree blob */
> - if (!of_have_populated_dt())
> + if (!np)
> return;
>
> - np = of_dev_hwmod_lookup(of_find_node_by_name(NULL, "ocp"), oh);
> - if (np)
> - va_start = of_iomap(np, 0);
> + va_start = of_iomap(np, 0);
This hunk needs a rebase with 3.11-rc5
due to commit 130142d91467e8a07f3a863db369225a89e84d75
(ARM: OMAP2+: hwmod: rt address space index for DT)
> } else {
> va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);
> }
[...]
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
