From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH master 12/14] treewide: fix includes missed by multiarch support
Date: Tue, 11 Apr 2023 09:14:34 +0200 [thread overview]
Message-ID: <20230411071436.1630752-13-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230411071436.1630752-1-a.fatoum@pengutronix.de>
Found by manual inspection of the results of:
rg '#include\s*<mach/[^/]+>' | rg -v 'arch/(powerpc|sandbox|mips|x86|kvx)'
Fixes: 68b778c24314 ("ARM: Drop mach dir include path")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
Documentation/boards/imx.rst | 4 ++--
drivers/aiodev/am335x_adc.c | 2 +-
drivers/aiodev/imx_thermal.c | 2 +-
drivers/hab/hab.c | 2 +-
drivers/nvmem/ocotp.c | 4 ++--
drivers/pci/pci-imx6.c | 6 +++---
drivers/pinctrl/imx-iomux-v2.c | 2 +-
drivers/spi/atmel-quadspi.c | 6 +++---
drivers/video/imx-ipu-fb.c | 4 ++--
scripts/regsubst.pl | 8 ++++----
scripts/socfpga_xml_to_config.sh | 4 ++--
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/Documentation/boards/imx.rst b/Documentation/boards/imx.rst
index 6fbf1554d10e..5cc4676a9613 100644
--- a/Documentation/boards/imx.rst
+++ b/Documentation/boards/imx.rst
@@ -168,13 +168,13 @@ keys/certificates are expected in these config variables (assuming HABv4):
CONFIG_HABV4_IMG_CRT_PEM
A CSF template is located in
-``arch/arm/mach-imx/include/mach/habv4-imx6-gencsf.h`` which is preprocessed
+``include/mach/imx/habv4-imx6-gencsf.h`` which is preprocessed
by barebox.
It must be included in the board's flash header:
.. code-block:: none
- #include <mach/habv4-imx6-gencsf.h>
+ #include <mach/imx/habv4-imx6-gencsf.h>
Analogous to HABv4 options and a template exist for HABv3.
diff --git a/drivers/aiodev/am335x_adc.c b/drivers/aiodev/am335x_adc.c
index ceb7531dc0d6..491866ca36e6 100644
--- a/drivers/aiodev/am335x_adc.c
+++ b/drivers/aiodev/am335x_adc.c
@@ -19,7 +19,7 @@
#include <io.h>
#include <linux/log2.h>
#include <aiodev.h>
-#include <mach/am33xx-clock.h>
+#include <mach/omap/am33xx-clock.h>
#include "ti_am335x_tscadc.h"
struct am335x_adc_data {
diff --git a/drivers/aiodev/imx_thermal.c b/drivers/aiodev/imx_thermal.c
index 4d24f6cae32f..0b1670708fc9 100644
--- a/drivers/aiodev/imx_thermal.c
+++ b/drivers/aiodev/imx_thermal.c
@@ -22,7 +22,7 @@
#include <linux/math64.h>
#include <linux/log2.h>
#include <linux/clk.h>
-#include <mach/imx6-anadig.h>
+#include <mach/imx/imx6-anadig.h>
#include <io.h>
#include <aiodev.h>
#include <mfd/syscon.h>
diff --git a/drivers/hab/hab.c b/drivers/hab/hab.c
index 65384a6c10db..5bb97c4b689b 100644
--- a/drivers/hab/hab.c
+++ b/drivers/hab/hab.c
@@ -5,7 +5,7 @@
#include <fcntl.h>
#include <environment.h>
#include <libfile.h>
-#include <mach/generic.h>
+#include <mach/imx/generic.h>
#include <hab.h>
#include <regmap.h>
#include <fs.h>
diff --git a/drivers/nvmem/ocotp.c b/drivers/nvmem/ocotp.c
index ff1e815c6b98..f3bd377f844d 100644
--- a/drivers/nvmem/ocotp.c
+++ b/drivers/nvmem/ocotp.c
@@ -30,8 +30,8 @@
#include <mach/imx/ocotp.h>
#include <mach/imx/ocotp-fusemap.h>
#else
-#include <mach/ocotp.h>
-#include <mach/ocotp-fusemap.h>
+#include <mach/mxs/ocotp.h>
+#include <mach/mxs/ocotp-fusemap.h>
#endif
#include <soc/imx8m/featctrl.h>
#include <linux/nvmem-provider.h>
diff --git a/drivers/pci/pci-imx6.c b/drivers/pci/pci-imx6.c
index 6212a00913a5..40bcf3d89033 100644
--- a/drivers/pci/pci-imx6.c
+++ b/drivers/pci/pci-imx6.c
@@ -30,9 +30,9 @@
#include <mfd/imx6q-iomuxc-gpr.h>
#include <mfd/imx7-iomuxc-gpr.h>
-#include <mach/imx6-regs.h>
-#include <mach/imx7-regs.h>
-#include <mach/imx8mq-regs.h>
+#include <mach/imx/imx6-regs.h>
+#include <mach/imx/imx7-regs.h>
+#include <mach/imx/imx8mq-regs.h>
#include "pcie-designware.h"
diff --git a/drivers/pinctrl/imx-iomux-v2.c b/drivers/pinctrl/imx-iomux-v2.c
index 806c3f882c07..cc5b8f11bcfe 100644
--- a/drivers/pinctrl/imx-iomux-v2.c
+++ b/drivers/pinctrl/imx-iomux-v2.c
@@ -7,7 +7,7 @@
#include <io.h>
#include <init.h>
#include <linux/err.h>
-#include <mach/iomux-mx31.h>
+#include <mach/imx/iomux-mx31.h>
/*
* IOMUX register (base) addresses
diff --git a/drivers/spi/atmel-quadspi.c b/drivers/spi/atmel-quadspi.c
index e579fcaed6ee..923a170844f6 100644
--- a/drivers/spi/atmel-quadspi.c
+++ b/drivers/spi/atmel-quadspi.c
@@ -21,9 +21,9 @@
#include <of_gpio.h>
#include <io.h>
#include <spi/spi.h>
-#include <mach/iomux.h>
-#include <mach/board.h>
-#include <mach/cpu.h>
+#include <mach/at91/iomux.h>
+#include <mach/at91/board.h>
+#include <mach/at91/cpu.h>
#include <linux/clk.h>
#include <linux/err.h>
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c
index 77c0ba2c9ca8..e2ff01929be2 100644
--- a/drivers/video/imx-ipu-fb.c
+++ b/drivers/video/imx-ipu-fb.c
@@ -8,14 +8,14 @@
#include <dma.h>
#include <init.h>
#include <io.h>
-#include <mach/imx35-regs.h>
+#include <mach/imx/imx35-regs.h>
#include <fb.h>
#include <platform_data/imxfb.h>
#include <malloc.h>
#include <errno.h>
#include <linux/math64.h>
#include <mmu.h>
-#include <mach/imx-ipu-fb.h>
+#include <mach/imx/imx-ipu-fb.h>
#include <linux/clk.h>
#include <linux/err.h>
diff --git a/scripts/regsubst.pl b/scripts/regsubst.pl
index 026c4eed2f12..1aaab4f6a20e 100755
--- a/scripts/regsubst.pl
+++ b/scripts/regsubst.pl
@@ -47,8 +47,8 @@ First you have to add the right #include directives to your file:
loadaddr 0x20000000
ivtofs 0x400
- #include <mach/imx6-ddr-regs.h>
- #include <mach/imx6dl-ddr-regs.h>
+ #include <mach/imx/imx6-ddr-regs.h>
+ #include <mach/imx/imx6dl-ddr-regs.h>
wm 32 0x020e0774 0x000C0000
wm 32 0x020e0754 0x00000000
@@ -61,8 +61,8 @@ Then you can process the file with B<regsubst.pl>:
loadaddr 0x20000000
ivtofs 0x400
- #include <mach/imx6-ddr-regs.h>
- #include <mach/imx6dl-ddr-regs.h>
+ #include <mach/imx/imx6-ddr-regs.h>
+ #include <mach/imx/imx6dl-ddr-regs.h>
wm 32 MX6_IOM_GRP_DDR_TYPE 0x000C0000
wm 32 MX6_IOM_GRP_DDRPKE 0x00000000
diff --git a/scripts/socfpga_xml_to_config.sh b/scripts/socfpga_xml_to_config.sh
index 1e6056cfb461..2ec2788865b0 100755
--- a/scripts/socfpga_xml_to_config.sh
+++ b/scripts/socfpga_xml_to_config.sh
@@ -41,7 +41,7 @@ pll_config() {
sed -e "s/^/\t./g" |
sort`
- echo "#include <mach/arria10-clock-manager.h>" > $tgt
+ echo "#include <mach/socfpga/arria10-clock-manager.h>" > $tgt
echo >> $tgt
echo "static struct arria10_mainpll_cfg mainpll_cfg = {" >> $tgt
echo "$MAINPLL" >> $tgt
@@ -107,7 +107,7 @@ pinmux_config() {
sed -e "s/\.sel' value='/] = /g" | \
sed -e "s/' \/>/,/g"`
- echo "#include <mach/arria10-pinmux.h>" > $tgt
+ echo "#include <mach/socfpga/arria10-pinmux.h>" > $tgt
echo >> $tgt
echo "static uint32_t pinmux[] = {" >> $tgt
echo "$SHARED" >> $tgt
--
2.39.2
next prev parent reply other threads:[~2023-04-11 7:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-11 7:14 [PATCH master 00/14] treewide: fixes for master Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 01/14] test: riscv: fix YAMLs after defconfig rename Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 02/14] RISC-V: board-dt-2nd: fix hang in startup Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 03/14] RISC-V: sifive: disable non-functional SPI nodes Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 04/14] video: qemu-ramfb: reduce -ENODEV lo level to debug Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 05/14] gpiolib: fix gpio label generation with gpiod_get Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 06/14] test: emulate.pl: fix firmware use with non-tuxmake out-of-tree build Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 07/14] RISC-V: restrict GCC optimization some more Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 08/14] RISC-V: configs: rv64i_defconfig: disable SBI serial Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 09/14] net: dsa: realtek: include needed headers directly Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 10/14] net: linux/mdio.h: add missing init.h header Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 11/14] Kbuild: export CROSS_PKG_CONFIG Ahmad Fatoum
2023-04-11 7:14 ` Ahmad Fatoum [this message]
2023-04-11 7:14 ` [PATCH master 13/14] mci: dw_mmc: make reset optional Ahmad Fatoum
2023-04-11 7:14 ` [PATCH master 14/14] kbuild: remove useless use of /usr/bin/env Ahmad Fatoum
2023-04-11 11:57 ` Sascha Hauer
2023-04-11 11:44 ` [PATCH master 00/14] treewide: fixes for master Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230411071436.1630752-13-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox