diff options
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 89a8698cd6ed..0dd6398bade4 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
20 | #include <linux/pinctrl/machine.h> | 20 | #include <linux/pinctrl/machine.h> |
21 | #include <linux/platform_data/omap4-keypad.h> | 21 | #include <linux/platform_data/omap4-keypad.h> |
22 | #include <linux/wl12xx.h> | ||
23 | #include <linux/platform_data/mailbox-omap.h> | 22 | #include <linux/platform_data/mailbox-omap.h> |
24 | 23 | ||
25 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
@@ -476,40 +475,6 @@ int __init omap_init_vout(void) | |||
476 | int __init omap_init_vout(void) { return 0; } | 475 | int __init omap_init_vout(void) { return 0; } |
477 | #endif | 476 | #endif |
478 | 477 | ||
479 | #if IS_ENABLED(CONFIG_WL12XX) | ||
480 | |||
481 | static struct wl12xx_platform_data wl12xx __initdata; | ||
482 | |||
483 | void __init omap_init_wl12xx_of(void) | ||
484 | { | ||
485 | int ret; | ||
486 | |||
487 | if (!of_have_populated_dt()) | ||
488 | return; | ||
489 | |||
490 | if (of_machine_is_compatible("ti,omap4-sdp")) { | ||
491 | wl12xx.board_ref_clock = WL12XX_REFCLOCK_26; | ||
492 | wl12xx.board_tcxo_clock = WL12XX_TCXOCLOCK_26; | ||
493 | wl12xx.irq = gpio_to_irq(53); | ||
494 | } else if (of_machine_is_compatible("ti,omap4-panda")) { | ||
495 | wl12xx.board_ref_clock = WL12XX_REFCLOCK_38; | ||
496 | wl12xx.irq = gpio_to_irq(53); | ||
497 | } else { | ||
498 | return; | ||
499 | } | ||
500 | |||
501 | ret = wl12xx_set_platform_data(&wl12xx); | ||
502 | if (ret) { | ||
503 | pr_err("error setting wl12xx data: %d\n", ret); | ||
504 | return; | ||
505 | } | ||
506 | } | ||
507 | #else | ||
508 | static inline void omap_init_wl12xx_of(void) | ||
509 | { | ||
510 | } | ||
511 | #endif | ||
512 | |||
513 | /*-------------------------------------------------------------------------*/ | 478 | /*-------------------------------------------------------------------------*/ |
514 | 479 | ||
515 | static int __init omap2_init_devices(void) | 480 | static int __init omap2_init_devices(void) |
@@ -532,9 +497,6 @@ static int __init omap2_init_devices(void) | |||
532 | omap_init_sham(); | 497 | omap_init_sham(); |
533 | omap_init_aes(); | 498 | omap_init_aes(); |
534 | omap_init_rng(); | 499 | omap_init_rng(); |
535 | } else { | ||
536 | /* These can be removed when bindings are done */ | ||
537 | omap_init_wl12xx_of(); | ||
538 | } | 500 | } |
539 | omap_init_sti(); | 501 | omap_init_sti(); |
540 | 502 | ||