diff options
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-minnow-wireless.c | 104 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-minnow.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-minnow.h | 1 |
4 files changed, 0 insertions, 107 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 73577b3589a..7cd16a65a8b 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -254,7 +254,6 @@ obj-$(CONFIG_MACH_TOUCHBOOK) += board-omap3touchbook.o obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o obj-$(CONFIG_MACH_MINNOW) += board-minnow.o \ - board-minnow-wireless.o \ board-minnow-cpcap-client.o obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o diff --git a/arch/arm/mach-omap2/board-minnow-wireless.c b/arch/arm/mach-omap2/board-minnow-wireless.c deleted file mode 100644 index 672917cfff3..00000000000 --- a/arch/arm/mach-omap2/board-minnow-wireless.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - * linux/arch/arm/mach-omap2/board-minnow-wireless.c - * - * Copyright (C) 2013 Motorola Mobility, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#include <linux/wl127x-rfkill.h> -#include "common.h" - - - -void change_vio_mode(int source, int value) -{ - printk(KERN_DEBUG "Entering change_vio_mode\n"); -#if 0 - static int bt_request; - static int wifi_request; - - /*If have DC-DC converter, skip it*/ - if (misc_cpcap == NULL) - return; - - mutex_lock(&vio_access); - if (source == 0) - bt_request = value; - else if (source == 1) - wifi_request = value; - else { - printk(KERN_ERR "unknown source to vio "); - mutex_unlock(&vio_access); - return; - } - - if (bt_request | wifi_request) - cpcap_regacc_write(misc_cpcap, CPCAP_REG_S3C, - 0, CPCAP_BIT_SW3STBY); - else - cpcap_regacc_write(misc_cpcap, CPCAP_REG_S3C, - CPCAP_BIT_SW3STBY, CPCAP_BIT_SW3STBY); - - mutex_unlock(&vio_access); -#endif -} - - -static int minnow_wl1271_init(void); -static int minnow_wl1271_release(void); -static int minnow_wl1271_enable(void); -static int minnow_wl1271_disable(void); - -static struct wl127x_rfkill_platform_data minnow_wl1271_pdata = { - .bt_nshutdown_gpio = -1, - .fm_enable_gpio = -1, - .bt_hw_init = minnow_wl1271_init, - .bt_hw_release = minnow_wl1271_release, - .bt_hw_enable = minnow_wl1271_enable, - .bt_hw_disable = minnow_wl1271_disable, -}; - -static int minnow_wl1271_init(void) -{ - return 0; -} - -static int minnow_wl1271_release(void) -{ - return 0; -} - -static int minnow_wl1271_enable(void) -{ - /* FIXME - * Change vio mode dynamically if necessary - */ - change_vio_mode(0, 1); - return 0; -} - -static int minnow_wl1271_disable(void) -{ - /* FIXME - * Change vio mode dynamically if necessary - */ - change_vio_mode(0, 0); - return 0; -} - -static struct platform_device minnow_wl1271_device = { - .name = "wl127x-rfkill", - .id = 0, - .dev.platform_data = &minnow_wl1271_pdata, -}; - -void __init minnow_bt_init(void) -{ - /* TODO use device tree once ported */ - minnow_wl1271_pdata.bt_nshutdown_gpio = 83; - - platform_device_register(&minnow_wl1271_device); -} diff --git a/arch/arm/mach-omap2/board-minnow.c b/arch/arm/mach-omap2/board-minnow.c index 47f6da16e3d..1efa328aa61 100644 --- a/arch/arm/mach-omap2/board-minnow.c +++ b/arch/arm/mach-omap2/board-minnow.c @@ -49,7 +49,6 @@ static void __init minnow_init(void) omap_sdrc_init(JEDEC_JESD209A_sdrc_params, JEDEC_JESD209A_sdrc_params); omap3_enable_usim_buffer(); /* Needed for GPIOs in USIM block */ omap_minnow_display_init(); - minnow_bt_init(); minnow_cpcap_client_init(); minnow_musb_init(); } diff --git a/arch/arm/mach-omap2/board-minnow.h b/arch/arm/mach-omap2/board-minnow.h index 9e5ede30395..d34eda34fe0 100644 --- a/arch/arm/mach-omap2/board-minnow.h +++ b/arch/arm/mach-omap2/board-minnow.h @@ -9,7 +9,6 @@ */ #include <linux/i2c.h> -extern void __init minnow_bt_init(void); extern void __init minnow_spi_init(void); extern void __init minnow_sensors_init(void); extern void __init minnow_touch_init(struct i2c_board_info *i2c_info); |