git: 8a7a4683b083 - main - arm: arm64: Directly use #include <dt-binding/...>
Emmanuel Vadot
manu at FreeBSD.org
Fri Jan 15 13:58:29 UTC 2021
The branch main has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=8a7a4683b0832ea18c028588a3c49946d499c371
commit 8a7a4683b0832ea18c028588a3c49946d499c371
Author: Emmanuel Vadot <manu at FreeBSD.org>
AuthorDate: 2021-01-15 13:17:03 +0000
Commit: Emmanuel Vadot <manu at FreeBSD.org>
CommitDate: 2021-01-15 13:17:03 +0000
arm: arm64: Directly use #include <dt-binding/...>
We have it in the includes path and this will help the transition to the
new device-tree import in sys/contrib
---
sys/arm/allwinner/clkng/ccu_a10.c | 6 +++---
sys/arm/allwinner/clkng/ccu_a64.c | 4 ++--
sys/arm/allwinner/clkng/ccu_a83t.c | 4 ++--
sys/arm/allwinner/clkng/ccu_de2.c | 4 ++--
sys/arm/allwinner/clkng/ccu_h3.c | 4 ++--
sys/arm/allwinner/clkng/ccu_h6.c | 4 ++--
sys/arm/allwinner/clkng/ccu_h6_r.c | 4 ++--
sys/arm/allwinner/clkng/ccu_sun8i_r.c | 4 ++--
sys/arm/mv/mv_cp110_icu.c | 2 +-
sys/arm/nvidia/as3722.c | 2 +-
sys/arm/nvidia/as3722_regulators.c | 2 +-
sys/arm/nvidia/drm2/tegra_drm_subr.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_car.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_clk_per.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_clk_pll.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_clk_super.c | 2 +-
sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c | 2 +-
sys/arm/nvidia/tegra_soctherm.c | 2 +-
sys/arm/ti/ti_sysc.c | 2 +-
19 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/sys/arm/allwinner/clkng/ccu_a10.c b/sys/arm/allwinner/clkng/ccu_a10.c
index 288ac10b43f5..182a19f35e98 100644
--- a/sys/arm/allwinner/clkng/ccu_a10.c
+++ b/sys/arm/allwinner/clkng/ccu_a10.c
@@ -49,9 +49,9 @@ __FBSDID("$FreeBSD$");
#include <arm/allwinner/clkng/aw_ccung.h>
-#include <gnu/dts/include/dt-bindings/clock/sun4i-a10-ccu.h>
-#include <gnu/dts/include/dt-bindings/clock/sun7i-a20-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun4i-a10-ccu.h>
+#include <dt-bindings/clock/sun4i-a10-ccu.h>
+#include <dt-bindings/clock/sun7i-a20-ccu.h>
+#include <dt-bindings/reset/sun4i-a10-ccu.h>
/* Non-exported resets */
/* Non-exported clocks */
diff --git a/sys/arm/allwinner/clkng/ccu_a64.c b/sys/arm/allwinner/clkng/ccu_a64.c
index 859862b2b477..41f531596475 100644
--- a/sys/arm/allwinner/clkng/ccu_a64.c
+++ b/sys/arm/allwinner/clkng/ccu_a64.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
#include <arm/allwinner/clkng/aw_ccung.h>
-#include <gnu/dts/include/dt-bindings/clock/sun50i-a64-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun50i-a64-ccu.h>
+#include <dt-bindings/clock/sun50i-a64-ccu.h>
+#include <dt-bindings/reset/sun50i-a64-ccu.h>
/* Non-exported clocks */
diff --git a/sys/arm/allwinner/clkng/ccu_a83t.c b/sys/arm/allwinner/clkng/ccu_a83t.c
index bf8dcb13399a..c32b1d624161 100644
--- a/sys/arm/allwinner/clkng/ccu_a83t.c
+++ b/sys/arm/allwinner/clkng/ccu_a83t.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
#include <arm/allwinner/clkng/aw_ccung.h>
-#include <gnu/dts/include/dt-bindings/clock/sun8i-a83t-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun8i-a83t-ccu.h>
+#include <dt-bindings/clock/sun8i-a83t-ccu.h>
+#include <dt-bindings/reset/sun8i-a83t-ccu.h>
/* Non-exported clocks */
diff --git a/sys/arm/allwinner/clkng/ccu_de2.c b/sys/arm/allwinner/clkng/ccu_de2.c
index 7e699cce36a8..84a2681abeb9 100644
--- a/sys/arm/allwinner/clkng/ccu_de2.c
+++ b/sys/arm/allwinner/clkng/ccu_de2.c
@@ -55,8 +55,8 @@ __FBSDID("$FreeBSD$");
#include <arm/allwinner/clkng/aw_ccung.h>
-#include <gnu/dts/include/dt-bindings/clock/sun8i-de2.h>
-#include <gnu/dts/include/dt-bindings/reset/sun8i-de2.h>
+#include <dt-bindings/clock/sun8i-de2.h>
+#include <dt-bindings/reset/sun8i-de2.h>
enum CCU_DE2 {
H3_CCU = 1,
diff --git a/sys/arm/allwinner/clkng/ccu_h3.c b/sys/arm/allwinner/clkng/ccu_h3.c
index c5f182b81a3f..72e257c98d73 100644
--- a/sys/arm/allwinner/clkng/ccu_h3.c
+++ b/sys/arm/allwinner/clkng/ccu_h3.c
@@ -57,8 +57,8 @@ __FBSDID("$FreeBSD$");
#include <arm/allwinner/clkng/aw_ccung.h>
-#include <gnu/dts/include/dt-bindings/clock/sun8i-h3-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun8i-h3-ccu.h>
+#include <dt-bindings/clock/sun8i-h3-ccu.h>
+#include <dt-bindings/reset/sun8i-h3-ccu.h>
/* Non-exported resets */
#define RST_BUS_SCR 53
diff --git a/sys/arm/allwinner/clkng/ccu_h6.c b/sys/arm/allwinner/clkng/ccu_h6.c
index 5dd1816fab15..dbecaaff0e6b 100644
--- a/sys/arm/allwinner/clkng/ccu_h6.c
+++ b/sys/arm/allwinner/clkng/ccu_h6.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
#include <arm/allwinner/clkng/aw_ccung.h>
-#include <gnu/dts/include/dt-bindings/clock/sun50i-h6-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun50i-h6-ccu.h>
+#include <dt-bindings/clock/sun50i-h6-ccu.h>
+#include <dt-bindings/reset/sun50i-h6-ccu.h>
/* Non-exported clocks */
#define CLK_OSC_12M 0
diff --git a/sys/arm/allwinner/clkng/ccu_h6_r.c b/sys/arm/allwinner/clkng/ccu_h6_r.c
index 98fcd2b47c9b..1f1ca8c1054a 100644
--- a/sys/arm/allwinner/clkng/ccu_h6_r.c
+++ b/sys/arm/allwinner/clkng/ccu_h6_r.c
@@ -49,8 +49,8 @@ __FBSDID("$FreeBSD$");
#include <arm/allwinner/clkng/aw_ccung.h>
-#include <gnu/dts/include/dt-bindings/clock/sun50i-h6-r-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun50i-h6-r-ccu.h>
+#include <dt-bindings/clock/sun50i-h6-r-ccu.h>
+#include <dt-bindings/reset/sun50i-h6-r-ccu.h>
/* Non-exported clocks */
#define CLK_R_AHB 1
diff --git a/sys/arm/allwinner/clkng/ccu_sun8i_r.c b/sys/arm/allwinner/clkng/ccu_sun8i_r.c
index cc3b5bff2cf7..05558f4dc73e 100644
--- a/sys/arm/allwinner/clkng/ccu_sun8i_r.c
+++ b/sys/arm/allwinner/clkng/ccu_sun8i_r.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
#include <arm/allwinner/clkng/aw_ccung.h>
-#include <gnu/dts/include/dt-bindings/clock/sun8i-r-ccu.h>
-#include <gnu/dts/include/dt-bindings/reset/sun8i-r-ccu.h>
+#include <dt-bindings/clock/sun8i-r-ccu.h>
+#include <dt-bindings/reset/sun8i-r-ccu.h>
/* Non-exported clocks */
#define CLK_AHB0 1
diff --git a/sys/arm/mv/mv_cp110_icu.c b/sys/arm/mv/mv_cp110_icu.c
index 41e727ccc695..12dd6989e339 100644
--- a/sys/arm/mv/mv_cp110_icu.c
+++ b/sys/arm/mv/mv_cp110_icu.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <gnu/dts/include/dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/irq.h>
#include "pic_if.h"
#define ICU_GRP_NSR 0x0
diff --git a/sys/arm/nvidia/as3722.c b/sys/arm/nvidia/as3722.c
index 21dae2d7c695..60301c78a2fb 100644
--- a/sys/arm/nvidia/as3722.c
+++ b/sys/arm/nvidia/as3722.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <gnu/dts/include/dt-bindings/mfd/as3722.h>
+#include <dt-bindings/mfd/as3722.h>
#include "clock_if.h"
#include "regdev_if.h"
diff --git a/sys/arm/nvidia/as3722_regulators.c b/sys/arm/nvidia/as3722_regulators.c
index d6cb5c529177..3e463f0f5de7 100644
--- a/sys/arm/nvidia/as3722_regulators.c
+++ b/sys/arm/nvidia/as3722_regulators.c
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#include <dev/extres/regulator/regulator.h>
#include <dev/gpio/gpiobusvar.h>
-#include <gnu/dts/include/dt-bindings/mfd/as3722.h>
+#include <dt-bindings/mfd/as3722.h>
#include "as3722.h"
diff --git a/sys/arm/nvidia/drm2/tegra_drm_subr.c b/sys/arm/nvidia/drm2/tegra_drm_subr.c
index ab883445a2e1..813da9c7b18c 100644
--- a/sys/arm/nvidia/drm2/tegra_drm_subr.c
+++ b/sys/arm/nvidia/drm2/tegra_drm_subr.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
#include <arm/nvidia/drm2/tegra_drm.h>
-#include <gnu/dts/include/dt-bindings/gpio/gpio.h>
+#include <dt-bindings/gpio/gpio.h>
int
tegra_drm_connector_get_modes(struct drm_connector *connector)
diff --git a/sys/arm/nvidia/tegra124/tegra124_car.c b/sys/arm/nvidia/tegra124/tegra124_car.c
index 7e776720a2e6..89f3e392c0bc 100644
--- a/sys/arm/nvidia/tegra124/tegra124_car.c
+++ b/sys/arm/nvidia/tegra124/tegra124_car.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
-#include <gnu/dts/include/dt-bindings/clock/tegra124-car.h>
+#include <dt-bindings/clock/tegra124-car.h>
#include "clkdev_if.h"
#include "hwreset_if.h"
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_per.c b/sys/arm/nvidia/tegra124/tegra124_clk_per.c
index f1a36a447c1c..4d68e8b22daf 100644
--- a/sys/arm/nvidia/tegra124/tegra124_clk_per.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_per.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <dev/extres/clk/clk.h>
-#include <gnu/dts/include/dt-bindings/clock/tegra124-car.h>
+#include <dt-bindings/clock/tegra124-car.h>
#include "tegra124_car.h"
/* The TEGRA124_CLK_XUSB_GATE is missing in current
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
index 7e04c39dcee7..82b34fd71203 100644
--- a/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_pll.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <dev/extres/clk/clk.h>
-#include <gnu/dts/include/dt-bindings/clock/tegra124-car.h>
+#include <dt-bindings/clock/tegra124-car.h>
#include "tegra124_car.h"
/* #define TEGRA_PLL_DEBUG */
diff --git a/sys/arm/nvidia/tegra124/tegra124_clk_super.c b/sys/arm/nvidia/tegra124/tegra124_clk_super.c
index 808a262ad653..43582508edea 100644
--- a/sys/arm/nvidia/tegra124/tegra124_clk_super.c
+++ b/sys/arm/nvidia/tegra124/tegra124_clk_super.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <dev/extres/clk/clk.h>
-#include <gnu/dts/include/dt-bindings/clock/tegra124-car.h>
+#include <dt-bindings/clock/tegra124-car.h>
#include "tegra124_car.h"
/* Flags */
diff --git a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
index 52b3eb6a8962..f41234197335 100644
--- a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
+++ b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <arm/nvidia/tegra_efuse.h>
-#include <gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
+#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
#include "phydev_if.h"
diff --git a/sys/arm/nvidia/tegra_soctherm.c b/sys/arm/nvidia/tegra_soctherm.c
index d82b07488838..d90e97e59159 100644
--- a/sys/arm/nvidia/tegra_soctherm.c
+++ b/sys/arm/nvidia/tegra_soctherm.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
#include <dev/ofw/ofw_bus_subr.h>
#include <arm/nvidia/tegra_efuse.h>
-#include <gnu/dts/include/dt-bindings/thermal/tegra124-soctherm.h>
+#include <dt-bindings/thermal/tegra124-soctherm.h>
#include "tegra_soctherm_if.h"
/* Per sensors registers - base is 0x0c0*/
diff --git a/sys/arm/ti/ti_sysc.c b/sys/arm/ti/ti_sysc.c
index 171520643c13..b16158aa5d83 100644
--- a/sys/arm/ti/ti_sysc.c
+++ b/sys/arm/ti/ti_sysc.c
@@ -120,7 +120,7 @@ static const char * reg_names[] = { "rev", "sysc", "syss" };
#define REG_MAX 3
/* master idle / slave idle mode defined in 8.1.3.2.1 / 8.1.3.2.2 */
-#include <gnu/dts/include/dt-bindings/bus/ti-sysc.h>
+#include <dt-bindings/bus/ti-sysc.h>
#define SYSC_IDLE_MAX 4
struct sysc_reg {
More information about the dev-commits-src-all
mailing list