diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2011-03-10 04:53:15 -0500 |
|---|---|---|
| committer | Benoit Cousson <b-cousson@ti.com> | 2011-03-10 05:04:00 -0500 |
| commit | b9ccf8afe2d2eafe18f90d2925f8464313fe0b56 (patch) | |
| tree | d6fc73de26b1344736a59965b336bb7c6b245a31 | |
| parent | 0dde52a9f5330eec240660191a94b51bd911ffcd (diff) | |
OMAP3: hwmod data: Fix incorrect SmartReflex -> L4 CORE interconnect links
Commit d34427267186827dfd62bd8cf726601fffb22534 ("OMAP3: PM: Adding
smartreflex hwmod data") added data that claims that the L4 CORE has
two slave interfaces that originate from the SmartReflex modules,
omap3_l4_core__sr1 and omap3_l4_core__sr2. But as those two data
structure records show, it's L4 CORE that has a master port towards
SR1 and SR2.
Move the incorrect data from slaves list to master list.
Based on a path by Paul Walmsley <paul@pwsan.com>
https://patchwork.kernel.org/patch/623171/
That is based on a patch by Benoît Cousson <b-cousson@ti.com>:
https://patchwork.kernel.org/patch/590561/
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Benoît Cousson <b-cousson@ti.com>
Cc: Sanjeev Premi <premi@ti.com>
Cc: Thara Gopinath <thara@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index c4ca005f8bb5..dec329ff0924 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
| @@ -491,8 +491,6 @@ static struct omap_hwmod_ocp_if *am35xx_usbhsotg_slaves[] = { | |||
| 491 | /* Slave interfaces on the L4_CORE interconnect */ | 491 | /* Slave interfaces on the L4_CORE interconnect */ |
| 492 | static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = { | 492 | static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = { |
| 493 | &omap3xxx_l3_main__l4_core, | 493 | &omap3xxx_l3_main__l4_core, |
| 494 | &omap3_l4_core__sr1, | ||
| 495 | &omap3_l4_core__sr2, | ||
| 496 | }; | 494 | }; |
| 497 | 495 | ||
| 498 | /* Master interfaces on the L4_CORE interconnect */ | 496 | /* Master interfaces on the L4_CORE interconnect */ |
| @@ -503,6 +501,8 @@ static struct omap_hwmod_ocp_if *omap3xxx_l4_core_masters[] = { | |||
| 503 | &omap3_l4_core__i2c1, | 501 | &omap3_l4_core__i2c1, |
| 504 | &omap3_l4_core__i2c2, | 502 | &omap3_l4_core__i2c2, |
| 505 | &omap3_l4_core__i2c3, | 503 | &omap3_l4_core__i2c3, |
| 504 | &omap3_l4_core__sr1, | ||
| 505 | &omap3_l4_core__sr2, | ||
| 506 | }; | 506 | }; |
| 507 | 507 | ||
| 508 | /* L4 CORE */ | 508 | /* L4 CORE */ |
