| Message ID | 1525307094-27402-15-git-send-email-jun.li@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Li Jun,
This patch takes away building the entire staging/typec tree but this is still
not empty after your patch, another driver "tcpci_rt1711h" is there.
Better just remove tcpci from staging/typec/{Kconfig,Makefile}
// Mats
On 2018-05-03 02:24, Li Jun wrote:
> Move TCPCI(Typec port controller interface) driver out of staging.
>
> Signed-off-by: Li Jun <jun.li@nxp.com>
> ---
> drivers/staging/Kconfig | 2 --
> drivers/staging/Makefile | 1 -
> drivers/staging/typec/TODO | 5 -----
> drivers/usb/typec/Kconfig | 7 +++++++
> drivers/usb/typec/Makefile | 1 +
> drivers/{staging => usb}/typec/tcpci.c | 0
> drivers/{staging => usb}/typec/tcpci.h | 0
> 7 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
> index d5926f0..d83ff66 100644
> --- a/drivers/staging/Kconfig
> +++ b/drivers/staging/Kconfig
> @@ -112,8 +112,6 @@ source "drivers/staging/greybus/Kconfig"
>
> source "drivers/staging/vc04_services/Kconfig"
>
> -source "drivers/staging/typec/Kconfig"
> -
> source "drivers/staging/vboxvideo/Kconfig"
>
> source "drivers/staging/pi433/Kconfig"
> diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
> index 919753c..a71ec1f 100644
> --- a/drivers/staging/Makefile
> +++ b/drivers/staging/Makefile
> @@ -2,7 +2,6 @@
> # Makefile for staging directory
>
> obj-y += media/
> -obj-y += typec/
> obj-$(CONFIG_IPX) += ipx/
> obj-$(CONFIG_NCP_FS) += ncpfs/
> obj-$(CONFIG_PRISM2_USB) += wlan-ng/
> diff --git a/drivers/staging/typec/TODO b/drivers/staging/typec/TODO
> deleted file mode 100644
> index 53fe2f7..0000000
> --- a/drivers/staging/typec/TODO
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -tcpci:
> -- Test with real hardware
> -
> -Please send patches to Guenter Roeck <linux@roeck-us.net> and copy
> -Heikki Krogerus <heikki.krogerus@linux.intel.com>.
> diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
> index 2c8eab1..0a862fc 100644
> --- a/drivers/usb/typec/Kconfig
> +++ b/drivers/usb/typec/Kconfig
> @@ -56,6 +56,13 @@ config TYPEC_TCPM
>
> if TYPEC_TCPM
>
> +config TYPEC_TCPCI
> + tristate "Type-C Port Controller Interface driver"
> + depends on I2C
> + select REGMAP_I2C
> + help
> + Type-C Port Controller driver for TCPCI-compliant controller.
> +
> source "drivers/usb/typec/fusb302/Kconfig"
>
> config TYPEC_WCOVE
> diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
> index 1f599a6..02758a1 100644
> --- a/drivers/usb/typec/Makefile
> +++ b/drivers/usb/typec/Makefile
> @@ -7,3 +7,4 @@ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o
> obj-$(CONFIG_TYPEC_UCSI) += ucsi/
> obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o
> obj-$(CONFIG_TYPEC) += mux/
> +obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o
> diff --git a/drivers/staging/typec/tcpci.c b/drivers/usb/typec/tcpci.c
> similarity index 100%
> rename from drivers/staging/typec/tcpci.c
> rename to drivers/usb/typec/tcpci.c
> diff --git a/drivers/staging/typec/tcpci.h b/drivers/usb/typec/tcpci.h
> similarity index 100%
> rename from drivers/staging/typec/tcpci.h
> rename to drivers/usb/typec/tcpci.h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi > -----Original Message----- > From: Mats Karrman [mailto:mats.dev.list@gmail.com] > Sent: 2018年5月12日 5:37 > To: Jun Li <jun.li@nxp.com>; robh+dt@kernel.org; gregkh@linuxfoundation.org; > heikki.krogerus@linux.intel.com; linux@roeck-us.net > Cc: a.hajda@samsung.com; cw00.choi@samsung.com; > shufan_lee@richtek.com; Peter Chen <peter.chen@nxp.com>; > gsomlo@gmail.com; devicetree@vger.kernel.org; linux-usb@vger.kernel.org; > dl-linux-imx <linux-imx@nxp.com> > Subject: Re: [PATCH v5 14/14] staging: typec: tcpci: move tcpci driver out of > staging > > Hi Li Jun, > > This patch takes away building the entire staging/typec tree but this is still not > empty after your patch, another driver "tcpci_rt1711h" is there. > Better just remove tcpci from staging/typec/{Kconfig,Makefile} Oh, yes, I should also move out tcpci_rt1711h driver, will update in next version. Thanks Li Jun > > // Mats > > On 2018-05-03 02:24, Li Jun wrote: > > > Move TCPCI(Typec port controller interface) driver out of staging. > > > > Signed-off-by: Li Jun <jun.li@nxp.com> > > --- > > drivers/staging/Kconfig | 2 -- > > drivers/staging/Makefile | 1 - > > drivers/staging/typec/TODO | 5 ----- > > drivers/usb/typec/Kconfig | 7 +++++++ > > drivers/usb/typec/Makefile | 1 + > > drivers/{staging => usb}/typec/tcpci.c | 0 > > drivers/{staging => usb}/typec/tcpci.h | 0 > > 7 files changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index > > d5926f0..d83ff66 100644 > > --- a/drivers/staging/Kconfig > > +++ b/drivers/staging/Kconfig > > @@ -112,8 +112,6 @@ source "drivers/staging/greybus/Kconfig" > > > > source "drivers/staging/vc04_services/Kconfig" > > > > -source "drivers/staging/typec/Kconfig" > > - > > source "drivers/staging/vboxvideo/Kconfig" > > > > source "drivers/staging/pi433/Kconfig" > > diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index > > 919753c..a71ec1f 100644 > > --- a/drivers/staging/Makefile > > +++ b/drivers/staging/Makefile > > @@ -2,7 +2,6 @@ > > # Makefile for staging directory > > > > obj-y += media/ > > -obj-y += typec/ > > obj-$(CONFIG_IPX) += ipx/ > > obj-$(CONFIG_NCP_FS) += ncpfs/ > > obj-$(CONFIG_PRISM2_USB) += wlan-ng/ > > diff --git a/drivers/staging/typec/TODO b/drivers/staging/typec/TODO > > deleted file mode 100644 index 53fe2f7..0000000 > > --- a/drivers/staging/typec/TODO > > +++ /dev/null > > @@ -1,5 +0,0 @@ > > -tcpci: > > -- Test with real hardware > > - > > -Please send patches to Guenter Roeck <linux@roeck-us.net> and copy > > -Heikki Krogerus <heikki.krogerus@linux.intel.com>. > > diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig > > index 2c8eab1..0a862fc 100644 > > --- a/drivers/usb/typec/Kconfig > > +++ b/drivers/usb/typec/Kconfig > > @@ -56,6 +56,13 @@ config TYPEC_TCPM > > > > if TYPEC_TCPM > > > > +config TYPEC_TCPCI > > + tristate "Type-C Port Controller Interface driver" > > + depends on I2C > > + select REGMAP_I2C > > + help > > + Type-C Port Controller driver for TCPCI-compliant controller. > > + > > source "drivers/usb/typec/fusb302/Kconfig" > > > > config TYPEC_WCOVE > > diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile > > index 1f599a6..02758a1 100644 > > --- a/drivers/usb/typec/Makefile > > +++ b/drivers/usb/typec/Makefile > > @@ -7,3 +7,4 @@ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o > > obj-$(CONFIG_TYPEC_UCSI) += ucsi/ > > obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o > > obj-$(CONFIG_TYPEC) += mux/ > > +obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o > > diff --git a/drivers/staging/typec/tcpci.c b/drivers/usb/typec/tcpci.c > > similarity index 100% rename from drivers/staging/typec/tcpci.c rename > > to drivers/usb/typec/tcpci.c diff --git > > a/drivers/staging/typec/tcpci.h b/drivers/usb/typec/tcpci.h similarity > > index 100% rename from drivers/staging/typec/tcpci.h rename to > > drivers/usb/typec/tcpci.h
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index d5926f0..d83ff66 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -112,8 +112,6 @@ source "drivers/staging/greybus/Kconfig" source "drivers/staging/vc04_services/Kconfig" -source "drivers/staging/typec/Kconfig" - source "drivers/staging/vboxvideo/Kconfig" source "drivers/staging/pi433/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index 919753c..a71ec1f 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -2,7 +2,6 @@ # Makefile for staging directory obj-y += media/ -obj-y += typec/ obj-$(CONFIG_IPX) += ipx/ obj-$(CONFIG_NCP_FS) += ncpfs/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ diff --git a/drivers/staging/typec/TODO b/drivers/staging/typec/TODO deleted file mode 100644 index 53fe2f7..0000000 --- a/drivers/staging/typec/TODO +++ /dev/null @@ -1,5 +0,0 @@ -tcpci: -- Test with real hardware - -Please send patches to Guenter Roeck <linux@roeck-us.net> and copy -Heikki Krogerus <heikki.krogerus@linux.intel.com>. diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig index 2c8eab1..0a862fc 100644 --- a/drivers/usb/typec/Kconfig +++ b/drivers/usb/typec/Kconfig @@ -56,6 +56,13 @@ config TYPEC_TCPM if TYPEC_TCPM +config TYPEC_TCPCI + tristate "Type-C Port Controller Interface driver" + depends on I2C + select REGMAP_I2C + help + Type-C Port Controller driver for TCPCI-compliant controller. + source "drivers/usb/typec/fusb302/Kconfig" config TYPEC_WCOVE diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile index 1f599a6..02758a1 100644 --- a/drivers/usb/typec/Makefile +++ b/drivers/usb/typec/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o obj-$(CONFIG_TYPEC_UCSI) += ucsi/ obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o obj-$(CONFIG_TYPEC) += mux/ +obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o diff --git a/drivers/staging/typec/tcpci.c b/drivers/usb/typec/tcpci.c similarity index 100% rename from drivers/staging/typec/tcpci.c rename to drivers/usb/typec/tcpci.c diff --git a/drivers/staging/typec/tcpci.h b/drivers/usb/typec/tcpci.h similarity index 100% rename from drivers/staging/typec/tcpci.h rename to drivers/usb/typec/tcpci.h
Move TCPCI(Typec port controller interface) driver out of staging. Signed-off-by: Li Jun <jun.li@nxp.com> --- drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - drivers/staging/typec/TODO | 5 ----- drivers/usb/typec/Kconfig | 7 +++++++ drivers/usb/typec/Makefile | 1 + drivers/{staging => usb}/typec/tcpci.c | 0 drivers/{staging => usb}/typec/tcpci.h | 0 7 files changed, 8 insertions(+), 8 deletions(-)