[PATCH 1/8] arm: armv8: mmu: Prepare for common.h removal
If <common.h> won't be included before <asm/armv8/mmu.h>, we need to ensure that we have the required type definitions.
Signed-off-by: Paul Barker paul.barker.ct@bp.renesas.com --- arch/arm/include/asm/armv8/mmu.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h index 19a9e112a434..4f0adb07325f 100644 --- a/arch/arm/include/asm/armv8/mmu.h +++ b/arch/arm/include/asm/armv8/mmu.h @@ -118,6 +118,8 @@ #define HCR_EL2_E2H_BIT 34
#ifndef __ASSEMBLY__ +#include <linux/types.h> + static inline void set_ttbr_tcr_mair(int el, u64 table, u64 tcr, u64 attr) { asm volatile("dsb sy");
base-commit: a803f87202aa48974bdff4d8100464a8288931e4
For most source files we can just drop <common.h>. We need to add an include for <asm/u-boot.h> in a couple of places. Also sort the include list in memmap-gen3.c while we're here.
Signed-off-by: Paul Barker paul.barker.ct@bp.renesas.com --- arch/arm/mach-rmobile/board.c | 2 +- arch/arm/mach-rmobile/cpu_info-r8a7740.c | 2 +- arch/arm/mach-rmobile/cpu_info-rcar.c | 2 +- arch/arm/mach-rmobile/cpu_info-rzg.c | 2 +- arch/arm/mach-rmobile/cpu_info-rzg2l.c | 1 - arch/arm/mach-rmobile/cpu_info.c | 2 +- arch/arm/mach-rmobile/emac.c | 1 - arch/arm/mach-rmobile/memmap-gen3.c | 4 ++-- arch/arm/mach-rmobile/memmap-rzg2l.c | 2 +- arch/arm/mach-rmobile/pfc-r8a7740.c | 2 +- arch/arm/mach-rmobile/psci-r8a779a0.c | 1 - 11 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c index a10371f74e0c..79c7e02671f2 100644 --- a/arch/arm/mach-rmobile/board.c +++ b/arch/arm/mach-rmobile/board.c @@ -3,7 +3,7 @@ * (C) Copyright 2012 Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com * (C) Copyright 2012 Renesas Solutions Corp. */ -#include <common.h> + #include <init.h> #include <asm/io.h>
diff --git a/arch/arm/mach-rmobile/cpu_info-r8a7740.c b/arch/arm/mach-rmobile/cpu_info-r8a7740.c index dcbe25f37ab9..5a94235c4b9e 100644 --- a/arch/arm/mach-rmobile/cpu_info-r8a7740.c +++ b/arch/arm/mach-rmobile/cpu_info-r8a7740.c @@ -3,7 +3,7 @@ * (C) Copyright 2012 Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com * (C) Copyright 2012 Renesas Solutions Corp. */ -#include <common.h> + #include <asm/io.h>
u32 rmobile_get_cpu_type(void) diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c index 8fc4cd7f9de8..b9d8b5e57b5a 100644 --- a/arch/arm/mach-rmobile/cpu_info-rcar.c +++ b/arch/arm/mach-rmobile/cpu_info-rcar.c @@ -4,7 +4,7 @@ * * Copyright (C) 2013,2014 Renesas Electronics Corporation */ -#include <common.h> + #include <asm/io.h>
#define PRR_MASK 0x7fff diff --git a/arch/arm/mach-rmobile/cpu_info-rzg.c b/arch/arm/mach-rmobile/cpu_info-rzg.c index 1c18fd06f0b6..4ade4bc02198 100644 --- a/arch/arm/mach-rmobile/cpu_info-rzg.c +++ b/arch/arm/mach-rmobile/cpu_info-rzg.c @@ -3,7 +3,7 @@ * Copyright (C) 2021 Renesas Electronics Corporation * */ -#include <common.h> + #include <linux/libfdt.h>
/* If the firmware passed a device tree, use it for soc identification. */ diff --git a/arch/arm/mach-rmobile/cpu_info-rzg2l.c b/arch/arm/mach-rmobile/cpu_info-rzg2l.c index de4892ee901e..f69649dc7eaf 100644 --- a/arch/arm/mach-rmobile/cpu_info-rzg2l.c +++ b/arch/arm/mach-rmobile/cpu_info-rzg2l.c @@ -4,7 +4,6 @@ * */
-#include <common.h> #include <asm/io.h> #include <linux/libfdt.h>
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c index 6804b1da2cda..895c0f5336b6 100644 --- a/arch/arm/mach-rmobile/cpu_info.c +++ b/arch/arm/mach-rmobile/cpu_info.c @@ -3,7 +3,7 @@ * (C) Copyright 2012 Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com * (C) Copyright 2012-2021 Renesas Solutions Corp. */ -#include <common.h> + #include <cpu_func.h> #include <asm/cache.h> #include <init.h> diff --git a/arch/arm/mach-rmobile/emac.c b/arch/arm/mach-rmobile/emac.c index cb9bce0cf23b..95651626da4a 100644 --- a/arch/arm/mach-rmobile/emac.c +++ b/arch/arm/mach-rmobile/emac.c @@ -6,7 +6,6 @@ * Copyright (C) 2012 Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com */
-#include <common.h> #include <net.h> #include <linux/errno.h> #include <netdev.h> diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c index a68eb806b353..4dff9e07629d 100644 --- a/arch/arm/mach-rmobile/memmap-gen3.c +++ b/arch/arm/mach-rmobile/memmap-gen3.c @@ -5,10 +5,10 @@ * Copyright (C) 2017 Marek Vasut marek.vasut@gmail.com */
-#include <common.h> -#include <cpu_func.h> #include <asm/armv8/mmu.h> #include <asm/global_data.h> +#include <asm/u-boot.h> +#include <cpu_func.h>
#define GEN3_NR_REGIONS 16
diff --git a/arch/arm/mach-rmobile/memmap-rzg2l.c b/arch/arm/mach-rmobile/memmap-rzg2l.c index a08d0ea08fc0..9934a775220b 100644 --- a/arch/arm/mach-rmobile/memmap-rzg2l.c +++ b/arch/arm/mach-rmobile/memmap-rzg2l.c @@ -6,9 +6,9 @@ * Copyright (C) 2023 Renesas Electronics Corp. */
-#include <common.h> #include <asm/armv8/mmu.h> #include <asm/global_data.h> +#include <asm/u-boot.h> #include <cpu_func.h>
#define RZG2L_NR_REGIONS 16 diff --git a/arch/arm/mach-rmobile/pfc-r8a7740.c b/arch/arm/mach-rmobile/pfc-r8a7740.c index 5d42a68266b1..4f4847699b07 100644 --- a/arch/arm/mach-rmobile/pfc-r8a7740.c +++ b/arch/arm/mach-rmobile/pfc-r8a7740.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <common.h> + #include <sh_pfc.h> #include <asm/gpio.h> #include <asm/arch/irqs.h> diff --git a/arch/arm/mach-rmobile/psci-r8a779a0.c b/arch/arm/mach-rmobile/psci-r8a779a0.c index 6a85eb22cac2..b6c49e731f9d 100644 --- a/arch/arm/mach-rmobile/psci-r8a779a0.c +++ b/arch/arm/mach-rmobile/psci-r8a779a0.c @@ -6,7 +6,6 @@ * */
-#include <common.h> #include <asm/io.h> #include <asm/psci.h> #include <asm/secure.h>
Hi Paul,
Thanks for the patch.
Subject: [PATCH 2/8] arm: mach-rmobile: Drop <common.h>
For most source files we can just drop <common.h>. We need to add an include for <asm/u-boot.h> in a couple of places. Also sort the include list in memmap-gen3.c while we're here.
Why only sorting memmap-gen3.c? why not sorting all the files touching here?
Cheers, Biju
Signed-off-by: Paul Barker paul.barker.ct@bp.renesas.com
arch/arm/mach-rmobile/board.c | 2 +- arch/arm/mach-rmobile/cpu_info-r8a7740.c | 2 +- arch/arm/mach-rmobile/cpu_info-rcar.c | 2 +- arch/arm/mach-rmobile/cpu_info-rzg.c | 2 +- arch/arm/mach-rmobile/cpu_info-rzg2l.c | 1 - arch/arm/mach-rmobile/cpu_info.c | 2 +- arch/arm/mach-rmobile/emac.c | 1 - arch/arm/mach-rmobile/memmap-gen3.c | 4 ++-- arch/arm/mach-rmobile/memmap-rzg2l.c | 2 +- arch/arm/mach-rmobile/pfc-r8a7740.c | 2 +- arch/arm/mach-rmobile/psci-r8a779a0.c | 1 - 11 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c index a10371f74e0c..79c7e02671f2 100644 --- a/arch/arm/mach-rmobile/board.c +++ b/arch/arm/mach-rmobile/board.c @@ -3,7 +3,7 @@
- (C) Copyright 2012 Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com
- (C) Copyright 2012 Renesas Solutions Corp.
*/ -#include <common.h>
#include <init.h> #include <asm/io.h>
diff --git a/arch/arm/mach-rmobile/cpu_info-r8a7740.c b/arch/arm/mach- rmobile/cpu_info-r8a7740.c index dcbe25f37ab9..5a94235c4b9e 100644 --- a/arch/arm/mach-rmobile/cpu_info-r8a7740.c +++ b/arch/arm/mach-rmobile/cpu_info-r8a7740.c @@ -3,7 +3,7 @@
- (C) Copyright 2012 Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com
- (C) Copyright 2012 Renesas Solutions Corp.
*/ -#include <common.h>
#include <asm/io.h>
u32 rmobile_get_cpu_type(void) diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach- rmobile/cpu_info-rcar.c index 8fc4cd7f9de8..b9d8b5e57b5a 100644 --- a/arch/arm/mach-rmobile/cpu_info-rcar.c +++ b/arch/arm/mach-rmobile/cpu_info-rcar.c @@ -4,7 +4,7 @@
- Copyright (C) 2013,2014 Renesas Electronics Corporation
*/ -#include <common.h>
#include <asm/io.h>
#define PRR_MASK 0x7fff diff --git a/arch/arm/mach-rmobile/cpu_info-rzg.c b/arch/arm/mach- rmobile/cpu_info-rzg.c index 1c18fd06f0b6..4ade4bc02198 100644 --- a/arch/arm/mach-rmobile/cpu_info-rzg.c +++ b/arch/arm/mach-rmobile/cpu_info-rzg.c @@ -3,7 +3,7 @@
- Copyright (C) 2021 Renesas Electronics Corporation
*/ -#include <common.h>
#include <linux/libfdt.h>
/* If the firmware passed a device tree, use it for soc identification. */ diff --git a/arch/arm/mach-rmobile/cpu_info-rzg2l.c b/arch/arm/mach- rmobile/cpu_info-rzg2l.c index de4892ee901e..f69649dc7eaf 100644 --- a/arch/arm/mach-rmobile/cpu_info-rzg2l.c +++ b/arch/arm/mach-rmobile/cpu_info-rzg2l.c @@ -4,7 +4,6 @@
*/
-#include <common.h> #include <asm/io.h> #include <linux/libfdt.h>
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach- rmobile/cpu_info.c index 6804b1da2cda..895c0f5336b6 100644 --- a/arch/arm/mach-rmobile/cpu_info.c +++ b/arch/arm/mach-rmobile/cpu_info.c @@ -3,7 +3,7 @@
- (C) Copyright 2012 Nobuhiro Iwamatsu nobuhiro.iwamatsu.yj@renesas.com
- (C) Copyright 2012-2021 Renesas Solutions Corp.
*/ -#include <common.h>
#include <cpu_func.h> #include <asm/cache.h> #include <init.h> diff --git a/arch/arm/mach-rmobile/emac.c b/arch/arm/mach-rmobile/emac.c index cb9bce0cf23b..95651626da4a 100644 --- a/arch/arm/mach-rmobile/emac.c +++ b/arch/arm/mach-rmobile/emac.c @@ -6,7 +6,6 @@
- Copyright (C) 2012 Nobuhiro Iwamatsu
nobuhiro.iwamatsu.yj@renesas.com */
-#include <common.h> #include <net.h> #include <linux/errno.h> #include <netdev.h> diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach- rmobile/memmap-gen3.c index a68eb806b353..4dff9e07629d 100644 --- a/arch/arm/mach-rmobile/memmap-gen3.c +++ b/arch/arm/mach-rmobile/memmap-gen3.c @@ -5,10 +5,10 @@
- Copyright (C) 2017 Marek Vasut marek.vasut@gmail.com
*/
-#include <common.h> -#include <cpu_func.h> #include <asm/armv8/mmu.h> #include <asm/global_data.h> +#include <asm/u-boot.h> +#include <cpu_func.h>
#define GEN3_NR_REGIONS 16
diff --git a/arch/arm/mach-rmobile/memmap-rzg2l.c b/arch/arm/mach- rmobile/memmap-rzg2l.c index a08d0ea08fc0..9934a775220b 100644 --- a/arch/arm/mach-rmobile/memmap-rzg2l.c +++ b/arch/arm/mach-rmobile/memmap-rzg2l.c @@ -6,9 +6,9 @@
- Copyright (C) 2023 Renesas Electronics Corp.
*/
-#include <common.h> #include <asm/armv8/mmu.h> #include <asm/global_data.h> +#include <asm/u-boot.h> #include <cpu_func.h>
#define RZG2L_NR_REGIONS 16 diff --git a/arch/arm/mach-rmobile/pfc-r8a7740.c b/arch/arm/mach- rmobile/pfc-r8a7740.c index 5d42a68266b1..4f4847699b07 100644 --- a/arch/arm/mach-rmobile/pfc-r8a7740.c +++ b/arch/arm/mach-rmobile/pfc-r8a7740.c @@ -18,7 +18,7 @@
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA */ -#include <common.h>
#include <sh_pfc.h> #include <asm/gpio.h> #include <asm/arch/irqs.h> diff --git a/arch/arm/mach-rmobile/psci-r8a779a0.c b/arch/arm/mach- rmobile/psci-r8a779a0.c index 6a85eb22cac2..b6c49e731f9d 100644 --- a/arch/arm/mach-rmobile/psci-r8a779a0.c +++ b/arch/arm/mach-rmobile/psci-r8a779a0.c @@ -6,7 +6,6 @@
*/
-#include <common.h> #include <asm/io.h> #include <asm/psci.h>
#include <asm/secure.h>
2.39.2
On Thu, Nov 02, 2023 at 07:54:37AM +0000, Biju Das wrote:
Hi Paul,
Thanks for the patch.
Subject: [PATCH 2/8] arm: mach-rmobile: Drop <common.h>
For most source files we can just drop <common.h>. We need to add an include for <asm/u-boot.h> in a couple of places. Also sort the include list in memmap-gen3.c while we're here.
Why only sorting memmap-gen3.c? why not sorting all the files touching here?
That was the only file where I needed to add a new include and it wasn't already sorted.
Thanks, Paul
In line with changes elsewhere, drop inclusion of the common header.
Signed-off-by: Paul Barker paul.barker.ct@bp.renesas.com --- drivers/serial/serial_sh.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index c034ab54e152..e4cc4ee42603 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -6,7 +6,6 @@ * Copyright (C) 2002 - 2008 Paul Mundt */
-#include <common.h> #include <asm/global_data.h> #include <asm/io.h> #include <asm/processor.h>
In line with changes elsewhere, drop inclusion of the common header.
Signed-off-by: Paul Barker paul.barker.ct@bp.renesas.com --- drivers/pinctrl/renesas/rzg2l-pfc.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/drivers/pinctrl/renesas/rzg2l-pfc.c b/drivers/pinctrl/renesas/rzg2l-pfc.c index 7b045f75d3f9..e88ec1c18373 100644 --- a/drivers/pinctrl/renesas/rzg2l-pfc.c +++ b/drivers/pinctrl/renesas/rzg2l-pfc.c @@ -5,7 +5,6 @@ * Copyright (C) 2021-2023 Renesas Electronics Corp. */
-#include <common.h> #include <asm/io.h> #include <clk.h> #include <dm.h>
In line with changes elsewhere, drop inclusion of the common header.
Signed-off-by: Paul Barker paul.barker.ct@bp.renesas.com --- drivers/mmc/renesas-sdhi.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c index 865efdd32184..8cd501c5f7c7 100644 --- a/drivers/mmc/renesas-sdhi.c +++ b/drivers/mmc/renesas-sdhi.c @@ -3,7 +3,6 @@ * Copyright (C) 2018 Marek Vasut marek.vasut@gmail.com */
-#include <common.h> #include <bouncebuf.h> #include <clk.h> #include <fdtdec.h>
On 11/2/23 05:05, Paul Barker wrote:
In line with changes elsewhere, drop inclusion of the common header.
Signed-off-by: Paul Barker paul.barker.ct@bp.renesas.com
Reviewed-by: Jaehoon Chung jh80.chung@samsung.com
Best Regards, Jaehoon Chung
drivers/mmc/renesas-sdhi.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c index 865efdd32184..8cd501c5f7c7 100644 --- a/drivers/mmc/renesas-sdhi.c +++ b/drivers/mmc/renesas-sdhi.c @@ -3,7 +3,6 @@
- Copyright (C) 2018 Marek Vasut marek.vasut@gmail.com
*/
-#include <common.h> #include <bouncebuf.h> #include <clk.h> #include <fdtdec.h>
In line with changes elsewhere, drop inclusion of the common header.
Signed-off-by: Paul Barker paul.barker.ct@bp.renesas.com --- drivers/gpio/rzg2l-gpio.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/drivers/gpio/rzg2l-gpio.c b/drivers/gpio/rzg2l-gpio.c index 7c908d05475a..2477af7874b8 100644 --- a/drivers/gpio/rzg2l-gpio.c +++ b/drivers/gpio/rzg2l-gpio.c @@ -5,7 +5,6 @@ * Copyright (C) 2021-2023 Renesas Electronics Corp. */
-#include <common.h> #include <asm-generic/gpio.h> #include <asm/io.h> #include <dm/device.h>
In line with changes elsewhere, drop inclusion of the common header.
Signed-off-by: Paul Barker paul.barker.ct@bp.renesas.com --- drivers/clk/renesas/r9a07g044-cpg.c | 1 - drivers/clk/renesas/rzg2l-cpg.c | 1 - 2 files changed, 2 deletions(-)
diff --git a/drivers/clk/renesas/r9a07g044-cpg.c b/drivers/clk/renesas/r9a07g044-cpg.c index 2336028a7367..c8baad1a6c8d 100644 --- a/drivers/clk/renesas/r9a07g044-cpg.c +++ b/drivers/clk/renesas/r9a07g044-cpg.c @@ -5,7 +5,6 @@ * Copyright (C) 2021-2023 Renesas Electronics Corp. */
-#include <common.h> #include <dm/device.h> #include <dt-bindings/clock/r9a07g044-cpg.h> #include <linux/clk-provider.h> diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cpg.c index 3295ebb90ba2..e54508c35ce2 100644 --- a/drivers/clk/renesas/rzg2l-cpg.c +++ b/drivers/clk/renesas/rzg2l-cpg.c @@ -11,7 +11,6 @@ * Copyright (C) 2015 Renesas Electronics Corp. */
-#include <common.h> #include <asm/io.h> #include <clk-uclass.h> #include <dm.h>
In line with changes elsewhere, drop inclusion of the common header.
Signed-off-by: Paul Barker paul.barker.ct@bp.renesas.com --- board/renesas/rzg2l/rzg2l.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/board/renesas/rzg2l/rzg2l.c b/board/renesas/rzg2l/rzg2l.c index 755747e665cb..73201a8c69e5 100644 --- a/board/renesas/rzg2l/rzg2l.c +++ b/board/renesas/rzg2l/rzg2l.c @@ -4,7 +4,6 @@ * Copyright (C) 2023 Renesas Electronics Corporation */
-#include <common.h> #include <fdtdec.h> #include <linux/libfdt.h>
participants (3)
-
Biju Das -
Jaehoon Chung -
Paul Barker