Similar changes was done for Zynq in past and this patch just follow this pattern to separate cpu code from SoC code.
Move arch/arm/cpu/armv8/zynqmp/* -> arch/arm/mach-zynqmp/* And also fix references to these files.
Based on "ARM: zynq: move SoC sources to mach-zynq" (sha1: 0107f2403669f764ab726d0d404e35bb9447bbcc)
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
MAINTAINERS | 2 +- arch/arm/Kconfig | 4 ++-- arch/arm/Makefile | 1 + arch/arm/cpu/armv8/Makefile | 1 - arch/arm/mach-k3/arm64-mmu.c | 2 +- arch/arm/mach-tegra/arm64-mmu.c | 2 +- arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/Kconfig | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/Makefile | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/clk.c | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/cpu.c | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/handoff.c | 0 arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/clk.h | 0 arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/gpio.h | 0 .../{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/hardware.h | 0 .../asm/arch-zynqmp => mach-zynqmp/include/mach}/psu_init_gpl.h | 0 .../{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/sys_proto.h | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/mp.c | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/psu_spl_init.c | 0 arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/spl.c | 0 19 files changed, 6 insertions(+), 6 deletions(-) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/Kconfig (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/Makefile (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/clk.c (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/cpu.c (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/handoff.c (100%) rename arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/clk.h (100%) rename arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/hardware.h (100%) rename arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/psu_init_gpl.h (100%) rename arch/arm/{include/asm/arch-zynqmp => mach-zynqmp/include/mach}/sys_proto.h (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/mp.c (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/psu_spl_init.c (100%) rename arch/arm/{cpu/armv8/zynqmp => mach-zynqmp}/spl.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS index e192db075489..2386bebaea68 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -354,7 +354,7 @@ ARM ZYNQMP M: Michal Simek michal.simek@xilinx.com S: Maintained T: git git://git.denx.de/u-boot-microblaze.git -F: arch/arm/cpu/armv8/zynqmp/ +F: arch/arm/mach-zynqmp/ F: drivers/clk/clk_zynqmp.c F: drivers/fpga/zynqpl.c F: drivers/gpio/zynq_gpio.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a65e0c52116c..2298e6e7d750 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1503,14 +1503,14 @@ source "arch/arm/cpu/armv7/vf610/Kconfig"
source "arch/arm/mach-zynq/Kconfig"
+source "arch/arm/mach-zynqmp/Kconfig" + source "arch/arm/mach-versal/Kconfig"
source "arch/arm/mach-zynqmp-r5/Kconfig"
source "arch/arm/cpu/armv7/Kconfig"
-source "arch/arm/cpu/armv8/zynqmp/Kconfig" - source "arch/arm/cpu/armv8/Kconfig"
source "arch/arm/mach-imx/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 87d9d4b9f744..817302523aec 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -81,6 +81,7 @@ machine-$(CONFIG_ARCH_STM32MP) += stm32mp machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_ZYNQ) += zynq +machine-$(CONFIG_ARCH_ZYNQMP) += zynqmp machine-$(CONFIG_ARCH_VERSAL) += versal machine-$(CONFIG_ARCH_ZYNQMP_R5) += zynqmp-r5
diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile index 52c8daa04962..4c4b13c9e759 100644 --- a/arch/arm/cpu/armv8/Makefile +++ b/arch/arm/cpu/armv8/Makefile @@ -29,7 +29,6 @@ obj-$(CONFIG_$(SPL_)ARMV8_SEC_FIRMWARE_SUPPORT) += sec_firmware.o sec_firmware_a
obj-$(CONFIG_FSL_LAYERSCAPE) += fsl-layerscape/ obj-$(CONFIG_S32V234) += s32v234/ -obj-$(CONFIG_ARCH_ZYNQMP) += zynqmp/ obj-$(CONFIG_TARGET_HIKEY) += hisilicon/ obj-$(CONFIG_ARMV8_PSCI) += psci.o obj-$(CONFIG_ARCH_SUNXI) += lowlevel_init.o diff --git a/arch/arm/mach-k3/arm64-mmu.c b/arch/arm/mach-k3/arm64-mmu.c index f8b93fe45849..a75ba1ffdba0 100644 --- a/arch/arm/mach-k3/arm64-mmu.c +++ b/arch/arm/mach-k3/arm64-mmu.c @@ -4,7 +4,7 @@ * * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ * Lokesh Vutla lokeshvutla@ti.com - * (This file is derived from arch/arm/cpu/armv8/zynqmp/cpu.c) + * (This file is derived from arch/arm/mach-zynqmp/cpu.c) * */
diff --git a/arch/arm/mach-tegra/arm64-mmu.c b/arch/arm/mach-tegra/arm64-mmu.c index 702fde1dea1d..d45b1faaa2c2 100644 --- a/arch/arm/mach-tegra/arm64-mmu.c +++ b/arch/arm/mach-tegra/arm64-mmu.c @@ -2,7 +2,7 @@ /* * (C) Copyright 2014 - 2015 Xilinx, Inc. * Michal Simek michal.simek@xilinx.com - * (This file derived from arch/arm/cpu/armv8/zynqmp/cpu.c) + * (This file derived from arch/arm/mach-zynqmp/cpu.c) * * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved. */ diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/Kconfig rename to arch/arm/mach-zynqmp/Kconfig diff --git a/arch/arm/cpu/armv8/zynqmp/Makefile b/arch/arm/mach-zynqmp/Makefile similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/Makefile rename to arch/arm/mach-zynqmp/Makefile diff --git a/arch/arm/cpu/armv8/zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/clk.c rename to arch/arm/mach-zynqmp/clk.c diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/cpu.c rename to arch/arm/mach-zynqmp/cpu.c diff --git a/arch/arm/cpu/armv8/zynqmp/handoff.c b/arch/arm/mach-zynqmp/handoff.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/handoff.c rename to arch/arm/mach-zynqmp/handoff.c diff --git a/arch/arm/include/asm/arch-zynqmp/clk.h b/arch/arm/mach-zynqmp/include/mach/clk.h similarity index 100% rename from arch/arm/include/asm/arch-zynqmp/clk.h rename to arch/arm/mach-zynqmp/include/mach/clk.h diff --git a/arch/arm/include/asm/arch-zynqmp/gpio.h b/arch/arm/mach-zynqmp/include/mach/gpio.h similarity index 100% rename from arch/arm/include/asm/arch-zynqmp/gpio.h rename to arch/arm/mach-zynqmp/include/mach/gpio.h diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h similarity index 100% rename from arch/arm/include/asm/arch-zynqmp/hardware.h rename to arch/arm/mach-zynqmp/include/mach/hardware.h diff --git a/arch/arm/include/asm/arch-zynqmp/psu_init_gpl.h b/arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h similarity index 100% rename from arch/arm/include/asm/arch-zynqmp/psu_init_gpl.h rename to arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h similarity index 100% rename from arch/arm/include/asm/arch-zynqmp/sys_proto.h rename to arch/arm/mach-zynqmp/include/mach/sys_proto.h diff --git a/arch/arm/cpu/armv8/zynqmp/mp.c b/arch/arm/mach-zynqmp/mp.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/mp.c rename to arch/arm/mach-zynqmp/mp.c diff --git a/arch/arm/cpu/armv8/zynqmp/psu_spl_init.c b/arch/arm/mach-zynqmp/psu_spl_init.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/psu_spl_init.c rename to arch/arm/mach-zynqmp/psu_spl_init.c diff --git a/arch/arm/cpu/armv8/zynqmp/spl.c b/arch/arm/mach-zynqmp/spl.c similarity index 100% rename from arch/arm/cpu/armv8/zynqmp/spl.c rename to arch/arm/mach-zynqmp/spl.c