diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-07-25 15:35:20 +0200 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-07-25 15:39:21 +0200 |
| commit | 05f01497fc214568e6a87d0290e043be59c09752 (patch) | |
| tree | d65f059e139c625146cce69b146215531f2de74a | |
| parent | b3e73459fda98bd393201b7a3e71e34e47c4377d (diff) | |
HWMOD: remove duplicate structure definition
Definition of structure duplicated and in a bad place from patch:
HWMOD: Fix to disable dma to allow system to go to OFF
Signed-off-by: Xavier Boudet <x-boudet@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c index 651e983da25c..3efbc2e33744 100644 --- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c @@ -6320,56 +6320,6 @@ static struct omap_hwmod omap54xx_usb_host_hs_hwmod = { * Don't use smart standby; use only force standby, * hence HWMOD_SWSUP_MSTANDBY */ -static struct omap_hwmod_class_sysconfig omap54xx_usb_otg_ss_sysc = { - .rev_offs = 0x0000, - .sysc_offs = 0x0010, - .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE - | SYSC_HAS_DMADISABLE), - .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | - SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO | - MSTANDBY_SMART | MSTANDBY_SMART_WKUP), - .sysc_fields = &omap_hwmod_sysc_type2, -}; - -static struct omap_hwmod_class omap54xx_usb_otg_ss_hwmod_class = { - .name = "usb_otg_ss", - .sysc = &omap54xx_usb_otg_ss_sysc, -}; - -/* usb_otg_ss */ -static struct omap_hwmod_irq_info omap54xx_usb_otg_ss_irqs[] = { - { .name = "core", .irq = 92 + OMAP54XX_IRQ_GIC_START }, - { .name = "wrp", .irq = 93 + OMAP54XX_IRQ_GIC_START }, - { .irq = -1 } -}; - -/* usb_otg_ss master ports */ -static struct omap_hwmod_ocp_if *omap54xx_usb_otg_ss_masters[] = { - &omap54xx_usb_otg_ss__l3_main_2, -}; - -static struct omap_hwmod_addr_space omap54xx_usb_otg_ss_addrs[] = { - { - .pa_start = 0x4a020000, - .pa_end = 0x4a03ffff, - .flags = ADDR_TYPE_RT - }, - { } -}; - -/* l4_cfg -> usb_otg_ss */ -static struct omap_hwmod_ocp_if omap54xx_l4_cfg__usb_otg_ss = { - .master = &omap54xx_l4_cfg_hwmod, - .slave = &omap54xx_usb_otg_ss_hwmod, - .clk = "l4_div_ck", - .addr = omap54xx_usb_otg_ss_addrs, - .user = OCP_USER_MPU | OCP_USER_SDMA, -}; - -/* usb_otg_ss slave ports */ -static struct omap_hwmod_ocp_if *omap54xx_usb_otg_ss_slaves[] = { - &omap54xx_l4_cfg__usb_otg_ss, -}; /* During system boot; If the hwmod framework resets the module * the module will have smart idle settings; which can lead to deadlock @@ -6380,7 +6330,6 @@ static struct omap_hwmod_ocp_if *omap54xx_usb_otg_ss_slaves[] = { HWMOD_INIT_NO_RESET, }; - /* * 'usb_tll_hs' class * usb_tll_hs module is the adapter on the usb_host_hs ports |