From 93565cc94cc60fa6e170ff1fd5d25ef2ce746f4f Mon Sep 17 00:00:00 2001 From: Paul Barker <paul.barker.ct@bp.renesas.com> Date: Wed, 1 Nov 2023 20:05:53 +0000 Subject: [PATCH] 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. 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 a10371f74e..79c7e02671 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 dcbe25f37a..5a94235c4b 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 8fc4cd7f9d..b9d8b5e57b 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 1c18fd06f0..4ade4bc021 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 de4892ee90..f69649dc7e 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 6804b1da2c..895c0f5336 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 cb9bce0cf2..95651626da 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 a68eb806b3..4dff9e0762 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 a08d0ea08f..9934a77522 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 5d42a68266..4f4847699b 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 6a85eb22ca..b6c49e731f 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.5