Skip to contentSkip to conversation

prepare TI_ST to move out of staging

PATCH In review [email protected] 2 participants 10 messages Sep 30, 2010 – Oct 5, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover prepare TI_ST to move out of staging

From: Pavan Savoy <[email protected]>

Greg,

As suggested, the patch has been modified to set of 3 patches.
1. to add the new line discipline number to tty.h
2. rm the __KERNEL__ since the header is no more required for user-space
3. mv the header file to include/linux/

Please review.

Pavan Savoy (3):
include:linux: tty.h: new ldisc for TI WiLink ST drivers:staging:ti-st: drop the __KERNEL__ drivers:staging:ti-st: mv ti_wilink_st header

 drivers/staging/ti-st/bt_drv.c       |    2 +-
 drivers/staging/ti-st/st_core.c      |    2 +-
 drivers/staging/ti-st/st_kim.c       |    2 +-
 drivers/staging/ti-st/st_ll.c        |    2 +-
 drivers/staging/ti-st/ti_wilink_st.h |  409 ----------------------------------
 include/linux/ti_wilink_st.h         |  402 +++++++++++++++++++++++++++++++++
 include/linux/tty.h                  |    1 +
 7 files changed, 407 insertions(+), 413 deletions(-)
 delete mode 100644 drivers/staging/ti-st/ti_wilink_st.h
 create mode 100644 include/linux/ti_wilink_st.h
#1 lore raw

PATCH 1/3 include:linux: tty.h: new ldisc for TI WiLink ST

From: Pavan Savoy <[email protected]>

Texas Instrument's WiLink7 connectivity devices pack wireless connectivity technologies like Bluetooth, FM Radio Receiver and Transmitter, GPS and WLAN into a single die.
The BT, FM and GPS core on the chip are interfaced to application processors via a single UART.

This line discipline driver allows such different technologies to be used simultaneous and independent of each other.

---
 drivers/staging/ti-st/ti_wilink_st.h |    5 -----
 include/linux/tty.h                  |    1 +
 2 files changed, 1 insertions(+), 5 deletions(-)
drivers/staging/ti-st/ti_wilink_st.h +0 -5
index 537efce..afb0cc6 100644
@@ -25,11 +25,6 @@
 #ifndef TI_WILINK_ST_H
 #define TI_WILINK_ST_H
 
-/* TODO:
- * Move the following to tty.h upon acceptance
- */
-#define N_TI_WL	22	/* Ldisc for TI's WL BT, FM, GPS combo chips */
-
 #ifdef __KERNEL__
 /**
  * enum kim_gpio_state - Few protocols such as FM have ACTIVE LOW
include/linux/tty.h +1 -0
index 86be0cd..e500171 100644
@@ -50,6 +50,7 @@
 #define N_V253		19	/* Codec control over voice modem */
 #define N_CAIF		20      /* CAIF protocol for talking to modems */
 #define N_GSM0710	21	/* GSM 0710 Mux */
+#define N_TI_WL	22	/* for TI's WL BT, FM, GPS combo chips */
 
 /*
  * This character is the same as _POSIX_VDISABLE: it cannot be used as
Signature · 1 line
1.6.5
#2 lore raw

PATCH 2/3 drivers:staging:ti-st: drop the __KERNEL__

From: Pavan Savoy <[email protected]>

ti_wilink_st.h had the line discipline number which the user-space daemon refers to, to install and un-install the line discipline upon request from the shared transport driver via rfkill device.

On moving this line discipline number to standard location of tty.h drop the __KERNEL__ flag in the header, since the header file would no longer be used by user-space.

---
 drivers/staging/ti-st/ti_wilink_st.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/staging/ti-st/ti_wilink_st.h +0 -2
index afb0cc6..2a5acf5 100644
@@ -25,7 +25,6 @@
 #ifndef TI_WILINK_ST_H
 #define TI_WILINK_ST_H
 
-#ifdef __KERNEL__
 /**
  * enum kim_gpio_state - Few protocols such as FM have ACTIVE LOW
  *	gpio states for their chip/core enable gpios
@@ -400,5 +399,4 @@ struct gps_event_hdr {
 	u16 plen;
 } __attribute__ ((packed));
 
-#endif /* __KERNEL__ */
 #endif /* TI_WILINK_ST_H */
Signature · 1 line
1.6.5
#3 lore raw

PATCH 3/3 drivers:staging:ti-st: mv ti_wilink_st header

From: Pavan Savoy <[email protected]>

Move the header to a standard linux device driver location. This should pave the way for other drivers to be moved into the relevant directories.

ti_wilink_st.h is a common header file used by the TI's shared transport device driver for WiLink chipsets. Each individual protocol drivers like bluetooth driver, FM V4L2 driver and GPS drivers will make use of this header.

---
 drivers/staging/ti-st/bt_drv.c       |    2 +-
 drivers/staging/ti-st/st_core.c      |    2 +-
 drivers/staging/ti-st/st_kim.c       |    2 +-
 drivers/staging/ti-st/st_ll.c        |    2 +-
 drivers/staging/ti-st/ti_wilink_st.h |  402 ----------------------------------
 include/linux/ti_wilink_st.h         |  402 ++++++++++++++++++++++++++++++++++
 6 files changed, 406 insertions(+), 406 deletions(-)
 delete mode 100644 drivers/staging/ti-st/ti_wilink_st.h
 create mode 100644 include/linux/ti_wilink_st.h
drivers/staging/ti-st/bt_drv.c +1 -1
index 50da66d..75065bf 100644
@@ -24,7 +24,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
-#include "ti_wilink_st.h"
+#include <linux/ti_wilink_st.h>
 #include "bt_drv.h"
 
 /* Define this macro to get debug msg */
drivers/staging/ti-st/st_core.c +1 -1
index 03397be..5bef61e 100644
@@ -28,7 +28,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/hci.h>
-#include "ti_wilink_st.h"
+#include <linux/ti_wilink_st.h>
 
 /* strings to be used for rfkill entries and by
  * ST Core to be used for sysfs debug entry
drivers/staging/ti-st/st_kim.c +1 -1
index 09e2c97..372a996 100644
@@ -36,7 +36,7 @@
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/hci.h>
 
-#include "ti_wilink_st.h"
+#include <linux/ti_wilink_st.h>
 
 
 static int kim_probe(struct platform_device *pdev);
drivers/staging/ti-st/st_ll.c +1 -1
index d08b58e..ed1e4bc 100644
@@ -21,7 +21,7 @@
 #define pr_fmt(fmt) "(stll) :" fmt
 #include <linux/skbuff.h>
 #include <linux/module.h>
-#include "ti_wilink_st.h"
+#include <linux/ti_wilink_st.h>
 
 /**********************************************************************/
 /* internal functions */
drivers/staging/ti-st/ti_wilink_st.h deleted +0 -402

402 lines not on this page · raw message

include/linux/ti_wilink_st.h new file +402 -0

402 lines not on this page · raw message

Signature · 1 line
1.6.5
#4 lore raw
In reply to [email protected]

Greg,

Quoted 8 lines

-----Original Message-----
From: Savoy, Pavan
Sent: Thursday, September 30, 2010 3:13 PM
To: [email protected]; [email protected]
Cc: [email protected]; [email protected]; Savoy, Pavan
Subject: [PATCH 0/3] prepare TI_ST to move out of staging

From: Pavan Savoy <[email protected]>

I hope you can get some time to review this week.

Quoted 25 lines

Greg,

As suggested, the patch has been modified to set of 3 patches.
1. to add the new line discipline number to tty.h
2. rm the __KERNEL__ since the header is no more required for user-space
3. mv the header file to include/linux/

Please review.

Pavan Savoy (3):
include:linux: tty.h: new ldisc for TI WiLink ST drivers:staging:ti-st: drop the __KERNEL__ drivers:staging:ti-st: mv ti_wilink_st header

 drivers/staging/ti-st/bt_drv.c       |    2 +-
 drivers/staging/ti-st/st_core.c      |    2 +-
 drivers/staging/ti-st/st_kim.c       |    2 +-
 drivers/staging/ti-st/st_ll.c        |    2 +-
 drivers/staging/ti-st/ti_wilink_st.h |  409 ---------------------------------
-
 include/linux/ti_wilink_st.h         |  402 +++++++++++++++++++++++++++++++++
 include/linux/tty.h                  |    1 +
 7 files changed, 407 insertions(+), 413 deletions(-)
 delete mode 100644 drivers/staging/ti-st/ti_wilink_st.h
 create mode 100644 include/linux/ti_wilink_st.h
#5 lore raw
In reply to [email protected]
Quoted 10 lines · On Thu, Sep 30, 2010 at 04:13:27PM -0400, [email protected] wrote:

From: Pavan Savoy <[email protected]>

Greg,

As suggested, the patch has been modified to set of 3 patches.
1. to add the new line discipline number to tty.h
2. rm the __KERNEL__ since the header is no more required for user-space
3. mv the header file to include/linux/

Please review.

Looks good, all queued up now.

So, on to moving the drivers out of the staging tree, right? Care to send me patches for them? Have you gotten the bluetooth driver reviewed yet?

thanks,

greg k-h

#6 lore raw

Greg,

Quoted 18 lines

-----Original Message-----
From: Greg KH [mailto:[email protected]]
Sent: Tuesday, October 05, 2010 1:49 PM
To: Savoy, Pavan
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 0/3] prepare TI_ST to move out of staging

Quoted 9 lines · On Thu, Sep 30, 2010 at 04:13:27PM -0400, [email protected] wrote:

From: Pavan Savoy <[email protected]>

Greg,

As suggested, the patch has been modified to set of 3 patches.
1. to add the new line discipline number to tty.h
2. rm the __KERNEL__ since the header is no more required for user-space
3. mv the header file to include/linux/

Quoted 7 lines
Quoted 1 line

Please review.

Looks good, all queued up now.

So, on to moving the drivers out of the staging tree, right? Care to send me patches for them? Have you gotten the bluetooth driver reviewed yet?

No not yet.
I had planned to put up a patch to move the st_core.c, st_kim.c and st_ll.c to drivers/misc/ first. Then put together Bluetooth header and driver where in I will bring in Marcel/Johan & linux-bluetooth into the loop. Then move the unified bt_drv.c to something like ti_st_bt.c to drivers/bluetooth/

Does this sound OK?
Marcel pretty much knows about the driver since I first posted the patch to linux-bluetooth too.

Quoted 3 lines

thanks,

greg k-h

#7 lore raw
Quoted 7 lines · Pavan
Quoted 3 lines

So, on to moving the drivers out of the staging tree, right? Care to send me patches for them? Have you gotten the bluetooth driver reviewed yet?

No not yet.
I had planned to put up a patch to move the st_core.c, st_kim.c and st_ll.c to drivers/misc/ first.

That is fine.

Quoted 5 lines

Then put together Bluetooth header and driver where in I will bring in Marcel/Johan & linux-bluetooth into the loop. Then move the unified bt_drv.c to something like ti_st_bt.c to drivers/bluetooth/

Does this sound OK?

Yes it does. Feel free to send patches for the first part above on if you want to.

thanks,

greg k-h

#8 lore raw
In reply to Greg KH

Greg,

Quoted 45 lines

-----Original Message-----
From: Savoy, Pavan
Sent: Tuesday, October 05, 2010 1:58 PM
To: 'Greg KH'
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: RE: [PATCH 0/3] prepare TI_ST to move out of staging

Greg,

Quoted 18 lines

-----Original Message-----
From: Greg KH [mailto:[email protected]]
Sent: Tuesday, October 05, 2010 1:49 PM
To: Savoy, Pavan
Cc: [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 0/3] prepare TI_ST to move out of staging

Quoted 9 lines · On Thu, Sep 30, 2010 at 04:13:27PM -0400, [email protected] wrote:

From: Pavan Savoy <[email protected]>

Greg,

As suggested, the patch has been modified to set of 3 patches.
1. to add the new line discipline number to tty.h
2. rm the __KERNEL__ since the header is no more required for user-space
3. mv the header file to include/linux/

Quoted 7 lines
Quoted 1 line

Please review.

Looks good, all queued up now.

So, on to moving the drivers out of the staging tree, right? Care to send me patches for them? Have you gotten the bluetooth driver reviewed yet?

No not yet.
I had planned to put up a patch to move the st_core.c, st_kim.c and st_ll.c to drivers/misc/ first.
Then put together Bluetooth header and driver where in I will bring in Marcel/Johan & linux-bluetooth into the loop.
Then move the unified bt_drv.c to something like ti_st_bt.c to drivers/bluetooth/

Quoted 3 lines

Does this sound OK?
Marcel pretty much knows about the driver since I first posted the patch to linux-bluetooth too.

Along with Bluetooth, we have some FM V4L2 patches which are being reviewed and re-submitted to the linux-media list, we will bring in them, once the linux-media ACKs them.

They are intended for staging too, since there are few conflicts with other patches posted, I suppose it should be alright for them to go into the linux-next via your staging-next since the linux-media trees lags behind linux-next.

Quoted 3 lines

thanks,

Quoted 2 lines

greg k-h

#9 lore raw
Quoted 8 lines · Pavan

Along with Bluetooth, we have some FM V4L2 patches which are being reviewed and re-submitted to the linux-media list, we will bring in them, once the linux-media ACKs them.

They are intended for staging too, since there are few conflicts with other patches posted, I suppose it should be alright for them to go into the linux-next via your staging-next since the linux-media trees lags behind linux-next.

If you get an ack from the media maintainers, I can gladly take them.

thanks,

greg k-h