diff options
author | Kevin Hilman <khilman@deeprootsystems.com> | 2010-07-26 18:34:28 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-07-26 18:34:28 -0400 |
commit | 2eb1875d2b7560e70c19a11daa00e06e0de9eea1 (patch) | |
tree | b8f4f7e15d415dc915204385558cec58382e33c8 /arch/arm | |
parent | 6405616754f70a11c5410b321495fcd61e70b240 (diff) |
OMAP2/3: hwmod: L3 and L4 CORE/PER/WKUP hwmods don't have IDLEST
Since these hwmods do not have IDLEST, set the HWMOD_NO_IDLEST flag,
otherwise _enable() will fail due to failing _wait_target_ready().
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2420_data.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2430_data.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 |
3 files changed, 20 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c index e5530c51f77d..a8b57a648c7d 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c | |||
@@ -65,7 +65,8 @@ static struct omap_hwmod omap2420_l3_hwmod = { | |||
65 | .masters_cnt = ARRAY_SIZE(omap2420_l3_masters), | 65 | .masters_cnt = ARRAY_SIZE(omap2420_l3_masters), |
66 | .slaves = omap2420_l3_slaves, | 66 | .slaves = omap2420_l3_slaves, |
67 | .slaves_cnt = ARRAY_SIZE(omap2420_l3_slaves), | 67 | .slaves_cnt = ARRAY_SIZE(omap2420_l3_slaves), |
68 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | 68 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), |
69 | .flags = HWMOD_NO_IDLEST, | ||
69 | }; | 70 | }; |
70 | 71 | ||
71 | static struct omap_hwmod omap2420_l4_wkup_hwmod; | 72 | static struct omap_hwmod omap2420_l4_wkup_hwmod; |
@@ -95,7 +96,8 @@ static struct omap_hwmod omap2420_l4_core_hwmod = { | |||
95 | .masters_cnt = ARRAY_SIZE(omap2420_l4_core_masters), | 96 | .masters_cnt = ARRAY_SIZE(omap2420_l4_core_masters), |
96 | .slaves = omap2420_l4_core_slaves, | 97 | .slaves = omap2420_l4_core_slaves, |
97 | .slaves_cnt = ARRAY_SIZE(omap2420_l4_core_slaves), | 98 | .slaves_cnt = ARRAY_SIZE(omap2420_l4_core_slaves), |
98 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | 99 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), |
100 | .flags = HWMOD_NO_IDLEST, | ||
99 | }; | 101 | }; |
100 | 102 | ||
101 | /* Slave interfaces on the L4_WKUP interconnect */ | 103 | /* Slave interfaces on the L4_WKUP interconnect */ |
@@ -115,7 +117,8 @@ static struct omap_hwmod omap2420_l4_wkup_hwmod = { | |||
115 | .masters_cnt = ARRAY_SIZE(omap2420_l4_wkup_masters), | 117 | .masters_cnt = ARRAY_SIZE(omap2420_l4_wkup_masters), |
116 | .slaves = omap2420_l4_wkup_slaves, | 118 | .slaves = omap2420_l4_wkup_slaves, |
117 | .slaves_cnt = ARRAY_SIZE(omap2420_l4_wkup_slaves), | 119 | .slaves_cnt = ARRAY_SIZE(omap2420_l4_wkup_slaves), |
118 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | 120 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), |
121 | .flags = HWMOD_NO_IDLEST, | ||
119 | }; | 122 | }; |
120 | 123 | ||
121 | /* Master interfaces on the MPU device */ | 124 | /* Master interfaces on the MPU device */ |
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index 0852d954da40..8b1f74b7974c 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c | |||
@@ -65,7 +65,8 @@ static struct omap_hwmod omap2430_l3_hwmod = { | |||
65 | .masters_cnt = ARRAY_SIZE(omap2430_l3_masters), | 65 | .masters_cnt = ARRAY_SIZE(omap2430_l3_masters), |
66 | .slaves = omap2430_l3_slaves, | 66 | .slaves = omap2430_l3_slaves, |
67 | .slaves_cnt = ARRAY_SIZE(omap2430_l3_slaves), | 67 | .slaves_cnt = ARRAY_SIZE(omap2430_l3_slaves), |
68 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430) | 68 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), |
69 | .flags = HWMOD_NO_IDLEST, | ||
69 | }; | 70 | }; |
70 | 71 | ||
71 | static struct omap_hwmod omap2430_l4_wkup_hwmod; | 72 | static struct omap_hwmod omap2430_l4_wkup_hwmod; |
@@ -97,7 +98,8 @@ static struct omap_hwmod omap2430_l4_core_hwmod = { | |||
97 | .masters_cnt = ARRAY_SIZE(omap2430_l4_core_masters), | 98 | .masters_cnt = ARRAY_SIZE(omap2430_l4_core_masters), |
98 | .slaves = omap2430_l4_core_slaves, | 99 | .slaves = omap2430_l4_core_slaves, |
99 | .slaves_cnt = ARRAY_SIZE(omap2430_l4_core_slaves), | 100 | .slaves_cnt = ARRAY_SIZE(omap2430_l4_core_slaves), |
100 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430) | 101 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), |
102 | .flags = HWMOD_NO_IDLEST, | ||
101 | }; | 103 | }; |
102 | 104 | ||
103 | /* Slave interfaces on the L4_WKUP interconnect */ | 105 | /* Slave interfaces on the L4_WKUP interconnect */ |
@@ -117,7 +119,8 @@ static struct omap_hwmod omap2430_l4_wkup_hwmod = { | |||
117 | .masters_cnt = ARRAY_SIZE(omap2430_l4_wkup_masters), | 119 | .masters_cnt = ARRAY_SIZE(omap2430_l4_wkup_masters), |
118 | .slaves = omap2430_l4_wkup_slaves, | 120 | .slaves = omap2430_l4_wkup_slaves, |
119 | .slaves_cnt = ARRAY_SIZE(omap2430_l4_wkup_slaves), | 121 | .slaves_cnt = ARRAY_SIZE(omap2430_l4_wkup_slaves), |
120 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430) | 122 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), |
123 | .flags = HWMOD_NO_IDLEST, | ||
121 | }; | 124 | }; |
122 | 125 | ||
123 | /* Master interfaces on the MPU device */ | 126 | /* Master interfaces on the MPU device */ |
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 39b0c0eaa37d..e288b2034feb 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
@@ -76,7 +76,8 @@ static struct omap_hwmod omap3xxx_l3_hwmod = { | |||
76 | .masters_cnt = ARRAY_SIZE(omap3xxx_l3_masters), | 76 | .masters_cnt = ARRAY_SIZE(omap3xxx_l3_masters), |
77 | .slaves = omap3xxx_l3_slaves, | 77 | .slaves = omap3xxx_l3_slaves, |
78 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l3_slaves), | 78 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l3_slaves), |
79 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) | 79 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
80 | .flags = HWMOD_NO_IDLEST, | ||
80 | }; | 81 | }; |
81 | 82 | ||
82 | static struct omap_hwmod omap3xxx_l4_wkup_hwmod; | 83 | static struct omap_hwmod omap3xxx_l4_wkup_hwmod; |
@@ -106,7 +107,8 @@ static struct omap_hwmod omap3xxx_l4_core_hwmod = { | |||
106 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_core_masters), | 107 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_core_masters), |
107 | .slaves = omap3xxx_l4_core_slaves, | 108 | .slaves = omap3xxx_l4_core_slaves, |
108 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_core_slaves), | 109 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_core_slaves), |
109 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) | 110 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
111 | .flags = HWMOD_NO_IDLEST, | ||
110 | }; | 112 | }; |
111 | 113 | ||
112 | /* Slave interfaces on the L4_PER interconnect */ | 114 | /* Slave interfaces on the L4_PER interconnect */ |
@@ -126,7 +128,8 @@ static struct omap_hwmod omap3xxx_l4_per_hwmod = { | |||
126 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_per_masters), | 128 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_per_masters), |
127 | .slaves = omap3xxx_l4_per_slaves, | 129 | .slaves = omap3xxx_l4_per_slaves, |
128 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_per_slaves), | 130 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_per_slaves), |
129 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) | 131 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
132 | .flags = HWMOD_NO_IDLEST, | ||
130 | }; | 133 | }; |
131 | 134 | ||
132 | /* Slave interfaces on the L4_WKUP interconnect */ | 135 | /* Slave interfaces on the L4_WKUP interconnect */ |
@@ -146,7 +149,8 @@ static struct omap_hwmod omap3xxx_l4_wkup_hwmod = { | |||
146 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_masters), | 149 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_masters), |
147 | .slaves = omap3xxx_l4_wkup_slaves, | 150 | .slaves = omap3xxx_l4_wkup_slaves, |
148 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_slaves), | 151 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_slaves), |
149 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) | 152 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
153 | .flags = HWMOD_NO_IDLEST, | ||
150 | }; | 154 | }; |
151 | 155 | ||
152 | /* Master interfaces on the MPU device */ | 156 | /* Master interfaces on the MPU device */ |