diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/clock3xxx_data.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index 1efdec236ae..15e65046471 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c | |||
@@ -3478,8 +3478,8 @@ static struct omap_clk omap3xxx_clks[] = { | |||
3478 | CLK("davinci_mdio.0", NULL, &emac_fck, CK_AM35XX), | 3478 | CLK("davinci_mdio.0", NULL, &emac_fck, CK_AM35XX), |
3479 | CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX), | 3479 | CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX), |
3480 | CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX), | 3480 | CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX), |
3481 | CLK("musb-am35x", "ick", &hsotgusb_ick_am35xx, CK_AM35XX), | 3481 | CLK(NULL, "hsotgusb_ick", &hsotgusb_ick_am35xx, CK_AM35XX), |
3482 | CLK("musb-am35x", "fck", &hsotgusb_fck_am35xx, CK_AM35XX), | 3482 | CLK(NULL, "hsotgusb_fck", &hsotgusb_fck_am35xx, CK_AM35XX), |
3483 | CLK(NULL, "hecc_ck", &hecc_ck, CK_AM35XX), | 3483 | CLK(NULL, "hecc_ck", &hecc_ck, CK_AM35XX), |
3484 | CLK(NULL, "uart4_ick", &uart4_ick_am35xx, CK_AM35XX), | 3484 | CLK(NULL, "uart4_ick", &uart4_ick_am35xx, CK_AM35XX), |
3485 | CLK("omap_timer.1", "32k_ck", &omap_32k_fck, CK_3XXX), | 3485 | CLK("omap_timer.1", "32k_ck", &omap_32k_fck, CK_3XXX), |
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index b26d3c9bca1..21428fe6ffa 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
@@ -1638,25 +1638,20 @@ static struct omap_hwmod omap3xxx_usbhsotg_hwmod = { | |||
1638 | 1638 | ||
1639 | /* usb_otg_hs */ | 1639 | /* usb_otg_hs */ |
1640 | static struct omap_hwmod_irq_info am35xx_usbhsotg_mpu_irqs[] = { | 1640 | static struct omap_hwmod_irq_info am35xx_usbhsotg_mpu_irqs[] = { |
1641 | |||
1642 | { .name = "mc", .irq = 71 }, | 1641 | { .name = "mc", .irq = 71 }, |
1643 | { .irq = -1 } | 1642 | { .irq = -1 } |
1644 | }; | 1643 | }; |
1645 | 1644 | ||
1646 | static struct omap_hwmod_class am35xx_usbotg_class = { | 1645 | static struct omap_hwmod_class am35xx_usbotg_class = { |
1647 | .name = "am35xx_usbotg", | 1646 | .name = "am35xx_usbotg", |
1648 | .sysc = NULL, | ||
1649 | }; | 1647 | }; |
1650 | 1648 | ||
1651 | static struct omap_hwmod am35xx_usbhsotg_hwmod = { | 1649 | static struct omap_hwmod am35xx_usbhsotg_hwmod = { |
1652 | .name = "am35x_otg_hs", | 1650 | .name = "am35x_otg_hs", |
1653 | .mpu_irqs = am35xx_usbhsotg_mpu_irqs, | 1651 | .mpu_irqs = am35xx_usbhsotg_mpu_irqs, |
1654 | .main_clk = NULL, | 1652 | .main_clk = "hsotgusb_fck", |
1655 | .prcm = { | ||
1656 | .omap2 = { | ||
1657 | }, | ||
1658 | }, | ||
1659 | .class = &am35xx_usbotg_class, | 1653 | .class = &am35xx_usbotg_class, |
1654 | .flags = HWMOD_NO_IDLEST, | ||
1660 | }; | 1655 | }; |
1661 | 1656 | ||
1662 | /* MMC/SD/SDIO common */ | 1657 | /* MMC/SD/SDIO common */ |
@@ -2097,9 +2092,10 @@ static struct omap_hwmod_ocp_if omap3xxx_usbhsotg__l3 = { | |||
2097 | static struct omap_hwmod_ocp_if am35xx_usbhsotg__l3 = { | 2092 | static struct omap_hwmod_ocp_if am35xx_usbhsotg__l3 = { |
2098 | .master = &am35xx_usbhsotg_hwmod, | 2093 | .master = &am35xx_usbhsotg_hwmod, |
2099 | .slave = &omap3xxx_l3_main_hwmod, | 2094 | .slave = &omap3xxx_l3_main_hwmod, |
2100 | .clk = "core_l3_ick", | 2095 | .clk = "hsotgusb_ick", |
2101 | .user = OCP_USER_MPU, | 2096 | .user = OCP_USER_MPU, |
2102 | }; | 2097 | }; |
2098 | |||
2103 | /* L4_CORE -> L4_WKUP interface */ | 2099 | /* L4_CORE -> L4_WKUP interface */ |
2104 | static struct omap_hwmod_ocp_if omap3xxx_l4_core__l4_wkup = { | 2100 | static struct omap_hwmod_ocp_if omap3xxx_l4_core__l4_wkup = { |
2105 | .master = &omap3xxx_l4_core_hwmod, | 2101 | .master = &omap3xxx_l4_core_hwmod, |
@@ -2393,7 +2389,7 @@ static struct omap_hwmod_addr_space am35xx_usbhsotg_addrs[] = { | |||
2393 | static struct omap_hwmod_ocp_if am35xx_l4_core__usbhsotg = { | 2389 | static struct omap_hwmod_ocp_if am35xx_l4_core__usbhsotg = { |
2394 | .master = &omap3xxx_l4_core_hwmod, | 2390 | .master = &omap3xxx_l4_core_hwmod, |
2395 | .slave = &am35xx_usbhsotg_hwmod, | 2391 | .slave = &am35xx_usbhsotg_hwmod, |
2396 | .clk = "l4_ick", | 2392 | .clk = "hsotgusb_ick", |
2397 | .addr = am35xx_usbhsotg_addrs, | 2393 | .addr = am35xx_usbhsotg_addrs, |
2398 | .user = OCP_USER_MPU, | 2394 | .user = OCP_USER_MPU, |
2399 | }; | 2395 | }; |