| Message ID | alpine.DEB.2.02.1501241937570.5450@utopia.booyaka.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 01/24/2015 09:39 PM, Paul Walmsley wrote: > Hi Tero > > On Thu, 27 Nov 2014, Tero Kristo wrote: > >> There is no need to provide the CM base address through a low-level API >> from the low-level IO init, as this information is available through DT. >> Re-routed the parsing function to be called from the CM drivers also to >> simplify the implementation under io.c. >> >> Signed-off-by: Tero Kristo <t-kristo@ti.com> > > This one breaks boot on OMAP2430 (and presumably all other OMAP2xxx). > Adding something like this seems to get it working. Yeah, you are right. This patch also broke am33xx boot, I will fix this in v2. -Tero > > > - Paul > > --- > arch/arm/mach-omap2/cm_common.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/arm/mach-omap2/cm_common.c b/arch/arm/mach-omap2/cm_common.c > index c2d7c7b3002c..1770364f0499 100644 > --- a/arch/arm/mach-omap2/cm_common.c > +++ b/arch/arm/mach-omap2/cm_common.c > @@ -234,7 +234,12 @@ static struct omap_prcm_init_data omap3_cm_data = { > .offset = -OMAP3430_IVA2_MOD, > }; > > +static struct omap_prcm_init_data omap2_prcm_data = { > + .index = CLK_MEMMAP_INDEX_CM1, > +}; > + > static struct of_device_id omap_cm_dt_match_table[] = { > + { .compatible = "ti,omap2-prcm", .data = &omap2_prcm_data }, > { .compatible = "ti,omap3-cm", .data = &omap3_cm_data }, > { .compatible = "ti,omap4-cm1", .data = &cm_data }, > { .compatible = "ti,omap4-cm2", .data = &cm2_data }, >
diff --git a/arch/arm/mach-omap2/cm_common.c b/arch/arm/mach-omap2/cm_common.c index c2d7c7b3002c..1770364f0499 100644 --- a/arch/arm/mach-omap2/cm_common.c +++ b/arch/arm/mach-omap2/cm_common.c @@ -234,7 +234,12 @@ static struct omap_prcm_init_data omap3_cm_data = { .offset = -OMAP3430_IVA2_MOD, }; +static struct omap_prcm_init_data omap2_prcm_data = { + .index = CLK_MEMMAP_INDEX_CM1, +}; + static struct of_device_id omap_cm_dt_match_table[] = { + { .compatible = "ti,omap2-prcm", .data = &omap2_prcm_data }, { .compatible = "ti,omap3-cm", .data = &omap3_cm_data }, { .compatible = "ti,omap4-cm1", .data = &cm_data }, { .compatible = "ti,omap4-cm2", .data = &cm2_data },