| Message ID | 94431754-d187-aad5-c374-67af70fcf982@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | soc: amlogic: switch bindings to yaml and adjust some dtbs's | expand |
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index ed895fb32..4ee4d0089 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -1761,8 +1761,7 @@ reset: reset-controller@1004 { }; gpio_intc: interrupt-controller@f080 { - compatible = "amlogic,meson-axg-gpio-intc", - "amlogic,meson-gpio-intc"; + compatible = "amlogic,meson-axg-gpio-intc"; reg = <0x0 0xf080 0x0 0x10>; interrupt-controller; #interrupt-cells = <2>; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 80d82f739..9bf81e51e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2179,8 +2179,7 @@ reset: reset-controller@1004 { }; gpio_intc: interrupt-controller@f080 { - compatible = "amlogic,meson-g12a-gpio-intc", - "amlogic,meson-gpio-intc"; + compatible = "amlogic,meson-g12a-gpio-intc"; reg = <0x0 0xf080 0x0 0x10>; interrupt-controller; #interrupt-cells = <2>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index c0a311da4..86865daf7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -278,7 +278,6 @@ cbus: bus@c1100000 { ranges = <0x0 0x0 0x0 0xc1100000 0x0 0x100000>; gpio_intc: interrupt-controller@9880 { - compatible = "amlogic,meson-gpio-intc"; reg = <0x0 0x9880 0x0 0x10>; interrupt-controller; #interrupt-cells = <2>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 923d2d8bb..8d8fdad6a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -300,8 +300,7 @@ ðmac { }; &gpio_intc { - compatible = "amlogic,meson-gpio-intc", - "amlogic,meson-gxbb-gpio-intc"; + compatible = "amlogic,meson-gxbb-gpio-intc"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 04e9d0f1b..5a8f47313 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -312,8 +312,7 @@ &clkc_AO { }; &gpio_intc { - compatible = "amlogic,meson-gpio-intc", - "amlogic,meson-gxl-gpio-intc"; + compatible = "amlogic,meson-gxl-gpio-intc"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi index ad50cba42..6b74a6995 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi @@ -109,8 +109,7 @@ gpio: bank@4000 { }; gpio_intc: interrupt-controller@4080 { - compatible = "amlogic,meson-s4-gpio-intc", - "amlogic,meson-gpio-intc"; + compatible = "amlogic,meson-s4-gpio-intc"; reg = <0x0 0x4080 0x0 0x20>; interrupt-controller; #interrupt-cells = <2>; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi index 617d322af..733a5d578 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi @@ -513,8 +513,7 @@ ðmac { }; &gpio_intc { - compatible = "amlogic,meson-sm1-gpio-intc", - "amlogic,meson-gpio-intc"; + compatible = "amlogic,meson-sm1-gpio-intc"; }; &pcie {
Remove invalid compatible string amlogic,meson-gpio-intc. See drivers/irqchip/irq-meson-gpio.c Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 3 +-- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 3 +-- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 - arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 3 +-- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 3 +-- arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 3 +-- arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 3 +-- 7 files changed, 6 insertions(+), 13 deletions(-)