diff options
author | Tony Lindgren <tony@atomide.com> | 2012-06-29 09:07:08 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-29 09:07:08 -0400 |
commit | f6f1f12f6d4e9e4a44587e58ec96db25673083ec (patch) | |
tree | 68f44e3d64ebbee9f89c459136702ca243bbfa61 /arch/arm/plat-omap | |
parent | e0246e8ecad10b9437381b89756292ac031d4cfa (diff) | |
parent | a77e1c4d09c88f98ac2e653382d2c1861dbb736f (diff) |
Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes-non-critical
Some OMAP AM35xx fixes.
The powerdomain and clockdomain data for the AM35xx are finally fixed.
The AM35xx EMAC/MDIO Ethernet controller integration code has been
converted to use the OMAP device and hwmod framework. Also the UART4
and HSOTGUSB warnings have been fixed.
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/cpu.h | 33 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/mmc.h | 4 |
3 files changed, 3 insertions, 36 deletions
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 62ec5c452792..706b7e29397f 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
@@ -461,6 +461,7 @@ static int clk_dbg_show_summary(struct seq_file *s, void *unused) | |||
461 | struct clk *c; | 461 | struct clk *c; |
462 | struct clk *pa; | 462 | struct clk *pa; |
463 | 463 | ||
464 | mutex_lock(&clocks_mutex); | ||
464 | seq_printf(s, "%-30s %-30s %-10s %s\n", | 465 | seq_printf(s, "%-30s %-30s %-10s %s\n", |
465 | "clock-name", "parent-name", "rate", "use-count"); | 466 | "clock-name", "parent-name", "rate", "use-count"); |
466 | 467 | ||
@@ -469,6 +470,7 @@ static int clk_dbg_show_summary(struct seq_file *s, void *unused) | |||
469 | seq_printf(s, "%-30s %-30s %-10lu %d\n", | 470 | seq_printf(s, "%-30s %-30s %-10lu %d\n", |
470 | c->name, pa ? pa->name : "none", c->rate, c->usecount); | 471 | c->name, pa ? pa->name : "none", c->rate, c->usecount); |
471 | } | 472 | } |
473 | mutex_unlock(&clocks_mutex); | ||
472 | 474 | ||
473 | return 0; | 475 | return 0; |
474 | } | 476 | } |
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index e79e913d95de..430081ac0c47 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h | |||
@@ -250,8 +250,6 @@ IS_AM_SUBCLASS(335x, 0x335) | |||
250 | * cpu_is_omap2423(): True for OMAP2423 | 250 | * cpu_is_omap2423(): True for OMAP2423 |
251 | * cpu_is_omap2430(): True for OMAP2430 | 251 | * cpu_is_omap2430(): True for OMAP2430 |
252 | * cpu_is_omap3430(): True for OMAP3430 | 252 | * cpu_is_omap3430(): True for OMAP3430 |
253 | * cpu_is_omap3505(): True for OMAP3505 | ||
254 | * cpu_is_omap3517(): True for OMAP3517 | ||
255 | */ | 253 | */ |
256 | #define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff) | 254 | #define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff) |
257 | 255 | ||
@@ -273,8 +271,6 @@ IS_OMAP_TYPE(2422, 0x2422) | |||
273 | IS_OMAP_TYPE(2423, 0x2423) | 271 | IS_OMAP_TYPE(2423, 0x2423) |
274 | IS_OMAP_TYPE(2430, 0x2430) | 272 | IS_OMAP_TYPE(2430, 0x2430) |
275 | IS_OMAP_TYPE(3430, 0x3430) | 273 | IS_OMAP_TYPE(3430, 0x3430) |
276 | IS_OMAP_TYPE(3505, 0x3517) | ||
277 | IS_OMAP_TYPE(3517, 0x3517) | ||
278 | 274 | ||
279 | #define cpu_is_omap310() 0 | 275 | #define cpu_is_omap310() 0 |
280 | #define cpu_is_omap1510() 0 | 276 | #define cpu_is_omap1510() 0 |
@@ -287,12 +283,6 @@ IS_OMAP_TYPE(3517, 0x3517) | |||
287 | #define cpu_is_omap2422() 0 | 283 | #define cpu_is_omap2422() 0 |
288 | #define cpu_is_omap2423() 0 | 284 | #define cpu_is_omap2423() 0 |
289 | #define cpu_is_omap2430() 0 | 285 | #define cpu_is_omap2430() 0 |
290 | #define cpu_is_omap3503() 0 | ||
291 | #define cpu_is_omap3515() 0 | ||
292 | #define cpu_is_omap3525() 0 | ||
293 | #define cpu_is_omap3530() 0 | ||
294 | #define cpu_is_omap3505() 0 | ||
295 | #define cpu_is_omap3517() 0 | ||
296 | #define cpu_is_omap3430() 0 | 286 | #define cpu_is_omap3430() 0 |
297 | #define cpu_is_omap3630() 0 | 287 | #define cpu_is_omap3630() 0 |
298 | 288 | ||
@@ -334,12 +324,6 @@ IS_OMAP_TYPE(3517, 0x3517) | |||
334 | 324 | ||
335 | #if defined(CONFIG_ARCH_OMAP3) | 325 | #if defined(CONFIG_ARCH_OMAP3) |
336 | # undef cpu_is_omap3430 | 326 | # undef cpu_is_omap3430 |
337 | # undef cpu_is_omap3503 | ||
338 | # undef cpu_is_omap3515 | ||
339 | # undef cpu_is_omap3525 | ||
340 | # undef cpu_is_omap3530 | ||
341 | # undef cpu_is_omap3505 | ||
342 | # undef cpu_is_omap3517 | ||
343 | # undef cpu_is_ti81xx | 327 | # undef cpu_is_ti81xx |
344 | # undef cpu_is_ti816x | 328 | # undef cpu_is_ti816x |
345 | # undef cpu_is_ti814x | 329 | # undef cpu_is_ti814x |
@@ -347,19 +331,6 @@ IS_OMAP_TYPE(3517, 0x3517) | |||
347 | # undef cpu_is_am33xx | 331 | # undef cpu_is_am33xx |
348 | # undef cpu_is_am335x | 332 | # undef cpu_is_am335x |
349 | # define cpu_is_omap3430() is_omap3430() | 333 | # define cpu_is_omap3430() is_omap3430() |
350 | # define cpu_is_omap3503() (cpu_is_omap3430() && \ | ||
351 | (!omap3_has_iva()) && \ | ||
352 | (!omap3_has_sgx())) | ||
353 | # define cpu_is_omap3515() (cpu_is_omap3430() && \ | ||
354 | (!omap3_has_iva()) && \ | ||
355 | (omap3_has_sgx())) | ||
356 | # define cpu_is_omap3525() (cpu_is_omap3430() && \ | ||
357 | (!omap3_has_sgx()) && \ | ||
358 | (omap3_has_iva())) | ||
359 | # define cpu_is_omap3530() (cpu_is_omap3430()) | ||
360 | # define cpu_is_omap3517() is_omap3517() | ||
361 | # define cpu_is_omap3505() (cpu_is_omap3517() && \ | ||
362 | !omap3_has_sgx()) | ||
363 | # undef cpu_is_omap3630 | 334 | # undef cpu_is_omap3630 |
364 | # define cpu_is_omap3630() is_omap363x() | 335 | # define cpu_is_omap3630() is_omap363x() |
365 | # define cpu_is_ti81xx() is_ti81xx() | 336 | # define cpu_is_ti81xx() is_ti81xx() |
@@ -408,10 +379,6 @@ IS_OMAP_TYPE(3517, 0x3517) | |||
408 | #define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (0x1 << 8)) | 379 | #define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (0x1 << 8)) |
409 | #define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (0x2 << 8)) | 380 | #define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (0x2 << 8)) |
410 | 381 | ||
411 | #define OMAP3517_CLASS 0x35170034 | ||
412 | #define OMAP3517_REV_ES1_0 OMAP3517_CLASS | ||
413 | #define OMAP3517_REV_ES1_1 (OMAP3517_CLASS | (0x1 << 8)) | ||
414 | |||
415 | #define TI816X_CLASS 0x81600034 | 382 | #define TI816X_CLASS 0x81600034 |
416 | #define TI8168_REV_ES1_0 TI816X_CLASS | 383 | #define TI8168_REV_ES1_0 TI816X_CLASS |
417 | #define TI8168_REV_ES1_1 (TI816X_CLASS | (0x1 << 8)) | 384 | #define TI8168_REV_ES1_1 (TI816X_CLASS | (0x1 << 8)) |
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index a7754a886d42..5493bd95da5e 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h | |||
@@ -172,8 +172,7 @@ struct omap_mmc_platform_data { | |||
172 | extern void omap_mmc_notify_cover_event(struct device *dev, int slot, | 172 | extern void omap_mmc_notify_cover_event(struct device *dev, int slot, |
173 | int is_closed); | 173 | int is_closed); |
174 | 174 | ||
175 | #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ | 175 | #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) |
176 | defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) | ||
177 | void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, | 176 | void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, |
178 | int nr_controllers); | 177 | int nr_controllers); |
179 | void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data); | 178 | void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data); |
@@ -185,7 +184,6 @@ static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, | |||
185 | static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) | 184 | static inline void omap242x_init_mmc(struct omap_mmc_platform_data **mmc_data) |
186 | { | 185 | { |
187 | } | 186 | } |
188 | |||
189 | #endif | 187 | #endif |
190 | 188 | ||
191 | extern int omap_msdi_reset(struct omap_hwmod *oh); | 189 | extern int omap_msdi_reset(struct omap_hwmod *oh); |