ARM: dts: rockchip: remove identical #include from rk3288.dtsi
Subsystems (2)
PATCH v3 1/4 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 v3 2/4 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 | 1 - arch/arm/boot/dts/rk322x.dtsi | 1 - arch/arm/boot/dts/rk3288.dtsi | 1 - arch/arm/boot/dts/rk3xxx.dtsi | 1 - arch/arm/boot/dts/rv1108.dtsi | 1 - 5 files changed, 5 deletions(-)
arch/arm/boot/dts/rk3036.dtsi +0 -1
@@ -1,7 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) #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>
arch/arm/boot/dts/rk322x.dtsi +0 -1
@@ -1,7 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) #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>
arch/arm/boot/dts/rk3288.dtsi +0 -1
@@ -1,7 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) #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>
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 +0 -1
@@ -1,7 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) #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>
Signature · 1 line
2.11.0
PATCH v3 3/4 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
Heiko Stübner
maintainerRe: [PATCH v3 3/4] arm64: dts: rockchip: remove include for irq.h
Hi Johan,
Am Freitag, 3. April 2020, 20:01:58 CEST schrieb Johan Jonker:
Quoted 2 lines
The '
irq.h' file is already included through 'arm-gic.h', so remove them from all Rockchip dtsi files.
I disagree here ... we do use properties from both arm-gic.h and the main irq.h an therefore should not rely on the arm-gic.h "accidentially" including irq.h
Heiko
Quoted 70 lines
Signed-off-by Johan Jonker <[email protected]>--- 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>
PATCH v3 4/4 ARM: dts: rockchip: sort includes of dtsi files
In reply to Johan JonkerThe includes of Rockchip dtsi files have been subject of several patch styles, so give them a little alphabetical sort.
--- arch/arm/boot/dts/rk3036.dtsi | 2 +- arch/arm/boot/dts/rk3066a.dtsi | 2 +- arch/arm/boot/dts/rk3188.dtsi | 2 +- arch/arm/boot/dts/rk322x.dtsi | 2 +- arch/arm/boot/dts/rk3288-tinker.dtsi | 4 ++-- arch/arm/boot/dts/rk3288.dtsi | 4 ++-- arch/arm/boot/dts/rv1108.dtsi | 3 ++- 7 files changed, 10 insertions(+), 9 deletions(-)
arch/arm/boot/dts/rk3036.dtsi +1 -1
@@ -1,9 +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/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/rk3066a.dtsi +1 -1
@@ -4,9 +4,9 @@ * Author: Heiko Stuebner <[email protected]> */ +#include <dt-bindings/clock/rk3066a-cru.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/pinctrl/rockchip.h> -#include <dt-bindings/clock/rk3066a-cru.h> #include <dt-bindings/power/rk3066-power.h> #include "rk3xxx.dtsi"
arch/arm/boot/dts/rk3188.dtsi +1 -1
@@ -4,9 +4,9 @@ * Author: Heiko Stuebner <[email protected]> */ +#include <dt-bindings/clock/rk3188-cru.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/pinctrl/rockchip.h> -#include <dt-bindings/clock/rk3188-cru.h> #include <dt-bindings/power/rk3188-power.h> #include "rk3xxx.dtsi"
arch/arm/boot/dts/rk322x.dtsi +1 -1
@@ -1,9 +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/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-tinker.dtsi +2 -2
@@ -3,9 +3,9 @@ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. */ -#include "rk3288.dtsi" -#include <dt-bindings/input/input.h> #include <dt-bindings/clock/rockchip,rk808.h> +#include <dt-bindings/input/input.h> +#include "rk3288.dtsi" / { chosen {
arch/arm/boot/dts/rk3288.dtsi +2 -2
@@ -1,12 +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/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/rv1108.dtsi +2 -1
@@ -1,10 +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/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
Quoted 2 lines · Johan Jonker
There are 2 identical '#include' for '
rk3288-power.h', so remove one of them.
Applied, thanks!
[1/1] ARM: dts: rockchip: remove identical #include from rk3288.dtsi
Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>