| Message ID | alpine.DEB.2.00.1206292151290.2338@utopia.booyaka.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Paul, On 06/30/2012 05:53 AM, Paul Walmsley wrote: > > The OMAP4 usb_host_fs (OHCI) and AESS IP blocks require some special > programming for them to enter idle. Without this programming, they > will prevent the rest of the chip from entering full chip idle. > > To implement the idle programming cleanly, this will take some > coordination between maintainers. This is likely to take some time, > so it is probably best to leave this for 3.6 or 3.7. So, in the > meantime, simply remove this data. I'd rather keep the data and comment the ocp_if entry. We can even add a disclaimer on top to explain the reason. It will be less confusing for the driver folks that are currently working on the AESS support. It will as well minimize the churn. Regards, Benoit > Later, once the appropriate support is available, this patch can be > reverted. > > Signed-off-by: Paul Walmsley <paul@pwsan.com> > Cc: Benoît Cousson <b-cousson@ti.com> > --- > Intended for v3.5-rc. > > arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 178 ---------------------------- > 1 file changed, 178 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > index f30e861..95cbfe6 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c > @@ -296,60 +296,6 @@ static struct omap_hwmod omap44xx_ocp_wp_noc_hwmod = { > */ > > /* > - * 'aess' class > - * audio engine sub system > - */ > - > -static struct omap_hwmod_class_sysconfig omap44xx_aess_sysc = { > - .rev_offs = 0x0000, > - .sysc_offs = 0x0010, > - .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE), > - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | > - MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART | > - MSTANDBY_SMART_WKUP), > - .sysc_fields = &omap_hwmod_sysc_type2, > -}; > - > -static struct omap_hwmod_class omap44xx_aess_hwmod_class = { > - .name = "aess", > - .sysc = &omap44xx_aess_sysc, > -}; > - > -/* aess */ > -static struct omap_hwmod_irq_info omap44xx_aess_irqs[] = { > - { .irq = 99 + OMAP44XX_IRQ_GIC_START }, > - { .irq = -1 } > -}; > - > -static struct omap_hwmod_dma_info omap44xx_aess_sdma_reqs[] = { > - { .name = "fifo0", .dma_req = 100 + OMAP44XX_DMA_REQ_START }, > - { .name = "fifo1", .dma_req = 101 + OMAP44XX_DMA_REQ_START }, > - { .name = "fifo2", .dma_req = 102 + OMAP44XX_DMA_REQ_START }, > - { .name = "fifo3", .dma_req = 103 + OMAP44XX_DMA_REQ_START }, > - { .name = "fifo4", .dma_req = 104 + OMAP44XX_DMA_REQ_START }, > - { .name = "fifo5", .dma_req = 105 + OMAP44XX_DMA_REQ_START }, > - { .name = "fifo6", .dma_req = 106 + OMAP44XX_DMA_REQ_START }, > - { .name = "fifo7", .dma_req = 107 + OMAP44XX_DMA_REQ_START }, > - { .dma_req = -1 } > -}; > - > -static struct omap_hwmod omap44xx_aess_hwmod = { > - .name = "aess", > - .class = &omap44xx_aess_hwmod_class, > - .clkdm_name = "abe_clkdm", > - .mpu_irqs = omap44xx_aess_irqs, > - .sdma_reqs = omap44xx_aess_sdma_reqs, > - .main_clk = "aess_fck", > - .prcm = { > - .omap4 = { > - .clkctrl_offs = OMAP4_CM1_ABE_AESS_CLKCTRL_OFFSET, > - .context_offs = OMAP4_RM_ABE_AESS_CONTEXT_OFFSET, > - .modulemode = MODULEMODE_SWCTRL, > - }, > - }, > -}; > - > -/* > * 'c2c' class > * chip 2 chip interface used to plug the ape soc (omap) with an external modem > * soc > @@ -3285,55 +3231,6 @@ static struct omap_hwmod omap44xx_uart4_hwmod = { > }; > > /* > - * 'usb_host_fs' class > - * full-speed usb host controller > - */ > - > -/* The IP is not compliant to type1 / type2 scheme */ > -static struct omap_hwmod_sysc_fields omap_hwmod_sysc_type_usb_host_fs = { > - .midle_shift = 4, > - .sidle_shift = 2, > - .srst_shift = 1, > -}; > - > -static struct omap_hwmod_class_sysconfig omap44xx_usb_host_fs_sysc = { > - .rev_offs = 0x0000, > - .sysc_offs = 0x0210, > - .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE | > - SYSC_HAS_SOFTRESET), > - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | > - SIDLE_SMART_WKUP), > - .sysc_fields = &omap_hwmod_sysc_type_usb_host_fs, > -}; > - > -static struct omap_hwmod_class omap44xx_usb_host_fs_hwmod_class = { > - .name = "usb_host_fs", > - .sysc = &omap44xx_usb_host_fs_sysc, > -}; > - > -/* usb_host_fs */ > -static struct omap_hwmod_irq_info omap44xx_usb_host_fs_irqs[] = { > - { .name = "std", .irq = 89 + OMAP44XX_IRQ_GIC_START }, > - { .name = "smi", .irq = 90 + OMAP44XX_IRQ_GIC_START }, > - { .irq = -1 } > -}; > - > -static struct omap_hwmod omap44xx_usb_host_fs_hwmod = { > - .name = "usb_host_fs", > - .class = &omap44xx_usb_host_fs_hwmod_class, > - .clkdm_name = "l3_init_clkdm", > - .mpu_irqs = omap44xx_usb_host_fs_irqs, > - .main_clk = "usb_host_fs_fck", > - .prcm = { > - .omap4 = { > - .clkctrl_offs = OMAP4_CM_L3INIT_USB_HOST_FS_CLKCTRL_OFFSET, > - .context_offs = OMAP4_RM_L3INIT_USB_HOST_FS_CONTEXT_OFFSET, > - .modulemode = MODULEMODE_SWCTRL, > - }, > - }, > -}; > - > -/* > * 'usb_host_hs' class > * high-speed multi-port usb host controller > */ > @@ -3863,14 +3760,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_2 = { > .user = OCP_USER_MPU | OCP_USER_SDMA, > }; > > -/* usb_host_fs -> l3_main_2 */ > -static struct omap_hwmod_ocp_if omap44xx_usb_host_fs__l3_main_2 = { > - .master = &omap44xx_usb_host_fs_hwmod, > - .slave = &omap44xx_l3_main_2_hwmod, > - .clk = "l3_div_ck", > - .user = OCP_USER_MPU | OCP_USER_SDMA, > -}; > - > /* usb_host_hs -> l3_main_2 */ > static struct omap_hwmod_ocp_if omap44xx_usb_host_hs__l3_main_2 = { > .master = &omap44xx_usb_host_hs_hwmod, > @@ -3921,14 +3810,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_3 = { > .user = OCP_USER_MPU | OCP_USER_SDMA, > }; > > -/* aess -> l4_abe */ > -static struct omap_hwmod_ocp_if omap44xx_aess__l4_abe = { > - .master = &omap44xx_aess_hwmod, > - .slave = &omap44xx_l4_abe_hwmod, > - .clk = "ocp_abe_iclk", > - .user = OCP_USER_MPU | OCP_USER_SDMA, > -}; > - > /* dsp -> l4_abe */ > static struct omap_hwmod_ocp_if omap44xx_dsp__l4_abe = { > .master = &omap44xx_dsp_hwmod, > @@ -4003,42 +3884,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__ocp_wp_noc = { > .user = OCP_USER_MPU | OCP_USER_SDMA, > }; > > -static struct omap_hwmod_addr_space omap44xx_aess_addrs[] = { > - { > - .pa_start = 0x401f1000, > - .pa_end = 0x401f13ff, > - .flags = ADDR_TYPE_RT > - }, > - { } > -}; > - > -/* l4_abe -> aess */ > -static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess = { > - .master = &omap44xx_l4_abe_hwmod, > - .slave = &omap44xx_aess_hwmod, > - .clk = "ocp_abe_iclk", > - .addr = omap44xx_aess_addrs, > - .user = OCP_USER_MPU, > -}; > - > -static struct omap_hwmod_addr_space omap44xx_aess_dma_addrs[] = { > - { > - .pa_start = 0x490f1000, > - .pa_end = 0x490f13ff, > - .flags = ADDR_TYPE_RT > - }, > - { } > -}; > - > -/* l4_abe -> aess (dma) */ > -static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess_dma = { > - .master = &omap44xx_l4_abe_hwmod, > - .slave = &omap44xx_aess_hwmod, > - .clk = "ocp_abe_iclk", > - .addr = omap44xx_aess_dma_addrs, > - .user = OCP_USER_SDMA, > -}; > - > /* l3_main_2 -> c2c */ > static struct omap_hwmod_ocp_if omap44xx_l3_main_2__c2c = { > .master = &omap44xx_l3_main_2_hwmod, > @@ -5847,24 +5692,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__uart4 = { > .user = OCP_USER_MPU | OCP_USER_SDMA, > }; > > -static struct omap_hwmod_addr_space omap44xx_usb_host_fs_addrs[] = { > - { > - .pa_start = 0x4a0a9000, > - .pa_end = 0x4a0a93ff, > - .flags = ADDR_TYPE_RT > - }, > - { } > -}; > - > -/* l4_cfg -> usb_host_fs */ > -static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_host_fs = { > - .master = &omap44xx_l4_cfg_hwmod, > - .slave = &omap44xx_usb_host_fs_hwmod, > - .clk = "l4_div_ck", > - .addr = omap44xx_usb_host_fs_addrs, > - .user = OCP_USER_MPU | OCP_USER_SDMA, > -}; > - > static struct omap_hwmod_addr_space omap44xx_usb_host_hs_addrs[] = { > { > .name = "uhh", > @@ -6014,13 +5841,11 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { > &omap44xx_iva__l3_main_2, > &omap44xx_l3_main_1__l3_main_2, > &omap44xx_l4_cfg__l3_main_2, > - &omap44xx_usb_host_fs__l3_main_2, > &omap44xx_usb_host_hs__l3_main_2, > &omap44xx_usb_otg_hs__l3_main_2, > &omap44xx_l3_main_1__l3_main_3, > &omap44xx_l3_main_2__l3_main_3, > &omap44xx_l4_cfg__l3_main_3, > - &omap44xx_aess__l4_abe, > &omap44xx_dsp__l4_abe, > &omap44xx_l3_main_1__l4_abe, > &omap44xx_mpu__l4_abe, > @@ -6029,8 +5854,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { > &omap44xx_l4_cfg__l4_wkup, > &omap44xx_mpu__mpu_private, > &omap44xx_l4_cfg__ocp_wp_noc, > - &omap44xx_l4_abe__aess, > - &omap44xx_l4_abe__aess_dma, > &omap44xx_l3_main_2__c2c, > &omap44xx_l4_wkup__counter_32k, > &omap44xx_l4_cfg__ctrl_module_core, > @@ -6136,7 +5959,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { > &omap44xx_l4_per__uart2, > &omap44xx_l4_per__uart3, > &omap44xx_l4_per__uart4, > - &omap44xx_l4_cfg__usb_host_fs, > &omap44xx_l4_cfg__usb_host_hs, > &omap44xx_l4_cfg__usb_otg_hs, > &omap44xx_l4_cfg__usb_tll_hs, >
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index f30e861..95cbfe6 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -296,60 +296,6 @@ static struct omap_hwmod omap44xx_ocp_wp_noc_hwmod = { */ /* - * 'aess' class - * audio engine sub system - */ - -static struct omap_hwmod_class_sysconfig omap44xx_aess_sysc = { - .rev_offs = 0x0000, - .sysc_offs = 0x0010, - .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE), - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | - MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART | - MSTANDBY_SMART_WKUP), - .sysc_fields = &omap_hwmod_sysc_type2, -}; - -static struct omap_hwmod_class omap44xx_aess_hwmod_class = { - .name = "aess", - .sysc = &omap44xx_aess_sysc, -}; - -/* aess */ -static struct omap_hwmod_irq_info omap44xx_aess_irqs[] = { - { .irq = 99 + OMAP44XX_IRQ_GIC_START }, - { .irq = -1 } -}; - -static struct omap_hwmod_dma_info omap44xx_aess_sdma_reqs[] = { - { .name = "fifo0", .dma_req = 100 + OMAP44XX_DMA_REQ_START }, - { .name = "fifo1", .dma_req = 101 + OMAP44XX_DMA_REQ_START }, - { .name = "fifo2", .dma_req = 102 + OMAP44XX_DMA_REQ_START }, - { .name = "fifo3", .dma_req = 103 + OMAP44XX_DMA_REQ_START }, - { .name = "fifo4", .dma_req = 104 + OMAP44XX_DMA_REQ_START }, - { .name = "fifo5", .dma_req = 105 + OMAP44XX_DMA_REQ_START }, - { .name = "fifo6", .dma_req = 106 + OMAP44XX_DMA_REQ_START }, - { .name = "fifo7", .dma_req = 107 + OMAP44XX_DMA_REQ_START }, - { .dma_req = -1 } -}; - -static struct omap_hwmod omap44xx_aess_hwmod = { - .name = "aess", - .class = &omap44xx_aess_hwmod_class, - .clkdm_name = "abe_clkdm", - .mpu_irqs = omap44xx_aess_irqs, - .sdma_reqs = omap44xx_aess_sdma_reqs, - .main_clk = "aess_fck", - .prcm = { - .omap4 = { - .clkctrl_offs = OMAP4_CM1_ABE_AESS_CLKCTRL_OFFSET, - .context_offs = OMAP4_RM_ABE_AESS_CONTEXT_OFFSET, - .modulemode = MODULEMODE_SWCTRL, - }, - }, -}; - -/* * 'c2c' class * chip 2 chip interface used to plug the ape soc (omap) with an external modem * soc @@ -3285,55 +3231,6 @@ static struct omap_hwmod omap44xx_uart4_hwmod = { }; /* - * 'usb_host_fs' class - * full-speed usb host controller - */ - -/* The IP is not compliant to type1 / type2 scheme */ -static struct omap_hwmod_sysc_fields omap_hwmod_sysc_type_usb_host_fs = { - .midle_shift = 4, - .sidle_shift = 2, - .srst_shift = 1, -}; - -static struct omap_hwmod_class_sysconfig omap44xx_usb_host_fs_sysc = { - .rev_offs = 0x0000, - .sysc_offs = 0x0210, - .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE | - SYSC_HAS_SOFTRESET), - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | - SIDLE_SMART_WKUP), - .sysc_fields = &omap_hwmod_sysc_type_usb_host_fs, -}; - -static struct omap_hwmod_class omap44xx_usb_host_fs_hwmod_class = { - .name = "usb_host_fs", - .sysc = &omap44xx_usb_host_fs_sysc, -}; - -/* usb_host_fs */ -static struct omap_hwmod_irq_info omap44xx_usb_host_fs_irqs[] = { - { .name = "std", .irq = 89 + OMAP44XX_IRQ_GIC_START }, - { .name = "smi", .irq = 90 + OMAP44XX_IRQ_GIC_START }, - { .irq = -1 } -}; - -static struct omap_hwmod omap44xx_usb_host_fs_hwmod = { - .name = "usb_host_fs", - .class = &omap44xx_usb_host_fs_hwmod_class, - .clkdm_name = "l3_init_clkdm", - .mpu_irqs = omap44xx_usb_host_fs_irqs, - .main_clk = "usb_host_fs_fck", - .prcm = { - .omap4 = { - .clkctrl_offs = OMAP4_CM_L3INIT_USB_HOST_FS_CLKCTRL_OFFSET, - .context_offs = OMAP4_RM_L3INIT_USB_HOST_FS_CONTEXT_OFFSET, - .modulemode = MODULEMODE_SWCTRL, - }, - }, -}; - -/* * 'usb_host_hs' class * high-speed multi-port usb host controller */ @@ -3863,14 +3760,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_2 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* usb_host_fs -> l3_main_2 */ -static struct omap_hwmod_ocp_if omap44xx_usb_host_fs__l3_main_2 = { - .master = &omap44xx_usb_host_fs_hwmod, - .slave = &omap44xx_l3_main_2_hwmod, - .clk = "l3_div_ck", - .user = OCP_USER_MPU | OCP_USER_SDMA, -}; - /* usb_host_hs -> l3_main_2 */ static struct omap_hwmod_ocp_if omap44xx_usb_host_hs__l3_main_2 = { .master = &omap44xx_usb_host_hs_hwmod, @@ -3921,14 +3810,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__l3_main_3 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* aess -> l4_abe */ -static struct omap_hwmod_ocp_if omap44xx_aess__l4_abe = { - .master = &omap44xx_aess_hwmod, - .slave = &omap44xx_l4_abe_hwmod, - .clk = "ocp_abe_iclk", - .user = OCP_USER_MPU | OCP_USER_SDMA, -}; - /* dsp -> l4_abe */ static struct omap_hwmod_ocp_if omap44xx_dsp__l4_abe = { .master = &omap44xx_dsp_hwmod, @@ -4003,42 +3884,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_cfg__ocp_wp_noc = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -static struct omap_hwmod_addr_space omap44xx_aess_addrs[] = { - { - .pa_start = 0x401f1000, - .pa_end = 0x401f13ff, - .flags = ADDR_TYPE_RT - }, - { } -}; - -/* l4_abe -> aess */ -static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess = { - .master = &omap44xx_l4_abe_hwmod, - .slave = &omap44xx_aess_hwmod, - .clk = "ocp_abe_iclk", - .addr = omap44xx_aess_addrs, - .user = OCP_USER_MPU, -}; - -static struct omap_hwmod_addr_space omap44xx_aess_dma_addrs[] = { - { - .pa_start = 0x490f1000, - .pa_end = 0x490f13ff, - .flags = ADDR_TYPE_RT - }, - { } -}; - -/* l4_abe -> aess (dma) */ -static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess_dma = { - .master = &omap44xx_l4_abe_hwmod, - .slave = &omap44xx_aess_hwmod, - .clk = "ocp_abe_iclk", - .addr = omap44xx_aess_dma_addrs, - .user = OCP_USER_SDMA, -}; - /* l3_main_2 -> c2c */ static struct omap_hwmod_ocp_if omap44xx_l3_main_2__c2c = { .master = &omap44xx_l3_main_2_hwmod, @@ -5847,24 +5692,6 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__uart4 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -static struct omap_hwmod_addr_space omap44xx_usb_host_fs_addrs[] = { - { - .pa_start = 0x4a0a9000, - .pa_end = 0x4a0a93ff, - .flags = ADDR_TYPE_RT - }, - { } -}; - -/* l4_cfg -> usb_host_fs */ -static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_host_fs = { - .master = &omap44xx_l4_cfg_hwmod, - .slave = &omap44xx_usb_host_fs_hwmod, - .clk = "l4_div_ck", - .addr = omap44xx_usb_host_fs_addrs, - .user = OCP_USER_MPU | OCP_USER_SDMA, -}; - static struct omap_hwmod_addr_space omap44xx_usb_host_hs_addrs[] = { { .name = "uhh", @@ -6014,13 +5841,11 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_iva__l3_main_2, &omap44xx_l3_main_1__l3_main_2, &omap44xx_l4_cfg__l3_main_2, - &omap44xx_usb_host_fs__l3_main_2, &omap44xx_usb_host_hs__l3_main_2, &omap44xx_usb_otg_hs__l3_main_2, &omap44xx_l3_main_1__l3_main_3, &omap44xx_l3_main_2__l3_main_3, &omap44xx_l4_cfg__l3_main_3, - &omap44xx_aess__l4_abe, &omap44xx_dsp__l4_abe, &omap44xx_l3_main_1__l4_abe, &omap44xx_mpu__l4_abe, @@ -6029,8 +5854,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l4_cfg__l4_wkup, &omap44xx_mpu__mpu_private, &omap44xx_l4_cfg__ocp_wp_noc, - &omap44xx_l4_abe__aess, - &omap44xx_l4_abe__aess_dma, &omap44xx_l3_main_2__c2c, &omap44xx_l4_wkup__counter_32k, &omap44xx_l4_cfg__ctrl_module_core, @@ -6136,7 +5959,6 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l4_per__uart2, &omap44xx_l4_per__uart3, &omap44xx_l4_per__uart4, - &omap44xx_l4_cfg__usb_host_fs, &omap44xx_l4_cfg__usb_host_hs, &omap44xx_l4_cfg__usb_otg_hs, &omap44xx_l4_cfg__usb_tll_hs,
The OMAP4 usb_host_fs (OHCI) and AESS IP blocks require some special programming for them to enter idle. Without this programming, they will prevent the rest of the chip from entering full chip idle. To implement the idle programming cleanly, this will take some coordination between maintainers. This is likely to take some time, so it is probably best to leave this for 3.6 or 3.7. So, in the meantime, simply remove this data. Later, once the appropriate support is available, this patch can be reverted. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Benoît Cousson <b-cousson@ti.com> --- Intended for v3.5-rc. arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 178 ---------------------------- 1 file changed, 178 deletions(-)