diff options
| author | Igor Prusov <ivprusov@salutedevices.com> | 2023-11-14 14:02:56 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-28 16:19:06 -0500 |
| commit | e515a2bb1a9cb8a563b74337f16018d4989ef105 (patch) | |
| tree | a147220eddfa70027872c3b7ab8ce23f1569d0e4 /drivers | |
| parent | d26db04db1731362ace35c13e6effdffd7f831b7 (diff) | |
| download | u-boot-e515a2bb1a9cb8a563b74337f16018d4989ef105.zip u-boot-e515a2bb1a9cb8a563b74337f16018d4989ef105.tar.gz u-boot-e515a2bb1a9cb8a563b74337f16018d4989ef105.tar.bz2 | |
treewide: Include linux/io.h instead of asm-generic/io.h
Directly including asm-generic/io.h may break build because it will
cause redefenition of generic io macros if linux/io.h gets included
later, hence replace it with direct include of linux/io.h
Signed-off-by: Igor Prusov <ivprusov@salutedevices.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/cadence_qspi.c | 2 | ||||
| -rw-r--r-- | drivers/usb/cdns3/cdns3-ti.c | 1 | ||||
| -rw-r--r-- | drivers/usb/dwc3/dwc3-meson-g12a.c | 2 | ||||
| -rw-r--r-- | drivers/usb/dwc3/dwc3-meson-gxl.c | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index cc3a54f..23240c1 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -7,7 +7,6 @@ #include <common.h> #include <clk.h> #include <log.h> -#include <asm-generic/io.h> #include <dm.h> #include <fdtdec.h> #include <malloc.h> @@ -17,6 +16,7 @@ #include <dm/device_compat.h> #include <linux/err.h> #include <linux/errno.h> +#include <linux/io.h> #include <linux/sizes.h> #include <zynqmp_firmware.h> #include "cadence_qspi.h" diff --git a/drivers/usb/cdns3/cdns3-ti.c b/drivers/usb/cdns3/cdns3-ti.c index 92a7941..2e44aad 100644 --- a/drivers/usb/cdns3/cdns3-ti.c +++ b/drivers/usb/cdns3/cdns3-ti.c @@ -6,7 +6,6 @@ */ #include <common.h> -#include <asm-generic/io.h> #include <clk.h> #include <dm.h> #include <dm/device_compat.h> diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c index e0356e6..1960352 100644 --- a/drivers/usb/dwc3/dwc3-meson-g12a.c +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c @@ -8,13 +8,13 @@ #include <common.h> #include <log.h> -#include <asm-generic/io.h> #include <dm.h> #include <dm/device-internal.h> #include <dm/lists.h> #include <dwc3-uboot.h> #include <generic-phy.h> #include <linux/delay.h> +#include <linux/io.h> #include <linux/printk.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> diff --git a/drivers/usb/dwc3/dwc3-meson-gxl.c b/drivers/usb/dwc3/dwc3-meson-gxl.c index d56f274..cbe8aaa 100644 --- a/drivers/usb/dwc3/dwc3-meson-gxl.c +++ b/drivers/usb/dwc3/dwc3-meson-gxl.c @@ -8,12 +8,12 @@ #define DEBUG #include <common.h> -#include <asm-generic/io.h> #include <dm.h> #include <dm/device-internal.h> #include <dm/lists.h> #include <dwc3-uboot.h> #include <generic-phy.h> +#include <linux/io.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <malloc.h> |