| Message ID | 1447261631-26362-1-git-send-email-balbi@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Felipe, On 11/11/2015 07:07 PM, Felipe Balbi wrote: > From: Peter Ujfalusi <peter.ujfalusi@ti.com> > > 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
Hi, Peter Ujfalusi <peter.ujfalusi@ti.com> writes: > Felipe, > > On 11/11/2015 07:07 PM, Felipe Balbi wrote: >> From: Peter Ujfalusi <peter.ujfalusi@ti.com> >> >> 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.
On Wed, 11 Nov 2015, Peter Ujfalusi wrote: > On 11/11/2015 07:07 PM, Felipe Balbi wrote: > > From: Peter Ujfalusi <peter.ujfalusi@ti.com> > > > > 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
* Paul Walmsley <paul@pwsan.com> [151111 12:23]: > On Wed, 11 Nov 2015, Peter Ujfalusi wrote: > > > On 11/11/2015 07:07 PM, Felipe Balbi wrote: > > > From: Peter Ujfalusi <peter.ujfalusi@ti.com> > > > > > > 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
* Tony Lindgren <tony@atomide.com> [151111 13:41]: > * Paul Walmsley <paul@pwsan.com> [151111 12:23]: > > On Wed, 11 Nov 2015, Peter Ujfalusi wrote: > > > > > On 11/11/2015 07:07 PM, Felipe Balbi wrote: > > > > From: Peter Ujfalusi <peter.ujfalusi@ti.com> > > > > > > > > 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
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 = &omap_hwmod_sysc_type3, +}; + +static struct omap_hwmod_class dra7xx_mcasp_hwmod_class = { + .name = "mcasp", + .sysc = &dra7xx_mcasp_sysc, +}; + +/* mcasp3 */ +static struct omap_hwmod dra7xx_mcasp3_hwmod = { + .name = "mcasp3", + .class = &dra7xx_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 = &dra7xx_l4_per2_hwmod, + .slave = &dra7xx_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 = &dra7xx_l4_per1_hwmod, @@ -3308,6 +3348,7 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { &dra7xx_l4_wkup__dcan1, &dra7xx_l4_per2__dcan2, &dra7xx_l4_per2__cpgmac0, + &dra7xx_l4_per2__mcasp3, &dra7xx_gmac__mdio, &dra7xx_l4_cfg__dma_system, &dra7xx_l3_main_1__dss,