Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-01-14 11:58:00 +0100
committerPetr Tesarik <ptesarik@suse.cz>2019-01-14 11:58:00 +0100
commit263b3bdfe12d218e0da16cdb06cd269f0a6b0473 (patch)
tree4a56f20b889ec2a302a0b76bb3779cdeb991c929
parentacec0aaa4841264f0442ddc2b6cd52e41d12396c (diff)
parent9c75bd86bfbc4bb47d092be82975766ae76a37e6 (diff)
Merge branch 'SLE15-SP1' into openSUSE-15.1
-rw-r--r--patches.drivers/0001-usb-typec-Group-all-TCPCI-TCPM-code-together.patch31
1 files changed, 2 insertions, 29 deletions
diff --git a/patches.drivers/0001-usb-typec-Group-all-TCPCI-TCPM-code-together.patch b/patches.drivers/0001-usb-typec-Group-all-TCPCI-TCPM-code-together.patch
index 2e84efae49..80c1238935 100644
--- a/patches.drivers/0001-usb-typec-Group-all-TCPCI-TCPM-code-together.patch
+++ b/patches.drivers/0001-usb-typec-Group-all-TCPCI-TCPM-code-together.patch
@@ -15,20 +15,6 @@ Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Oliver Neukum <oneukum@suse.com>
---
- MAINTAINERS | 6 +++
- drivers/usb/typec/Kconfig | 45 +-------------------
- drivers/usb/typec/Makefile | 6 +--
- drivers/usb/typec/fusb302/Kconfig | 7 ---
- drivers/usb/typec/fusb302/Makefile | 2 -
- drivers/usb/typec/tcpm/Kconfig | 52 +++++++++++++++++++++++
- drivers/usb/typec/tcpm/Makefile | 7 +++
- drivers/usb/typec/{fusb302 => tcpm}/fusb302.c | 0
- drivers/usb/typec/{fusb302 => tcpm}/fusb302_reg.h | 0
- drivers/usb/typec/{ => tcpm}/tcpci.c | 0
- drivers/usb/typec/{ => tcpm}/tcpci.h | 0
- drivers/usb/typec/{ => tcpm}/tcpci_rt1711h.c | 0
- drivers/usb/typec/{ => tcpm}/tcpm.c | 0
- drivers/usb/typec/{typec_wcove.c => tcpm/wcove.c} | 0
MAINTAINERS | 6
drivers/usb/typec/Makefile | 3
drivers/usb/typec/tcpci.c | 605 ----
@@ -44,12 +30,8 @@ Signed-off-by: Oliver Neukum <oneukum@suse.com>
drivers/usb/typec/tcpm/wcove.c | 377 ++
drivers/usb/typec/typec_wcove.c | 377 --
14 files changed, 6033 insertions(+), 5969 deletions(-)
- delete mode 100644 drivers/usb/typec/fusb302/Kconfig
- delete mode 100644 drivers/usb/typec/fusb302/Makefile
create mode 100644 drivers/usb/typec/tcpm/Kconfig
create mode 100644 drivers/usb/typec/tcpm/Makefile
- rename drivers/usb/typec/{fusb302 => tcpm}/fusb302.c (100%)
- rename drivers/usb/typec/{fusb302 => tcpm}/fusb302_reg.h (100%)
rename drivers/usb/typec/{ => tcpm}/tcpci.c (100%)
rename drivers/usb/typec/{ => tcpm}/tcpci.h (100%)
rename drivers/usb/typec/{ => tcpm}/tcpci_rt1711h.c (100%)
@@ -5686,7 +5668,7 @@ Signed-off-by: Oliver Neukum <oneukum@suse.com>
-MODULE_LICENSE("GPL");
--- /dev/null
+++ b/drivers/usb/typec/tcpm/Kconfig
-@@ -0,0 +1,52 @@
+@@ -0,0 +1,44 @@
+config TYPEC_TCPM
+ tristate "USB Type-C Port Controller Manager"
+ depends on USB
@@ -5716,14 +5698,6 @@ Signed-off-by: Oliver Neukum <oneukum@suse.com>
+
+endif # TYPEC_TCPCI
+
-+config TYPEC_FUSB302
-+ tristate "Fairchild FUSB302 Type-C chip driver"
-+ depends on I2C
-+ help
-+ The Fairchild FUSB302 Type-C chip driver that works with
-+ Type-C Port Controller Manager to provide USB PD and USB
-+ Type-C functionalities.
-+
+config TYPEC_WCOVE
+ tristate "Intel WhiskeyCove PMIC USB Type-C PHY driver"
+ depends on ACPI
@@ -5741,10 +5715,9 @@ Signed-off-by: Oliver Neukum <oneukum@suse.com>
+endif # TYPEC_TCPM
--- /dev/null
+++ b/drivers/usb/typec/tcpm/Makefile
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_TYPEC_TCPM) += tcpm.o
-+obj-$(CONFIG_TYPEC_FUSB302) += fusb302.o
+obj-$(CONFIG_TYPEC_WCOVE) += typec_wcove.o
+typec_wcove-y := wcove.o
+obj-$(CONFIG_TYPEC_TCPCI) += tcpci.o