From a0cc2f3b51a8649da5262aba7501dc21738e1b8d Mon Sep 17 00:00:00 2001 From: Pavan Savoy Date: Wed, 6 Oct 2010 12:18:14 -0400 Subject: [PATCH] staging: ti-st: move TI_ST from staging to misc/ move the 3 source files st_core.c, st_kim.c and st_ll.c from staging to drivers/misc/. Texas Instrument's WiLink 7 chipset packs wireless technologies like Bluetooth, FM, GPS and WLAN into a single die. Among these the Bluetooth, FM Rx/Tx and GPS are interfaced to a apps processor over a single UART. This line discipline driver allows various protocol drivers such as Bluetooth BlueZ driver, FM V4L2 driver and GPS simple character device driver to communicate with its relevant core in the chip. Each protocol or technologies use a logical channel to communicate with chip. Bluetooth uses the HCI-H4 [channels 1-4], FM uses a CH-8 and GPS a CH-9 protocol. The driver also constitutes the TI HCI-LL Power Management protocol which use channels 30-33. Signed-off-by: Pavan Savoy Signed-off-by: Greg Kroah-Hartman --- drivers/{staging => misc}/ti-st/st_core.c | 3 ++- drivers/{staging => misc}/ti-st/st_kim.c | 3 ++- drivers/{staging => misc}/ti-st/st_ll.c | 3 ++- drivers/staging/ti-st/Kconfig | 11 ----------- drivers/staging/ti-st/Makefile | 2 -- 5 files changed, 6 insertions(+), 16 deletions(-) rename drivers/{staging => misc}/ti-st/st_core.c (99%) rename drivers/{staging => misc}/ti-st/st_kim.c (99%) rename drivers/{staging => misc}/ti-st/st_ll.c (97%) diff --git a/drivers/staging/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c similarity index 99% rename from drivers/staging/ti-st/st_core.c rename to drivers/misc/ti-st/st_core.c index 5bef61e579c3..9bae0eb26b96 100644 --- a/drivers/staging/ti-st/st_core.c +++ b/drivers/misc/ti-st/st_core.c @@ -1,7 +1,8 @@ /* * Shared Transport Line discipline driver Core * This hooks up ST KIM driver and ST LL driver - * Copyright (C) 2009 Texas Instruments + * Copyright (C) 2009-2010 Texas Instruments + * Author: Pavan Savoy * * 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 diff --git a/drivers/staging/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c similarity index 99% rename from drivers/staging/ti-st/st_kim.c rename to drivers/misc/ti-st/st_kim.c index 372a9960c304..6d23a7222627 100644 --- a/drivers/staging/ti-st/st_kim.c +++ b/drivers/misc/ti-st/st_kim.c @@ -2,7 +2,8 @@ * Shared Transport Line discipline driver Core * Init Manager module responsible for GPIO control * and firmware download - * Copyright (C) 2009 Texas Instruments + * Copyright (C) 2009-2010 Texas Instruments + * Author: Pavan Savoy * * 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 diff --git a/drivers/staging/ti-st/st_ll.c b/drivers/misc/ti-st/st_ll.c similarity index 97% rename from drivers/staging/ti-st/st_ll.c rename to drivers/misc/ti-st/st_ll.c index ed1e4bc180d3..2bda8dea15b0 100644 --- a/drivers/staging/ti-st/st_ll.c +++ b/drivers/misc/ti-st/st_ll.c @@ -1,7 +1,8 @@ /* * Shared Transport driver * HCI-LL module responsible for TI proprietary HCI_LL protocol - * Copyright (C) 2009 Texas Instruments + * Copyright (C) 2009-2010 Texas Instruments + * Author: Pavan Savoy * * 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 diff --git a/drivers/staging/ti-st/Kconfig b/drivers/staging/ti-st/Kconfig index 858062dbed76..074b8e89e913 100644 --- a/drivers/staging/ti-st/Kconfig +++ b/drivers/staging/ti-st/Kconfig @@ -3,17 +3,6 @@ # drivers (BT, FM and GPS) # menu "Texas Instruments shared transport line discipline" -config TI_ST - tristate "Shared transport core driver" - depends on RFKILL - select FW_LOADER - help - This enables the shared transport core driver for TI - BT / FM and GPS combo chips. This enables protocol drivers - to register themselves with core and send data, the responses - are returned to relevant protocol drivers based on their - packet types. - config ST_BT tristate "BlueZ bluetooth driver for ST" depends on BT && RFKILL diff --git a/drivers/staging/ti-st/Makefile b/drivers/staging/ti-st/Makefile index 0167d1d2c255..5f11b82c016c 100644 --- a/drivers/staging/ti-st/Makefile +++ b/drivers/staging/ti-st/Makefile @@ -2,6 +2,4 @@ # Makefile for TI's shared transport line discipline # and its protocol drivers (BT, FM, GPS) # -obj-$(CONFIG_TI_ST) += st_drv.o -st_drv-objs := st_core.o st_kim.o st_ll.o obj-$(CONFIG_ST_BT) += bt_drv.o