ARM: dts: rockchip: remove identical #include from rk3288.dtsi
Subsystems (2)
PATCH v2 1/3 ARM: dts: rockchip: remove identical #include from rk3288.dtsi
There are 2 identical '#include' for 'rk3288-power.h', so remove one of them.
--- arch/arm/boot/dts/rk3288.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/rk3288.dtsi +0 -1
@@ -7,7 +7,6 @@ #include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/power/rk3288-power.h> #include <dt-bindings/thermal/thermal.h> -#include <dt-bindings/power/rk3288-power.h> #include <dt-bindings/soc/rockchip,boot-mode.h> / {
Signature · 1 line
2.11.0
PATCH v2 2/3 ARM: dts: rockchip: remove include for irq.h
The 'irq.h' file is already included through 'arm-gic.h', so remove them from all Rockchip dtsi files.
--- arch/arm/boot/dts/rk3036.dtsi | 3 +-- arch/arm/boot/dts/rk322x.dtsi | 3 +-- arch/arm/boot/dts/rk3288.dtsi | 5 ++--- arch/arm/boot/dts/rk3xxx.dtsi | 1 - arch/arm/boot/dts/rv1108.dtsi | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-)
arch/arm/boot/dts/rk3036.dtsi +1 -2
@@ -1,10 +1,9 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) +#include <dt-bindings/clock/rk3036-cru.h> #include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/pinctrl/rockchip.h> -#include <dt-bindings/clock/rk3036-cru.h> #include <dt-bindings/soc/rockchip,boot-mode.h> / {
arch/arm/boot/dts/rk322x.dtsi +1 -2
@@ -1,10 +1,9 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) +#include <dt-bindings/clock/rk3228-cru.h> #include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/pinctrl/rockchip.h> -#include <dt-bindings/clock/rk3228-cru.h> #include <dt-bindings/thermal/thermal.h> / {
arch/arm/boot/dts/rk3288.dtsi +2 -3
@@ -1,13 +1,12 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) +#include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/pinctrl/rockchip.h> -#include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/power/rk3288-power.h> -#include <dt-bindings/thermal/thermal.h> #include <dt-bindings/soc/rockchip,boot-mode.h> +#include <dt-bindings/thermal/thermal.h> / { #address-cells = <2>;
arch/arm/boot/dts/rk3xxx.dtsi +0 -1
@@ -4,7 +4,6 @@ * Author: Heiko Stuebner <[email protected]> */ -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/soc/rockchip,boot-mode.h>
arch/arm/boot/dts/rv1108.dtsi +2 -2
@@ -1,11 +1,11 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) +#include <dt-bindings/clock/rv1108-cru.h> #include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/clock/rv1108-cru.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/thermal/thermal.h> + / { #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.11.0
Heiko Stuebner
maintainerRe: [PATCH v2 2/3] ARM: dts: rockchip: remove include for irq.h
Hi Johan,
Am Freitag, 3. April 2020, 17:43:28 CEST schrieb Johan Jonker:
Quoted 17 lines
The '
irq.h' file is already included through 'arm-gic.h', so remove them from all Rockchip dtsi files.Signed-off-by Johan Jonker <[email protected]>--- arch/arm/boot/dts/rk3036.dtsi | 3 +-- arch/arm/boot/dts/rk322x.dtsi | 3 +-- arch/arm/boot/dts/rk3288.dtsi | 5 ++--- arch/arm/boot/dts/rk3xxx.dtsi | 1 - arch/arm/boot/dts/rv1108.dtsi | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-)arch/arm/boot/dts/rk3036.dtsi +0
-0
arch/arm/boot/dts/rk3036.dtsi line 7
Quoted 9 lines
arch/arm/boot/dts/rk3036.dtsi +1
-2@@ -1,10 +1,9 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) +#include <dt-bindings/clock/rk3036-cru.h> #include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/pinctrl/rockchip.h> -#include <dt-bindings/clock/rk3036-cru.h> #include <dt-bindings/soc/rockchip,boot-mode.h>
that movement of the *-cru.h files are unrelated changes, as they're not described in the commit message.
If you really want to move these this should be a separate commit.
Heiko
PATCH v2 3/3 arm64: dts: rockchip: remove include for irq.h
In reply to Johan JonkerThe 'irq.h' file is already included through 'arm-gic.h', so remove them from all Rockchip dtsi files.
--- arch/arm64/boot/dts/rockchip/px30.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3308.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3328.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3368.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1 - 5 files changed, 5 deletions(-)
arch/arm64/boot/dts/rockchip/px30.dtsi +0 -1
@@ -6,7 +6,6 @@ #include <dt-bindings/clock/px30-cru.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/power/px30-power.h> #include <dt-bindings/soc/rockchip,boot-mode.h>
arch/arm64/boot/dts/rockchip/rk3308.dtsi +0 -1
@@ -7,7 +7,6 @@ #include <dt-bindings/clock/rk3308-cru.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/soc/rockchip,boot-mode.h> #include <dt-bindings/thermal/thermal.h>
arch/arm64/boot/dts/rockchip/rk3328.dtsi +0 -1
@@ -6,7 +6,6 @@ #include <dt-bindings/clock/rk3328-cru.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/power/rk3328-power.h> #include <dt-bindings/soc/rockchip,boot-mode.h>
arch/arm64/boot/dts/rockchip/rk3368.dtsi +0 -1
@@ -5,7 +5,6 @@ #include <dt-bindings/clock/rk3368-cru.h> #include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/soc/rockchip,boot-mode.h>
arch/arm64/boot/dts/rockchip/rk3399.dtsi +0 -1
@@ -6,7 +6,6 @@ #include <dt-bindings/clock/rk3399-cru.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/power/rk3399-power.h> #include <dt-bindings/thermal/thermal.h>
Signature · 1 line
2.11.0