[PATCH v2 13/20] rockchip: migrate hardware.h inclusion into appropriate files

[Quentin Schulz]

Hi Johan,

On 2/9/24 14:07, Johan Jonker wrote:
[...]

> 
>  From codingstyle.rst:
> 
> You should follow this ordering in U-Boot.
> The common.h header (which is going away at some point) should always be first,
> followed by other headers in order, then headers with directories, then local files.
> Within that order, sort your includes.
> 

Good catch indeed. I'll avoid resending a 20-patch series today though.

I have the following diff that can be applied on top of that commit:

"""
diff --git a/drivers/ram/rockchip/dmc-rk3368.c 
b/drivers/ram/rockchip/dmc-rk3368.c
index 74d8aed571c..859fc47030f 100644
--- a/drivers/ram/rockchip/dmc-rk3368.c
+++ b/drivers/ram/rockchip/dmc-rk3368.c
@@ -17,10 +17,10 @@
  #include <asm/arch-rockchip/clock.h>
  #include <asm/arch-rockchip/cru_rk3368.h>
  #include <asm/arch-rockchip/grf_rk3368.h>
+#include <asm/arch-rockchip/hardware.h>
  #include <asm/arch-rockchip/ddr_rk3368.h>
  #include <asm/arch-rockchip/sdram.h>
  #include <asm/arch-rockchip/sdram_rk3288.h>
-#include <asm/arch-rockchip/hardware.h>
  #include <linux/bitops.h>
  #include <linux/delay.h>
  #include <linux/err.h>
diff --git a/drivers/ram/rockchip/sdram_rk3188.c 
b/drivers/ram/rockchip/sdram_rk3188.c
index 16a68885f1f..d23d4231798 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -22,10 +22,10 @@
  #include <asm/arch-rockchip/cru_rk3188.h>
  #include <asm/arch-rockchip/ddr_rk3188.h>
  #include <asm/arch-rockchip/grf_rk3188.h>
+#include <asm/arch-rockchip/hardware.h>
  #include <asm/arch-rockchip/pmu_rk3188.h>
  #include <asm/arch-rockchip/sdram.h>
  #include <asm/arch-rockchip/sdram_rk3288.h>
-#include <asm/arch-rockchip/hardware.h>
  #include <linux/delay.h>
  #include <linux/err.h>

diff --git a/drivers/ram/rockchip/sdram_rk3288.c 
b/drivers/ram/rockchip/sdram_rk3288.c
index ec6bdcb2015..3177051dd12 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -22,10 +22,10 @@
  #include <asm/arch-rockchip/cru.h>
  #include <asm/arch-rockchip/ddr_rk3288.h>
  #include <asm/arch-rockchip/grf_rk3288.h>
+#include <asm/arch-rockchip/hardware.h>
  #include <asm/arch-rockchip/pmu_rk3288.h>
  #include <asm/arch-rockchip/sdram.h>
  #include <asm/arch-rockchip/sdram_rk3288.h>
-#include <asm/arch-rockchip/hardware.h>
  #include <linux/delay.h>
  #include <linux/err.h>
  #include <power/regulator.h>
"""

You'll note that drivers/ram/rockchip/dmc-rk3368.c currently already 
doesn't follow the coding style :)

@Kever, up to you if you want me to send a v3 for that or if you can 
apply the diff above yourself before merging.

Cheers,
Quentin