From 4c425570214cac091d9bdcf840b936062fb8da12 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Fri, 27 Feb 2015 02:26:42 +0900
Subject: [PATCH] ARM: UniPhier: move SoC sources to mach-uniphier
Move
arch/arm/cpu/armv7/uniphier/* -> arch/arm/mach-uniphier/*
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
MAINTAINERS | 2 +-
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 1 +
arch/arm/cpu/armv7/Makefile | 1 -
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/Kconfig | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/Makefile | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_common.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/board_early_init_f.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/board_early_init_r.c | 0
.../arm/{cpu/armv7/uniphier => mach-uniphier}/board_late_init.c | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cache_uniphier.c | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cmd_ddrphy.c | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cmd_pinmon.c | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cpu_info.c | 0
.../arm/{cpu/armv7/uniphier => mach-uniphier}/ddrphy_training.c | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/dram_init.c | 0
.../arm/{cpu/armv7/uniphier => mach-uniphier}/init_page_table.S | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/lowlevel_init.S | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/Makefile | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/bcu_init.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/boot-mode.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/clkrst_init.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/ddrphy_init.c | 0
.../armv7/uniphier => mach-uniphier}/ph1-ld4/lowlevel_debug.S | 0
.../arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pinctrl.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/platdevice.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pll_init.c | 0
.../armv7/uniphier => mach-uniphier}/ph1-ld4/pll_spectrum.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/sbc_init.c | 0
.../arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/sg_init.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/umc_init.c | 0
.../arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/Makefile | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/boot-mode.c | 0
.../armv7/uniphier => mach-uniphier}/ph1-pro4/clkrst_init.c | 0
.../armv7/uniphier => mach-uniphier}/ph1-pro4/ddrphy_init.c | 0
.../armv7/uniphier => mach-uniphier}/ph1-pro4/lowlevel_debug.S | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pinctrl.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/platdevice.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pll_init.c | 0
.../armv7/uniphier => mach-uniphier}/ph1-pro4/pll_spectrum.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/sbc_init.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/sg_init.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/umc_init.c | 0
.../arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/Makefile | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/bcu_init.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/boot-mode.c | 0
.../armv7/uniphier => mach-uniphier}/ph1-sld8/clkrst_init.c | 0
.../armv7/uniphier => mach-uniphier}/ph1-sld8/ddrphy_init.c | 0
.../armv7/uniphier => mach-uniphier}/ph1-sld8/lowlevel_debug.S | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pinctrl.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/platdevice.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pll_init.c | 0
.../armv7/uniphier => mach-uniphier}/ph1-sld8/pll_spectrum.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/sbc_init.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/sg_init.c | 0
.../{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/umc_init.c | 0
.../arm/{cpu/armv7/uniphier => mach-uniphier}/print_misc_info.c | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/reset.c | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/smp.S | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/spl.c | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/support_card.c | 0
arch/arm/{cpu/armv7/uniphier => mach-uniphier}/timer.c | 0
62 files changed, 3 insertions(+), 3 deletions(-)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/Kconfig (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/Makefile (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_common.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_early_init_f.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_early_init_r.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_late_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cache_uniphier.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cmd_ddrphy.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cmd_pinmon.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/cpu_info.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ddrphy_training.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/dram_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/init_page_table.S (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/lowlevel_init.S (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/Makefile (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/bcu_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/boot-mode.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/clkrst_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/ddrphy_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/lowlevel_debug.S (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pinctrl.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/platdevice.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pll_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pll_spectrum.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/sbc_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/sg_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/umc_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/Makefile (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/boot-mode.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/clkrst_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/ddrphy_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/lowlevel_debug.S (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pinctrl.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/platdevice.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pll_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pll_spectrum.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/sbc_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/sg_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/umc_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/Makefile (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/bcu_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/boot-mode.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/clkrst_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/ddrphy_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/lowlevel_debug.S (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pinctrl.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/platdevice.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pll_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pll_spectrum.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/sbc_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/sg_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/umc_init.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/print_misc_info.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/reset.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/smp.S (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/spl.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/support_card.c (100%)
rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/timer.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index eef70d0f68..f9d1987289 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -162,7 +162,7 @@ ARM UNIPHIER
M: Masahiro Yamada <yamada.m@jp.panasonic.com>
S: Maintained
T: git git://git.denx.de/u-boot-uniphier.git
-F: arch/arm/cpu/armv7/uniphier/
+F: arch/arm/mach-uniphier/
F: arch/arm/include/asm/arch-uniphier/
F: configs/ph1_*_defconfig
N: uniphier
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7a2f91c48e..2265afb77c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -723,7 +723,7 @@ source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
source "arch/arm/mach-tegra/Kconfig"
-source "arch/arm/cpu/armv7/uniphier/Kconfig"
+source "arch/arm/mach-uniphier/Kconfig"
source "arch/arm/mach-versatile/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 878ae26ce4..08946de244 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -15,6 +15,7 @@ machine-$(CONFIG_ARCH_NOMADIK) += nomadik
# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
machine-$(CONFIG_ORION5X) += orion5x
machine-$(CONFIG_TEGRA) += tegra
+machine-$(CONFIG_ARCH_UNIPHIER) += uniphier
machine-$(CONFIG_ARCH_VERSATILE) += versatile
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
index b228ed6a2e..ad22489e1a 100644
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -56,6 +56,5 @@ obj-$(CONFIG_SOCFPGA) += socfpga/
obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/
obj-$(CONFIG_ARCH_SUNXI) += sunxi/
obj-$(CONFIG_U8500) += u8500/
-obj-$(CONFIG_ARCH_UNIPHIER) += uniphier/
obj-$(CONFIG_VF610) += vf610/
obj-$(CONFIG_ZYNQ) += zynq/
diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/Kconfig
rename to arch/arm/mach-uniphier/Kconfig
diff --git a/arch/arm/cpu/armv7/uniphier/Makefile b/arch/arm/mach-uniphier/Makefile
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/Makefile
rename to arch/arm/mach-uniphier/Makefile
diff --git a/arch/arm/cpu/armv7/uniphier/board_common.c b/arch/arm/mach-uniphier/board_common.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/board_common.c
rename to arch/arm/mach-uniphier/board_common.c
diff --git a/arch/arm/cpu/armv7/uniphier/board_early_init_f.c b/arch/arm/mach-uniphier/board_early_init_f.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/board_early_init_f.c
rename to arch/arm/mach-uniphier/board_early_init_f.c
diff --git a/arch/arm/cpu/armv7/uniphier/board_early_init_r.c b/arch/arm/mach-uniphier/board_early_init_r.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/board_early_init_r.c
rename to arch/arm/mach-uniphier/board_early_init_r.c
diff --git a/arch/arm/cpu/armv7/uniphier/board_late_init.c b/arch/arm/mach-uniphier/board_late_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/board_late_init.c
rename to arch/arm/mach-uniphier/board_late_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/cache_uniphier.c b/arch/arm/mach-uniphier/cache_uniphier.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/cache_uniphier.c
rename to arch/arm/mach-uniphier/cache_uniphier.c
diff --git a/arch/arm/cpu/armv7/uniphier/cmd_ddrphy.c b/arch/arm/mach-uniphier/cmd_ddrphy.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/cmd_ddrphy.c
rename to arch/arm/mach-uniphier/cmd_ddrphy.c
diff --git a/arch/arm/cpu/armv7/uniphier/cmd_pinmon.c b/arch/arm/mach-uniphier/cmd_pinmon.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/cmd_pinmon.c
rename to arch/arm/mach-uniphier/cmd_pinmon.c
diff --git a/arch/arm/cpu/armv7/uniphier/cpu_info.c b/arch/arm/mach-uniphier/cpu_info.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/cpu_info.c
rename to arch/arm/mach-uniphier/cpu_info.c
diff --git a/arch/arm/cpu/armv7/uniphier/ddrphy_training.c b/arch/arm/mach-uniphier/ddrphy_training.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ddrphy_training.c
rename to arch/arm/mach-uniphier/ddrphy_training.c
diff --git a/arch/arm/cpu/armv7/uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/dram_init.c
rename to arch/arm/mach-uniphier/dram_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/init_page_table.S b/arch/arm/mach-uniphier/init_page_table.S
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/init_page_table.S
rename to arch/arm/mach-uniphier/init_page_table.S
diff --git a/arch/arm/cpu/armv7/uniphier/lowlevel_init.S b/arch/arm/mach-uniphier/lowlevel_init.S
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/lowlevel_init.S
rename to arch/arm/mach-uniphier/lowlevel_init.S
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile b/arch/arm/mach-uniphier/ph1-ld4/Makefile
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile
rename to arch/arm/mach-uniphier/ph1-ld4/Makefile
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/bcu_init.c b/arch/arm/mach-uniphier/ph1-ld4/bcu_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/bcu_init.c
rename to arch/arm/mach-uniphier/ph1-ld4/bcu_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/boot-mode.c b/arch/arm/mach-uniphier/ph1-ld4/boot-mode.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/boot-mode.c
rename to arch/arm/mach-uniphier/ph1-ld4/boot-mode.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c b/arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c
rename to arch/arm/mach-uniphier/ph1-ld4/clkrst_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/ddrphy_init.c b/arch/arm/mach-uniphier/ph1-ld4/ddrphy_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/ddrphy_init.c
rename to arch/arm/mach-uniphier/ph1-ld4/ddrphy_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/lowlevel_debug.S b/arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/lowlevel_debug.S
rename to arch/arm/mach-uniphier/ph1-ld4/lowlevel_debug.S
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/pinctrl.c b/arch/arm/mach-uniphier/ph1-ld4/pinctrl.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/pinctrl.c
rename to arch/arm/mach-uniphier/ph1-ld4/pinctrl.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/platdevice.c b/arch/arm/mach-uniphier/ph1-ld4/platdevice.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/platdevice.c
rename to arch/arm/mach-uniphier/ph1-ld4/platdevice.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_init.c b/arch/arm/mach-uniphier/ph1-ld4/pll_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_init.c
rename to arch/arm/mach-uniphier/ph1-ld4/pll_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_spectrum.c b/arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_spectrum.c
rename to arch/arm/mach-uniphier/ph1-ld4/pll_spectrum.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c b/arch/arm/mach-uniphier/ph1-ld4/sbc_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c
rename to arch/arm/mach-uniphier/ph1-ld4/sbc_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c b/arch/arm/mach-uniphier/ph1-ld4/sg_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c
rename to arch/arm/mach-uniphier/ph1-ld4/sg_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/umc_init.c b/arch/arm/mach-uniphier/ph1-ld4/umc_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/umc_init.c
rename to arch/arm/mach-uniphier/ph1-ld4/umc_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile b/arch/arm/mach-uniphier/ph1-pro4/Makefile
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile
rename to arch/arm/mach-uniphier/ph1-pro4/Makefile
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c b/arch/arm/mach-uniphier/ph1-pro4/boot-mode.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c
rename to arch/arm/mach-uniphier/ph1-pro4/boot-mode.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c b/arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c
rename to arch/arm/mach-uniphier/ph1-pro4/clkrst_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/ddrphy_init.c b/arch/arm/mach-uniphier/ph1-pro4/ddrphy_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/ddrphy_init.c
rename to arch/arm/mach-uniphier/ph1-pro4/ddrphy_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/lowlevel_debug.S b/arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/lowlevel_debug.S
rename to arch/arm/mach-uniphier/ph1-pro4/lowlevel_debug.S
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/pinctrl.c b/arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/pinctrl.c
rename to arch/arm/mach-uniphier/ph1-pro4/pinctrl.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/platdevice.c b/arch/arm/mach-uniphier/ph1-pro4/platdevice.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/platdevice.c
rename to arch/arm/mach-uniphier/ph1-pro4/platdevice.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/pll_init.c b/arch/arm/mach-uniphier/ph1-pro4/pll_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/pll_init.c
rename to arch/arm/mach-uniphier/ph1-pro4/pll_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/pll_spectrum.c b/arch/arm/mach-uniphier/ph1-pro4/pll_spectrum.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/pll_spectrum.c
rename to arch/arm/mach-uniphier/ph1-pro4/pll_spectrum.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c b/arch/arm/mach-uniphier/ph1-pro4/sbc_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c
rename to arch/arm/mach-uniphier/ph1-pro4/sbc_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c b/arch/arm/mach-uniphier/ph1-pro4/sg_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c
rename to arch/arm/mach-uniphier/ph1-pro4/sg_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/umc_init.c b/arch/arm/mach-uniphier/ph1-pro4/umc_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/umc_init.c
rename to arch/arm/mach-uniphier/ph1-pro4/umc_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile b/arch/arm/mach-uniphier/ph1-sld8/Makefile
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile
rename to arch/arm/mach-uniphier/ph1-sld8/Makefile
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/bcu_init.c b/arch/arm/mach-uniphier/ph1-sld8/bcu_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/bcu_init.c
rename to arch/arm/mach-uniphier/ph1-sld8/bcu_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/boot-mode.c b/arch/arm/mach-uniphier/ph1-sld8/boot-mode.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/boot-mode.c
rename to arch/arm/mach-uniphier/ph1-sld8/boot-mode.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c b/arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c
rename to arch/arm/mach-uniphier/ph1-sld8/clkrst_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/ddrphy_init.c b/arch/arm/mach-uniphier/ph1-sld8/ddrphy_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/ddrphy_init.c
rename to arch/arm/mach-uniphier/ph1-sld8/ddrphy_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/lowlevel_debug.S b/arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/lowlevel_debug.S
rename to arch/arm/mach-uniphier/ph1-sld8/lowlevel_debug.S
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/pinctrl.c b/arch/arm/mach-uniphier/ph1-sld8/pinctrl.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/pinctrl.c
rename to arch/arm/mach-uniphier/ph1-sld8/pinctrl.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/platdevice.c b/arch/arm/mach-uniphier/ph1-sld8/platdevice.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/platdevice.c
rename to arch/arm/mach-uniphier/ph1-sld8/platdevice.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/pll_init.c b/arch/arm/mach-uniphier/ph1-sld8/pll_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/pll_init.c
rename to arch/arm/mach-uniphier/ph1-sld8/pll_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/pll_spectrum.c b/arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/pll_spectrum.c
rename to arch/arm/mach-uniphier/ph1-sld8/pll_spectrum.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c b/arch/arm/mach-uniphier/ph1-sld8/sbc_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c
rename to arch/arm/mach-uniphier/ph1-sld8/sbc_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/sg_init.c b/arch/arm/mach-uniphier/ph1-sld8/sg_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/sg_init.c
rename to arch/arm/mach-uniphier/ph1-sld8/sg_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/umc_init.c b/arch/arm/mach-uniphier/ph1-sld8/umc_init.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/umc_init.c
rename to arch/arm/mach-uniphier/ph1-sld8/umc_init.c
diff --git a/arch/arm/cpu/armv7/uniphier/print_misc_info.c b/arch/arm/mach-uniphier/print_misc_info.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/print_misc_info.c
rename to arch/arm/mach-uniphier/print_misc_info.c
diff --git a/arch/arm/cpu/armv7/uniphier/reset.c b/arch/arm/mach-uniphier/reset.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/reset.c
rename to arch/arm/mach-uniphier/reset.c
diff --git a/arch/arm/cpu/armv7/uniphier/smp.S b/arch/arm/mach-uniphier/smp.S
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/smp.S
rename to arch/arm/mach-uniphier/smp.S
diff --git a/arch/arm/cpu/armv7/uniphier/spl.c b/arch/arm/mach-uniphier/spl.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/spl.c
rename to arch/arm/mach-uniphier/spl.c
diff --git a/arch/arm/cpu/armv7/uniphier/support_card.c b/arch/arm/mach-uniphier/support_card.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/support_card.c
rename to arch/arm/mach-uniphier/support_card.c
diff --git a/arch/arm/cpu/armv7/uniphier/timer.c b/arch/arm/mach-uniphier/timer.c
similarity index 100%
rename from arch/arm/cpu/armv7/uniphier/timer.c
rename to arch/arm/mach-uniphier/timer.c
--
2.39.5