Skip to contentSkip to conversation

ARM: dts: rockchip: remove identical #include from rk3288.dtsi

PATCH Applied Johan Jonker 2 participants 6 messages Apr 3, 2020 – May 18, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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
index e72368a7a..f102fec69 100644
@@ -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
#1 lore raw

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
index 781ac7583..8be47354d 100644
@@ -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
index c14891fe8..86c4d62fc 100644
@@ -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
index f102fec69..ace67aa7d 100644
@@ -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
index f9fcb7e96..c79d98edd 100644
@@ -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
index b453f8d0f..7d2ef39db 100644
@@ -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
#2 lore raw

PATCH v3 3/4 arm64: dts: rockchip: remove include for irq.h

In reply to Johan Jonker

The '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
index 6f7171290..4820edc7f 100644
@@ -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
index ac43bc3f7..a9b98555d 100644
@@ -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
index 470783a48..175060695 100644
@@ -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
index 1ebb0eef4..f22475016 100644
@@ -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
index 0d895cff5..123b7402a 100644
@@ -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
maintainer
#3 lore raw

Re: [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
---
 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
index 6f7171290..4820edc7f 100644
@@ -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
index ac43bc3f7..a9b98555d 100644
@@ -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
index 470783a48..175060695 100644
@@ -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
index 1ebb0eef4..f22475016 100644
@@ -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
index 0d895cff5..123b7402a 100644
@@ -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>
#4 lore raw

PATCH v3 4/4 ARM: dts: rockchip: sort includes of dtsi files

In reply to Johan Jonker

The 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
index 8be47354d..55f3838b2 100644
@@ -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
index 1cf7e1b38..9924def56 100644
@@ -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
index 2298a8d84..e22bfc612 100644
@@ -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
index 86c4d62fc..d5a1aad17 100644
@@ -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
index 77ae303b0..60259d9eb 100644
@@ -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
index ace67aa7d..a56b4a58f 100644
@@ -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
index 7d2ef39db..06c46bed9 100644
@@ -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
maintainer Applied
#5 lore raw
In reply to Johan Jonker
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]>