diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock34xx.c')
-rw-r--r-- | arch/arm/mach-omap2/clock34xx.c | 68 |
1 files changed, 2 insertions, 66 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index b398a4655fed..4596468e50ab 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c | |||
@@ -37,11 +37,7 @@ | |||
37 | * from the CM_{I,F}CLKEN bit. Pass back the correct info via | 37 | * from the CM_{I,F}CLKEN bit. Pass back the correct info via |
38 | * @idlest_reg and @idlest_bit. No return value. | 38 | * @idlest_reg and @idlest_bit. No return value. |
39 | */ | 39 | */ |
40 | #ifdef CONFIG_COMMON_CLK | ||
41 | static void omap3430es2_clk_ssi_find_idlest(struct clk_hw_omap *clk, | 40 | static void omap3430es2_clk_ssi_find_idlest(struct clk_hw_omap *clk, |
42 | #else | ||
43 | static void omap3430es2_clk_ssi_find_idlest(struct clk *clk, | ||
44 | #endif | ||
45 | void __iomem **idlest_reg, | 41 | void __iomem **idlest_reg, |
46 | u8 *idlest_bit, | 42 | u8 *idlest_bit, |
47 | u8 *idlest_val) | 43 | u8 *idlest_val) |
@@ -53,7 +49,6 @@ static void omap3430es2_clk_ssi_find_idlest(struct clk *clk, | |||
53 | *idlest_bit = OMAP3430ES2_ST_SSI_IDLE_SHIFT; | 49 | *idlest_bit = OMAP3430ES2_ST_SSI_IDLE_SHIFT; |
54 | *idlest_val = OMAP34XX_CM_IDLEST_VAL; | 50 | *idlest_val = OMAP34XX_CM_IDLEST_VAL; |
55 | } | 51 | } |
56 | #ifdef CONFIG_COMMON_CLK | ||
57 | const struct clk_hw_omap_ops clkhwops_omap3430es2_ssi_wait = { | 52 | const struct clk_hw_omap_ops clkhwops_omap3430es2_ssi_wait = { |
58 | .find_idlest = omap3430es2_clk_ssi_find_idlest, | 53 | .find_idlest = omap3430es2_clk_ssi_find_idlest, |
59 | .find_companion = omap2_clk_dflt_find_companion, | 54 | .find_companion = omap2_clk_dflt_find_companion, |
@@ -65,23 +60,6 @@ const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_ssi_wait = { | |||
65 | .find_idlest = omap3430es2_clk_ssi_find_idlest, | 60 | .find_idlest = omap3430es2_clk_ssi_find_idlest, |
66 | .find_companion = omap2_clk_dflt_find_companion, | 61 | .find_companion = omap2_clk_dflt_find_companion, |
67 | }; | 62 | }; |
68 | #else | ||
69 | const struct clkops clkops_omap3430es2_ssi_wait = { | ||
70 | .enable = omap2_dflt_clk_enable, | ||
71 | .disable = omap2_dflt_clk_disable, | ||
72 | .find_idlest = omap3430es2_clk_ssi_find_idlest, | ||
73 | .find_companion = omap2_clk_dflt_find_companion, | ||
74 | }; | ||
75 | |||
76 | const struct clkops clkops_omap3430es2_iclk_ssi_wait = { | ||
77 | .enable = omap2_dflt_clk_enable, | ||
78 | .disable = omap2_dflt_clk_disable, | ||
79 | .find_idlest = omap3430es2_clk_ssi_find_idlest, | ||
80 | .find_companion = omap2_clk_dflt_find_companion, | ||
81 | .allow_idle = omap2_clkt_iclk_allow_idle, | ||
82 | .deny_idle = omap2_clkt_iclk_deny_idle, | ||
83 | }; | ||
84 | #endif | ||
85 | 63 | ||
86 | /** | 64 | /** |
87 | * omap3430es2_clk_dss_usbhost_find_idlest - CM_IDLEST info for DSS, USBHOST | 65 | * omap3430es2_clk_dss_usbhost_find_idlest - CM_IDLEST info for DSS, USBHOST |
@@ -97,11 +75,7 @@ const struct clkops clkops_omap3430es2_iclk_ssi_wait = { | |||
97 | * default find_idlest code assumes that they are at the same | 75 | * default find_idlest code assumes that they are at the same |
98 | * position.) No return value. | 76 | * position.) No return value. |
99 | */ | 77 | */ |
100 | #ifdef CONFIG_COMMON_CLK | ||
101 | static void omap3430es2_clk_dss_usbhost_find_idlest(struct clk_hw_omap *clk, | 78 | static void omap3430es2_clk_dss_usbhost_find_idlest(struct clk_hw_omap *clk, |
102 | #else | ||
103 | static void omap3430es2_clk_dss_usbhost_find_idlest(struct clk *clk, | ||
104 | #endif | ||
105 | void __iomem **idlest_reg, | 79 | void __iomem **idlest_reg, |
106 | u8 *idlest_bit, | 80 | u8 *idlest_bit, |
107 | u8 *idlest_val) | 81 | u8 *idlest_val) |
@@ -114,7 +88,7 @@ static void omap3430es2_clk_dss_usbhost_find_idlest(struct clk *clk, | |||
114 | *idlest_bit = OMAP3430ES2_ST_DSS_IDLE_SHIFT; | 88 | *idlest_bit = OMAP3430ES2_ST_DSS_IDLE_SHIFT; |
115 | *idlest_val = OMAP34XX_CM_IDLEST_VAL; | 89 | *idlest_val = OMAP34XX_CM_IDLEST_VAL; |
116 | } | 90 | } |
117 | #ifdef CONFIG_COMMON_CLK | 91 | |
118 | const struct clk_hw_omap_ops clkhwops_omap3430es2_dss_usbhost_wait = { | 92 | const struct clk_hw_omap_ops clkhwops_omap3430es2_dss_usbhost_wait = { |
119 | .find_idlest = omap3430es2_clk_dss_usbhost_find_idlest, | 93 | .find_idlest = omap3430es2_clk_dss_usbhost_find_idlest, |
120 | .find_companion = omap2_clk_dflt_find_companion, | 94 | .find_companion = omap2_clk_dflt_find_companion, |
@@ -126,23 +100,6 @@ const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_dss_usbhost_wait = { | |||
126 | .find_idlest = omap3430es2_clk_dss_usbhost_find_idlest, | 100 | .find_idlest = omap3430es2_clk_dss_usbhost_find_idlest, |
127 | .find_companion = omap2_clk_dflt_find_companion, | 101 | .find_companion = omap2_clk_dflt_find_companion, |
128 | }; | 102 | }; |
129 | #else | ||
130 | const struct clkops clkops_omap3430es2_dss_usbhost_wait = { | ||
131 | .enable = omap2_dflt_clk_enable, | ||
132 | .disable = omap2_dflt_clk_disable, | ||
133 | .find_idlest = omap3430es2_clk_dss_usbhost_find_idlest, | ||
134 | .find_companion = omap2_clk_dflt_find_companion, | ||
135 | }; | ||
136 | |||
137 | const struct clkops clkops_omap3430es2_iclk_dss_usbhost_wait = { | ||
138 | .enable = omap2_dflt_clk_enable, | ||
139 | .disable = omap2_dflt_clk_disable, | ||
140 | .find_idlest = omap3430es2_clk_dss_usbhost_find_idlest, | ||
141 | .find_companion = omap2_clk_dflt_find_companion, | ||
142 | .allow_idle = omap2_clkt_iclk_allow_idle, | ||
143 | .deny_idle = omap2_clkt_iclk_deny_idle, | ||
144 | }; | ||
145 | #endif | ||
146 | 103 | ||
147 | /** | 104 | /** |
148 | * omap3430es2_clk_hsotgusb_find_idlest - return CM_IDLEST info for HSOTGUSB | 105 | * omap3430es2_clk_hsotgusb_find_idlest - return CM_IDLEST info for HSOTGUSB |
@@ -155,11 +112,7 @@ const struct clkops clkops_omap3430es2_iclk_dss_usbhost_wait = { | |||
155 | * shift from the CM_{I,F}CLKEN bit. Pass back the correct info via | 112 | * shift from the CM_{I,F}CLKEN bit. Pass back the correct info via |
156 | * @idlest_reg and @idlest_bit. No return value. | 113 | * @idlest_reg and @idlest_bit. No return value. |
157 | */ | 114 | */ |
158 | #ifdef CONFIG_COMMON_CLK | ||
159 | static void omap3430es2_clk_hsotgusb_find_idlest(struct clk_hw_omap *clk, | 115 | static void omap3430es2_clk_hsotgusb_find_idlest(struct clk_hw_omap *clk, |
160 | #else | ||
161 | static void omap3430es2_clk_hsotgusb_find_idlest(struct clk *clk, | ||
162 | #endif | ||
163 | void __iomem **idlest_reg, | 116 | void __iomem **idlest_reg, |
164 | u8 *idlest_bit, | 117 | u8 *idlest_bit, |
165 | u8 *idlest_val) | 118 | u8 *idlest_val) |
@@ -171,7 +124,7 @@ static void omap3430es2_clk_hsotgusb_find_idlest(struct clk *clk, | |||
171 | *idlest_bit = OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT; | 124 | *idlest_bit = OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT; |
172 | *idlest_val = OMAP34XX_CM_IDLEST_VAL; | 125 | *idlest_val = OMAP34XX_CM_IDLEST_VAL; |
173 | } | 126 | } |
174 | #ifdef CONFIG_COMMON_CLK | 127 | |
175 | const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_hsotgusb_wait = { | 128 | const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_hsotgusb_wait = { |
176 | .allow_idle = omap2_clkt_iclk_allow_idle, | 129 | .allow_idle = omap2_clkt_iclk_allow_idle, |
177 | .deny_idle = omap2_clkt_iclk_deny_idle, | 130 | .deny_idle = omap2_clkt_iclk_deny_idle, |
@@ -183,20 +136,3 @@ const struct clk_hw_omap_ops clkhwops_omap3430es2_hsotgusb_wait = { | |||
183 | .find_idlest = omap3430es2_clk_hsotgusb_find_idlest, | 136 | .find_idlest = omap3430es2_clk_hsotgusb_find_idlest, |
184 | .find_companion = omap2_clk_dflt_find_companion, | 137 | .find_companion = omap2_clk_dflt_find_companion, |
185 | }; | 138 | }; |
186 | #else | ||
187 | const struct clkops clkops_omap3430es2_hsotgusb_wait = { | ||
188 | .enable = omap2_dflt_clk_enable, | ||
189 | .disable = omap2_dflt_clk_disable, | ||
190 | .find_idlest = omap3430es2_clk_hsotgusb_find_idlest, | ||
191 | .find_companion = omap2_clk_dflt_find_companion, | ||
192 | }; | ||
193 | |||
194 | const struct clkops clkops_omap3430es2_iclk_hsotgusb_wait = { | ||
195 | .enable = omap2_dflt_clk_enable, | ||
196 | .disable = omap2_dflt_clk_disable, | ||
197 | .find_idlest = omap3430es2_clk_hsotgusb_find_idlest, | ||
198 | .find_companion = omap2_clk_dflt_find_companion, | ||
199 | .allow_idle = omap2_clkt_iclk_allow_idle, | ||
200 | .deny_idle = omap2_clkt_iclk_deny_idle, | ||
201 | }; | ||
202 | #endif | ||