[PATCH] ARM: dts: add "simple-bus" to "arm, amba-bus" compatible nodes
From: robh+dt@kernel.org (Rob Herring)
Date: 2016-03-03 20:44:50
Also in:
linux-arm-msm, linux-devicetree, linux-rockchip, linux-samsung-soc, lkml
On Mon, Feb 29, 2016 at 9:57 PM, Masahiro Yamada [off-list ref] wrote:
quoted hunk ↗ jump to hunk
The "arm,amba-bus" string in the of_default_bus_match_table is ambiguous. This prepares for killing it off in a long run. Signed-off-by: Masahiro Yamada <redacted> --- arch/arm/boot/dts/axm55xx.dtsi | 2 +- arch/arm/boot/dts/exynos3250.dtsi | 2 +- arch/arm/boot/dts/exynos4.dtsi | 2 +- arch/arm/boot/dts/exynos4415.dtsi | 2 +- arch/arm/boot/dts/exynos5250.dtsi | 2 +- arch/arm/boot/dts/exynos5420.dtsi | 2 +- arch/arm/boot/dts/exynos5440.dtsi | 2 +- arch/arm/boot/dts/hi3620.dtsi | 2 +- arch/arm/boot/dts/hip01.dtsi | 2 +- arch/arm/boot/dts/hisi-x5hd2.dtsi | 2 +- arch/arm/boot/dts/qcom-apq8064.dtsi | 2 +- arch/arm/boot/dts/qcom-msm8660.dtsi | 2 +- arch/arm/boot/dts/qcom-msm8960.dtsi | 2 +- arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk3228.dtsi | 2 +- arch/arm/boot/dts/rk3288.dtsi | 2 +- arch/arm/boot/dts/rk3xxx.dtsi | 2 +- arch/arm/boot/dts/s5pv210.dtsi | 2 +- arch/arm/boot/dts/socfpga.dtsi | 2 +- arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +- arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 2 +- arch/arm/boot/dts/ste-u300.dts | 2 +- arch/arm/boot/dts/versatile-ab.dts | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-)diff --git a/arch/arm/boot/dts/axm55xx.dtsi b/arch/arm/boot/dts/axm55xx.dtsi index ea288f0..8da4582 100644 --- a/arch/arm/boot/dts/axm55xx.dtsi +++ b/arch/arm/boot/dts/axm55xx.dtsi@@ -107,7 +107,7 @@ }; amba { - compatible = "arm,amba-bus"; + compatible = "arm,amba-bus", "simple-bus";
Actually, I would remove arm,amba-bus completely to prevent its spread. Both have been matched since ARM DT support began in the kernel. AFAICT, FreeBSD only uses simple-bus. If so, then this patch fixes FreeBSD on these systems (if that was the only issue). Rob