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>

diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
index 270e81c087e925cdc968238d3a2f8d9daee59519..a0418f23b4aae298f44a87aa90744b0a82432858 100644 (file)
--- 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 27aa1212919075bc94285e3c2899dcf82ccd6845..1fb8b6668b1ba0f6dabd171ac226d64879db5d6a 100644 (file)
--- 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 (file)
index 0000000..b827152
--- /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 (file)
index 0000000..4c19ead
--- /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
similarity index 100%
rename from drivers/usb/typec/tps6598x.c
rename to drivers/usb/typec/tipd/tps6598x.c

diff --git a/drivers/usb/typec/tps6598x.h b/drivers/usb/typec/tipd/tps6598x.h
similarity index 100%
rename from drivers/usb/typec/tps6598x.h
rename to drivers/usb/typec/tipd/tps6598x.h

diff --git a/drivers/usb/typec/tps6598x_trace.h b/drivers/usb/typec/tipd/tps6598x_trace.h
similarity index 100%
rename from drivers/usb/typec/tps6598x_trace.h
rename to drivers/usb/typec/tipd/tps6598x_trace.h