diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2014-10-12 14:57:32 -0500 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-19 21:12:40 +0100 |
| commit | 893e1f46b96f1bdd562ce77103f5dfe5d91d649b (patch) | |
| tree | 2581d7cfdc70205d42a3ab1fa0fe0a6b3b14336a /arch/arm/mach-omap2/board-tuna.c | |
| parent | bd0d4e4c22a3ca10cb3db7caea83491d6eec446b (diff) | |
| download | kernel_samsung_tuna-893e1f46b96f1bdd562ce77103f5dfe5d91d649b.zip kernel_samsung_tuna-893e1f46b96f1bdd562ce77103f5dfe5d91d649b.tar.gz kernel_samsung_tuna-893e1f46b96f1bdd562ce77103f5dfe5d91d649b.tar.bz2 | |
Revert "Move HSI and GPIO muxing to board-tuna-modems.c"
This reverts commit da0ff48282f4fed7a1738b8b5f6c5b7f098f178b.
Conflicts:
arch/arm/mach-omap2/omap_hsi.c
Diffstat (limited to 'arch/arm/mach-omap2/board-tuna.c')
| -rwxr-xr-x | arch/arm/mach-omap2/board-tuna.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-tuna.c b/arch/arm/mach-omap2/board-tuna.c index 52de2a9..5ffe9dc 100755 --- a/arch/arm/mach-omap2/board-tuna.c +++ b/arch/arm/mach-omap2/board-tuna.c @@ -1343,6 +1343,10 @@ static void __init tuna_init(void) omap4_tuna_led_init(); omap4_tuna_connector_init(); omap4_tuna_pogo_init(); +#ifdef CONFIG_OMAP_HSI_DEVICE + if (TUNA_TYPE_MAGURO == omap4_tuna_get_type()) + omap_hsi_init(); +#endif #ifdef CONFIG_USB_EHCI_HCD_OMAP if (TUNA_TYPE_TORO == omap4_tuna_get_type()) { #ifdef CONFIG_SEC_MODEM |