[PATCH] ARM: OMAP: DRA7: hwmod: Add data for McASP3
From: Peter UjfalusiMcASP3 is used by default on DRA7x based boards for audio. This fixes following error with Beagle x15: [0.402190] platform 48468000.mcasp: Cannot lookup hwmod 'mcasp3' which is followed by a splat: [ 11.207663] Unhandled fault: imprecise external abort (0x1406) at 0x [ 11.207670] [ cut here ] [ 11.207683] WARNING: CPU: 0 PID: 272 at /home/balbi/workspace/linux/drivers/bus/omap_l3_noc.c:147 l3_interrupt_handler+0x220/0x34c() [ 11.207688] 4400.ocp:L3 Custom Error: MASTER MPU TARGET L4_PER2_P3 (Read): Data Access in User mode during Functional access [ 11.207742] Modules linked in: snd_soc_simple_card(+) omapdss leds_gpio led_class gpio_fan extcon_usb_gpio cpufreq_dt omap_wdt phy_omap_usb2 snd_soc_davinci_mcasp snd_soc_edma snd_soc_omap snd_soc_tlv320aic3x rtc_omap snd_soc_core ti_soc_thermal dwc3_omap snd_pcm_dmaengine snd_pcm extcon_palmas snd_timer extcon snd rtc_palmas rtc_ds1307 tmp102 palmas_pwrbutton thermal_sys soundcore hwmon autofs4 [ 11.207748] CPU: 0 PID: 272 Comm: systemd-udevd Not tainted 4.3.0-11482-g3d26f1f5fc82-dirty #27 [ 11.207751] Hardware name: Generic DRA74X (Flattened Device Tree) [ 11.207765] [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [ 11.207772] [] (show_stack) from [] (dump_stack+0x84/0x9c) [ 11.207783] [] (dump_stack) from [] (warn_slowpath_common+0x78/0xb4) [ 11.207790] [] (warn_slowpath_common) from [] (warn_slowpath_fmt+0x30/0x40) [ 11.207798] [] (warn_slowpath_fmt) from [] (l3_interrupt_handler+0x220/0x34c) [ 11.207805] [] (l3_interrupt_handler) from [] (handle_irq_event_percpu+0x44/0x1f0) [ 11.207811] [] (handle_irq_event_percpu) from [] (handle_irq_event+0x38/0x5c) [ 11.207818] [] (handle_irq_event) from [] (handle_fasteoi_irq+0xcc/0x1b0) [ 11.207824] [] (handle_fasteoi_irq) from [] (generic_handle_irq+0x20/0x34) [ 11.207829] [] (generic_handle_irq) from [] (__handle_domain_irq+0x64/0xe0) [ 11.207835] [] (__handle_domain_irq) from [] (gic_handle_irq+0x40/0x8c) [ 11.207842] [] (gic_handle_irq) from [] (__irq_usr+0x54/0x80) [ 11.207846] Exception stack(0xed143fb0 to 0xed143ff8) [ 11.207851] 3fa0: 7f69b370 7f69b368 0370 [ 11.207857] 3fc0: b6ddb4e0 7f69b370 0016 7f69b308 be8db278 be8db2a0 7f68b024 0001 [ 11.207863] 3fe0: b6ddb4e0 be8db180 b6d46a47 b6d46a50 6030 [ 11.207866] ---[ end trace 7d8de48d1bc8fbac ]--- Signed-off-by: Peter Ujfalusi Signed-off-by: Felipe Balbi --- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 41 +++ 1 file changed, 41 insertions(+) diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index 51d1ecb384bd..b730c582a1f7 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -1298,6 +1298,38 @@ static struct omap_hwmod dra7xx_mcspi4_hwmod = { }; /* + * 'mcasp' class + * + */ +static struct omap_hwmod_class_sysconfig dra7xx_mcasp_sysc = { + .sysc_offs = 0x0004, + .sysc_flags = SYSC_HAS_SIDLEMODE, + .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), + .sysc_fields= _hwmod_sysc_type3, +}; + +static struct omap_hwmod_class dra7xx_mcasp_hwmod_class = { + .name = "mcasp", + .sysc = _mcasp_sysc, +}; + +/* mcasp3 */ +static struct omap_hwmod dra7xx_mcasp3_hwmod = { + .name = "mcasp3", + .class = _mcasp_hwmod_class, + .clkdm_name = "l4per2_clkdm", + .main_clk = "mcasp3_ahclkx_mux", + .flags = HWMOD_SWSUP_SIDLE, + .prcm = { + .omap4 = { + .clkctrl_offs = DRA7XX_CM_L4PER2_MCASP3_CLKCTRL_OFFSET, + .context_offs = DRA7XX_RM_L4PER2_MCASP3_CONTEXT_OFFSET, + .modulemode = MODULEMODE_SWCTRL, + }, + }, +}; + +/* * 'mmc' class * */ @@ -2566,6 +2598,14 @@ static struct omap_hwmod_ocp_if dra7xx_l3_main_1__hdmi = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; +/* l4_per2 -> mcasp3 */ +static struct omap_hwmod_ocp_if dra7xx_l4_per2__mcasp3 = { + .master = _l4_per2_hwmod, + .slave = _mcasp3_hwmod, + .clk= "l3_iclk_div", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; + /* l4_per1 -> elm */ static struct omap_hwmod_ocp_if dra7xx_l4_per1__elm = { .master = _l4_per1_hwmod, @@ -3308,6 +3348,7 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { _l4_wkup__dcan1, _l4_per2__dcan2, _l4_per2__cpgmac0, + _l4_per2__mcasp3, _gmac__mdio, _l4_cfg__dma_system, _l3_main_1__dss, -- 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to
Re: [PATCH] ARM: OMAP: DRA7: hwmod: Add data for McASP3
On Wed, 11 Nov 2015, Peter Ujfalusi wrote: > On 11/11/2015 07:07 PM, Felipe Balbi wrote: > > From: Peter Ujfalusi> > > > McASP3 is used by default on DRA7x based boards for audio. > > While this patch works, it is not the correct one(s) to apply. > https://lkml.org/lkml/2015/10/30/91 > is the series which should have been applied to 4.4. > Paul acked the series, but for some reason it missed the initial ARM pull for > 4.4 It missed it because I was late getting my patches out for 4.4... - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: OMAP: DRA7: hwmod: Add data for McASP3
Felipe, On 11/11/2015 07:07 PM, Felipe Balbi wrote: > From: Peter Ujfalusi> > McASP3 is used by default on DRA7x based boards for audio. While this patch works, it is not the correct one(s) to apply. https://lkml.org/lkml/2015/10/30/91 is the series which should have been applied to 4.4. Paul acked the series, but for some reason it missed the initial ARM pull for 4.4 -- Péter > > This fixes following error with Beagle x15: > > [0.402190] platform 48468000.mcasp: Cannot lookup hwmod 'mcasp3' > > which is followed by a splat: > > [ 11.207663] Unhandled fault: imprecise external abort (0x1406) at > 0x > [ 11.207670] [ cut here ] > [ 11.207683] WARNING: CPU: 0 PID: 272 at > /home/balbi/workspace/linux/drivers/bus/omap_l3_noc.c:147 > l3_interrupt_handler+0x220/0x34c() > [ 11.207688] 4400.ocp:L3 Custom Error: MASTER MPU TARGET L4_PER2_P3 > (Read): Data Access in User mode during Functional access > [ 11.207742] Modules linked in: snd_soc_simple_card(+) omapdss leds_gpio > led_class gpio_fan extcon_usb_gpio cpufreq_dt omap_wdt phy_omap_usb2 > snd_soc_davinci_mcasp snd_soc_edma snd_soc_omap snd_soc_tlv320aic3x rtc_omap > snd_soc_core ti_soc_thermal dwc3_omap snd_pcm_dmaengine snd_pcm extcon_palmas > snd_timer extcon snd rtc_palmas rtc_ds1307 tmp102 palmas_pwrbutton > thermal_sys soundcore hwmon autofs4 > [ 11.207748] CPU: 0 PID: 272 Comm: systemd-udevd Not tainted > 4.3.0-11482-g3d26f1f5fc82-dirty #27 > [ 11.207751] Hardware name: Generic DRA74X (Flattened Device Tree) > [ 11.207765] [] (unwind_backtrace) from [] > (show_stack+0x10/0x14) > [ 11.207772] [] (show_stack) from [] > (dump_stack+0x84/0x9c) > [ 11.207783] [] (dump_stack) from [] > (warn_slowpath_common+0x78/0xb4) > [ 11.207790] [] (warn_slowpath_common) from [] > (warn_slowpath_fmt+0x30/0x40) > [ 11.207798] [] (warn_slowpath_fmt) from [] > (l3_interrupt_handler+0x220/0x34c) > [ 11.207805] [] (l3_interrupt_handler) from [] > (handle_irq_event_percpu+0x44/0x1f0) > [ 11.207811] [] (handle_irq_event_percpu) from [] > (handle_irq_event+0x38/0x5c) > [ 11.207818] [] (handle_irq_event) from [] > (handle_fasteoi_irq+0xcc/0x1b0) > [ 11.207824] [] (handle_fasteoi_irq) from [] > (generic_handle_irq+0x20/0x34) > [ 11.207829] [] (generic_handle_irq) from [] > (__handle_domain_irq+0x64/0xe0) > [ 11.207835] [] (__handle_domain_irq) from [] > (gic_handle_irq+0x40/0x8c) > [ 11.207842] [] (gic_handle_irq) from [] > (__irq_usr+0x54/0x80) > [ 11.207846] Exception stack(0xed143fb0 to 0xed143ff8) > [ 11.207851] 3fa0: 7f69b370 7f69b368 > 0370 > [ 11.207857] 3fc0: b6ddb4e0 7f69b370 0016 7f69b308 be8db278 be8db2a0 > 7f68b024 0001 > [ 11.207863] 3fe0: b6ddb4e0 be8db180 b6d46a47 b6d46a50 6030 > [ 11.207866] ---[ end trace 7d8de48d1bc8fbac ]--- > > Signed-off-by: Peter Ujfalusi > Signed-off-by: Felipe Balbi > --- > arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 41 > +++ > 1 file changed, 41 insertions(+) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > index 51d1ecb384bd..b730c582a1f7 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c > @@ -1298,6 +1298,38 @@ static struct omap_hwmod dra7xx_mcspi4_hwmod = { > }; > > /* > + * 'mcasp' class > + * > + */ > +static struct omap_hwmod_class_sysconfig dra7xx_mcasp_sysc = { > + .sysc_offs = 0x0004, > + .sysc_flags = SYSC_HAS_SIDLEMODE, > + .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), > + .sysc_fields= _hwmod_sysc_type3, > +}; > + > +static struct omap_hwmod_class dra7xx_mcasp_hwmod_class = { > + .name = "mcasp", > + .sysc = _mcasp_sysc, > +}; > + > +/* mcasp3 */ > +static struct omap_hwmod dra7xx_mcasp3_hwmod = { > + .name = "mcasp3", > + .class = _mcasp_hwmod_class, > + .clkdm_name = "l4per2_clkdm", > + .main_clk = "mcasp3_ahclkx_mux", > + .flags = HWMOD_SWSUP_SIDLE, > + .prcm = { > + .omap4 = { > + .clkctrl_offs = DRA7XX_CM_L4PER2_MCASP3_CLKCTRL_OFFSET, > + .context_offs = DRA7XX_RM_L4PER2_MCASP3_CONTEXT_OFFSET, > + .modulemode = MODULEMODE_SWCTRL, > + }, > + }, > +}; > + > +/* > * 'mmc' class > * > */ > @@ -2566,6 +2598,14 @@ static struct omap_hwmod_ocp_if dra7xx_l3_main_1__hdmi > = { > .user = OCP_USER_MPU | OCP_USER_SDMA, > }; > > +/* l4_per2 -> mcasp3 */ > +static struct omap_hwmod_ocp_if dra7xx_l4_per2__mcasp3 = { > + .master = _l4_per2_hwmod, > + .slave = _mcasp3_hwmod, > + .clk= "l3_iclk_div", > + .user = OCP_USER_MPU | OCP_USER_SDMA, > +}; > + >
Re: [PATCH] ARM: OMAP: DRA7: hwmod: Add data for McASP3
Hi, Peter Ujfalusiwrites: > Felipe, > > On 11/11/2015 07:07 PM, Felipe Balbi wrote: >> From: Peter Ujfalusi >> >> McASP3 is used by default on DRA7x based boards for audio. > > While this patch works, it is not the correct one(s) to apply. > https://lkml.org/lkml/2015/10/30/91 > is the series which should have been applied to 4.4. > > Paul acked the series, but for some reason it missed the initial ARM > pull for 4.4 okay, cool. Hopefully Tony will apply shortly. -- balbi signature.asc Description: PGP signature
Re: [PATCH] ARM: OMAP: DRA7: hwmod: Add data for McASP3
* Paul Walmsley[15 12:23]: > On Wed, 11 Nov 2015, Peter Ujfalusi wrote: > > > On 11/11/2015 07:07 PM, Felipe Balbi wrote: > > > From: Peter Ujfalusi > > > > > > McASP3 is used by default on DRA7x based boards for audio. > > > > While this patch works, it is not the correct one(s) to apply. > > https://lkml.org/lkml/2015/10/30/91 > > is the series which should have been applied to 4.4. > > Paul acked the series, but for some reason it missed the initial ARM pull > > for 4.4 > > It missed it because I was late getting my patches out for 4.4... OK applying all three as fixes with your ack like you requested in the original thread. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: OMAP: DRA7: hwmod: Add data for McASP3
* Tony Lindgren[15 13:41]: > * Paul Walmsley [15 12:23]: > > On Wed, 11 Nov 2015, Peter Ujfalusi wrote: > > > > > On 11/11/2015 07:07 PM, Felipe Balbi wrote: > > > > From: Peter Ujfalusi > > > > > > > > McASP3 is used by default on DRA7x based boards for audio. > > > > > > While this patch works, it is not the correct one(s) to apply. > > > https://lkml.org/lkml/2015/10/30/91 > > > is the series which should have been applied to 4.4. > > > Paul acked the series, but for some reason it missed the initial ARM pull > > > for 4.4 > > > > It missed it because I was late getting my patches out for 4.4... > > OK applying all three as fixes with your ack like you requested > in the original thread. Except one of them no longer applies cleanly against the current mainline. So waiting until Peter rebases until applying anything. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html