diff options
| author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2021-03-10 13:46:29 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-12 15:32:20 +0100 |
| commit | 2786d8618a92f4108092b5f20044b06fca83f389 (patch) | |
| tree | 1286975edbb6a81f5d13542fc51d3df7b1d9196a | |
| parent | 3adab6a1691a69c5e86bf10a9217d7dc6d02eb01 (diff) | |
| download | linux-stable-2786d8618a92f4108092b5f20044b06fca83f389.tar.gz linux-stable-2786d8618a92f4108092b5f20044b06fca83f389.tar.bz2 linux-stable-2786d8618a92f4108092b5f20044b06fca83f389.zip | |
usb: typec: tps6598x: Move the driver under its own subdirectory
The driver consist of multiple files. Grouping all of them
under a separate directory drivers/usb/typec/tipd/.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20210310104630.77945-3-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/typec/Kconfig | 15 | ||||
| -rw-r--r-- | drivers/usb/typec/Makefile | 5 | ||||
| -rw-r--r-- | drivers/usb/typec/tipd/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/usb/typec/tipd/Makefile | 4 | ||||
| -rw-r--r-- | drivers/usb/typec/tipd/tps6598x.c (renamed from drivers/usb/typec/tps6598x.c) | 0 | ||||
| -rw-r--r-- | drivers/usb/typec/tipd/tps6598x.h (renamed from drivers/usb/typec/tps6598x.h) | 0 | ||||
| -rw-r--r-- | drivers/usb/typec/tipd/tps6598x_trace.h (renamed from drivers/usb/typec/tps6598x_trace.h) | 0 |
7 files changed, 19 insertions, 17 deletions
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig index 270e81c087e9..a0418f23b4aa 100644 --- a/drivers/usb/typec/Kconfig +++ b/drivers/usb/typec/Kconfig @@ -50,6 +50,8 @@ source "drivers/usb/typec/tcpm/Kconfig" source "drivers/usb/typec/ucsi/Kconfig" +source "drivers/usb/typec/tipd/Kconfig" + config TYPEC_HD3SS3220 tristate "TI HD3SS3220 Type-C DRP Port controller driver" depends on I2C @@ -61,19 +63,6 @@ config TYPEC_HD3SS3220 If you choose to build this driver as a dynamically linked module, the module will be called hd3ss3220.ko. -config TYPEC_TPS6598X - tristate "TI TPS6598x USB Power Delivery controller driver" - depends on I2C - select POWER_SUPPLY - select REGMAP_I2C - select USB_ROLE_SWITCH - help - Say Y or M here if your system has TI TPS65982 or TPS65983 USB Power - Delivery controller. - - If you choose to build this driver as a dynamically linked module, the - module will be called tps6598x.ko. - config TYPEC_STUSB160X tristate "STMicroelectronics STUSB160x Type-C controller driver" depends on I2C diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile index 27aa12129190..1fb8b6668b1b 100644 --- a/drivers/usb/typec/Makefile +++ b/drivers/usb/typec/Makefile @@ -1,14 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -# define_trace.h needs to know how to find our header -CFLAGS_tps6598x.o := -I$(src) - obj-$(CONFIG_TYPEC) += typec.o typec-y := class.o mux.o bus.o obj-$(CONFIG_TYPEC) += altmodes/ obj-$(CONFIG_TYPEC_TCPM) += tcpm/ obj-$(CONFIG_TYPEC_UCSI) += ucsi/ +obj-$(CONFIG_TYPEC_TPS6598X) += tipd/ obj-$(CONFIG_TYPEC_HD3SS3220) += hd3ss3220.o -obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o obj-$(CONFIG_TYPEC_QCOM_PMIC) += qcom-pmic-typec.o obj-$(CONFIG_TYPEC_STUSB160X) += stusb160x.o obj-$(CONFIG_TYPEC) += mux/ diff --git a/drivers/usb/typec/tipd/Kconfig b/drivers/usb/typec/tipd/Kconfig new file mode 100644 index 000000000000..b82715293072 --- /dev/null +++ b/drivers/usb/typec/tipd/Kconfig @@ -0,0 +1,12 @@ +config TYPEC_TPS6598X + tristate "TI TPS6598x USB Power Delivery controller driver" + depends on I2C + select POWER_SUPPLY + select REGMAP_I2C + select USB_ROLE_SWITCH + help + Say Y or M here if your system has TI TPS65982 or TPS65983 USB Power + Delivery controller. + + If you choose to build this driver as a dynamically linked module, the + module will be called tps6598x.ko. diff --git a/drivers/usb/typec/tipd/Makefile b/drivers/usb/typec/tipd/Makefile new file mode 100644 index 000000000000..4c19eadb5f46 --- /dev/null +++ b/drivers/usb/typec/tipd/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +CFLAGS_tps6598x.o := -I$(src) + +obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o diff --git a/drivers/usb/typec/tps6598x.c b/drivers/usb/typec/tipd/tps6598x.c index 2c4ab90e16e7..2c4ab90e16e7 100644 --- a/drivers/usb/typec/tps6598x.c +++ b/drivers/usb/typec/tipd/tps6598x.c diff --git a/drivers/usb/typec/tps6598x.h b/drivers/usb/typec/tipd/tps6598x.h index 003a577be216..003a577be216 100644 --- a/drivers/usb/typec/tps6598x.h +++ b/drivers/usb/typec/tipd/tps6598x.h diff --git a/drivers/usb/typec/tps6598x_trace.h b/drivers/usb/typec/tipd/tps6598x_trace.h index 21917751d61e..21917751d61e 100644 --- a/drivers/usb/typec/tps6598x_trace.h +++ b/drivers/usb/typec/tipd/tps6598x_trace.h |