diff options
| author | Ulises Mendez Martinez <umendez@google.com> | 2023-11-30 11:38:19 +0000 |
|---|---|---|
| committer | Ulises Mendez Martinez <umendez@google.com> | 2023-11-30 15:07:14 +0000 |
| commit | 367f5a3355a8b2ac126f45d15ca5d3d067e0f568 (patch) | |
| tree | 3de16d8a5985d96fd51f933c37d6343c0f2dbf26 | |
| parent | df02a4631e700272ac1bb4baf99af3658555e175 (diff) | |
| download | raviole-device-android13-gs-raviole-5.15.tar.gz | |
Fix include of tcpci.h headerandroid13-gs-raviole-5.15
This header file was recently moved, this change fixes the inclusion to
the new path.
This also reverts a change in Kbuild which included the previous
location of the header.
Fixes: b89f346590d1 ("usb: typec: update include of tcpci.h")
Fixes: 403b2e940910 ("usb: typec: tcpci: move tcpci.h to include/linux/usb/")
Bug: 313899839
Change-Id: If030f4b9862169412b19b913c9c64eab3fc611cb
Signed-off-by: Ulises Mendez Martinez <umendez@google.com>
| -rw-r--r-- | drivers/usb/typec/tcpm/google/Kbuild | 2 | ||||
| -rw-r--r-- | drivers/usb/typec/tcpm/google/bc_max77759.c | 3 | ||||
| -rw-r--r-- | drivers/usb/typec/tcpm/google/max77759_contaminant.c | 3 | ||||
| -rw-r--r-- | drivers/usb/typec/tcpm/google/tcpci_fusb307.c | 3 | ||||
| -rw-r--r-- | drivers/usb/typec/tcpm/google/tcpci_max77759.c | 3 |
5 files changed, 4 insertions, 10 deletions
diff --git a/drivers/usb/typec/tcpm/google/Kbuild b/drivers/usb/typec/tcpm/google/Kbuild index ba672e143..4f6aaf208 100644 --- a/drivers/usb/typec/tcpm/google/Kbuild +++ b/drivers/usb/typec/tcpm/google/Kbuild @@ -10,5 +10,3 @@ obj-$(CONFIG_TYPEC_MAX77759) += max77759_contaminant.o obj-$(CONFIG_POGO_TRANSPORT) += pogo_transport.o obj-$(CONFIG_TYPEC_COOLING_DEV) += usbc_cooling_dev.o -# This gives the drivers access to the tcpci.h header -ccflags-y := -I$(srctree)/drivers/usb/typec diff --git a/drivers/usb/typec/tcpm/google/bc_max77759.c b/drivers/usb/typec/tcpm/google/bc_max77759.c index de046ad35..4906b238a 100644 --- a/drivers/usb/typec/tcpm/google/bc_max77759.c +++ b/drivers/usb/typec/tcpm/google/bc_max77759.c @@ -10,14 +10,13 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/power_supply.h> +#include <linux/usb/tcpci.h> #include <linux/usb/tcpm.h> #include <linux/usb/typec.h> #include <misc/logbuffer.h> #include "bc_max77759.h" #include "max77759_helper.h" -/* This header comes from the GKI kernel tree */ -#include <tcpm/tcpci.h> #include "tcpci_max77759.h" struct bc12_status { diff --git a/drivers/usb/typec/tcpm/google/max77759_contaminant.c b/drivers/usb/typec/tcpm/google/max77759_contaminant.c index 08c505eda..2c7a6ca88 100644 --- a/drivers/usb/typec/tcpm/google/max77759_contaminant.c +++ b/drivers/usb/typec/tcpm/google/max77759_contaminant.c @@ -8,13 +8,12 @@ #include <linux/device.h> #include <linux/irqreturn.h> #include <linux/module.h> +#include <linux/usb/tcpci.h> #include <linux/usb/tcpm.h> #include <linux/usb/typec.h> #include <misc/logbuffer.h> #include "max77759_helper.h" -/* This header comes from the GKI kernel tree */ -#include <tcpm/tcpci.h> #include "tcpci_max77759.h" #include "tcpci_max77759_vendor_reg.h" diff --git a/drivers/usb/typec/tcpm/google/tcpci_fusb307.c b/drivers/usb/typec/tcpm/google/tcpci_fusb307.c index 878970ef3..47f7b4381 100644 --- a/drivers/usb/typec/tcpm/google/tcpci_fusb307.c +++ b/drivers/usb/typec/tcpm/google/tcpci_fusb307.c @@ -18,14 +18,13 @@ #include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <linux/usb/role.h> +#include <linux/usb/tcpci.h> #include <linux/usb/tcpm.h> #include <linux/usb/typec_mux.h> #include <misc/gvotable.h> #include <misc/logbuffer.h> #include "tcpci_otg_helper.h" -/* This header comes from the GKI kernel tree */ -#include <tcpm/tcpci.h> #include "usb_icl_voter.h" #include "usb_psy.h" diff --git a/drivers/usb/typec/tcpm/google/tcpci_max77759.c b/drivers/usb/typec/tcpm/google/tcpci_max77759.c index 230202546..bd6b99cef 100644 --- a/drivers/usb/typec/tcpm/google/tcpci_max77759.c +++ b/drivers/usb/typec/tcpm/google/tcpci_max77759.c @@ -20,6 +20,7 @@ #include <linux/regulator/consumer.h> #include <linux/spinlock.h> #include <linux/usb/pd.h> +#include <linux/usb/tcpci.h> #include <linux/usb/tcpm.h> #include <linux/usb/typec.h> #include <misc/logbuffer.h> @@ -28,8 +29,6 @@ #include "bc_max77759.h" #include <linux/usb/max77759_export.h> #include "max77759_helper.h" -/* This header comes from the GKI kernel tree */ -#include <tcpm/tcpci.h> #include "tcpci_max77759.h" #include "tcpci_max77759_vendor_reg.h" #include "usb_icl_voter.h" |