From patchwork Sun Jan 25 06:11:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 432476 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 16F6F1401D0 for ; Sun, 25 Jan 2015 19:50:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 757BA4B7DF; Sun, 25 Jan 2015 09:49:46 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id R0lNSJrukx0s; Sun, 25 Jan 2015 09:49:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C94114B77A; Sun, 25 Jan 2015 09:49:25 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C4D5B4B6FC for ; Sun, 25 Jan 2015 07:12:32 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M6lH7OBXOfDX for ; Sun, 25 Jan 2015 07:12:32 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by theia.denx.de (Postfix) with ESMTPS id 67C514B70C for ; Sun, 25 Jan 2015 07:12:28 +0100 (CET) Received: by mail-pd0-f182.google.com with SMTP id z10so5828323pdj.13 for ; Sat, 24 Jan 2015 22:12:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=voetmXdyUTdLHphzk0x/VMicl48jGk0/GN9iMiSYKRI=; b=JhK2QygFNKEO6YIhwgPStnZ/5ZInnMjmdEDQ/oHYjM5u8Sh7kNR+UzcGl4pUvPNq0+ 8mbq0wrqcdzOZV6MiSJyTMFadJPUHoSS9E8BOTvjzjWML2RDJgzlRfsYazKlh6eN0vui /c6lJZfq9+ziaawE2au5FpZ4DMG5BRPuBl0S6abHvtiuhIuWqPWrxg7gI04DTdlEzEdd +cwaU1RGrisD/ko6CMW2z86GOyCGvIBsCTW0U/HIIt4/7rakRNsCIr2YWYTqKaBZ22YA weqQQEKvaoGj0dUhmpELJrsa6BbFQeQdQHHnLJoB9UCD600VjLSiHcjHsPu7OLcAqhx8 6/9Q== X-Received: by 10.66.254.232 with SMTP id al8mr24448088pad.76.1422166347623; Sat, 24 Jan 2015 22:12:27 -0800 (PST) Received: from oscar.sesame (112.136.111.86.er.eaccess.ne.jp. [112.136.111.86]) by mx.google.com with ESMTPSA id sm4sm6438237pab.22.2015.01.24.22.12.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 24 Jan 2015 22:12:26 -0800 (PST) From: Masahiro Yamada To: u-boot@lists.denx.de Date: Sun, 25 Jan 2015 15:11:07 +0900 Message-Id: <1422166283-20822-6-git-send-email-yamada.m@jp.panasonic.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422166283-20822-1-git-send-email-yamada.m@jp.panasonic.com> References: <1422166283-20822-1-git-send-email-yamada.m@jp.panasonic.com> X-Mailman-Approved-At: Sun, 25 Jan 2015 09:49:18 +0100 Cc: Steve Rae , "angelo@sysam.it" , Marc Zyngier , Pavel Machek , Tim Kryger , Ian Campbell , Tom Rini , Darwin Rambo , Stefan Roese Subject: [U-Boot] [RFC PATCH 05/21] ARM: UniPhier: move SoC sources to mach-uniphier X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Move arch/arm/cpu/armv7/uniphier/* -> arch/arm/mach-uniphier/* Signed-off-by: Masahiro Yamada --- 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 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_early_init_r.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_late_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_postclk_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 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ddrphy_training.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/dram_init.c | 0 arch/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 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/bcu_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/board_info.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/boot-mode.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/clkrst_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/ddrphy_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/lowlevel_debug.S | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pinctrl.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/platdevice.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pll_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/pll_spectrum.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/sbc_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/sg_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-ld4/umc_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/Makefile | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/board_info.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/boot-mode.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/clkrst_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/ddrphy_init.c | 0 .../arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/lowlevel_debug.S | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pinctrl.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/platdevice.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pll_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/pll_spectrum.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/sbc_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/sg_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-pro4/umc_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/Makefile | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/bcu_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/board_info.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/boot-mode.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/clkrst_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/ddrphy_init.c | 0 .../arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/lowlevel_debug.S | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pinctrl.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/platdevice.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pll_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/pll_spectrum.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/sbc_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/sg_init.c | 0 arch/arm/{cpu/armv7/uniphier => mach-uniphier}/ph1-sld8/umc_init.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 64 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_r.c (100%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_late_init.c (100%) rename arch/arm/{cpu/armv7/uniphier => mach-uniphier}/board_postclk_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/board_info.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/board_info.c (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/board_info.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}/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 cd9bf60..697cc1b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -164,7 +164,7 @@ ARM UNIPHIER M: Masahiro Yamada 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 F: drivers/serial/serial_uniphier.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f801cbf..23c5bab 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -712,7 +712,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/cpu/arm926ejs/versatile/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f1ae929..1b1d222 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -7,6 +7,7 @@ machine-$(CONFIG_ARCH_AT91) += at91 # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA machine-$(CONFIG_TEGRA) += tegra +machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 91e6923..254ca3d 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -57,6 +57,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_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/board_postclk_init.c b/arch/arm/mach-uniphier/board_postclk_init.c similarity index 100% rename from arch/arm/cpu/armv7/uniphier/board_postclk_init.c rename to arch/arm/mach-uniphier/board_postclk_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/board_info.c b/arch/arm/mach-uniphier/ph1-ld4/board_info.c similarity index 100% rename from arch/arm/cpu/armv7/uniphier/ph1-ld4/board_info.c rename to arch/arm/mach-uniphier/ph1-ld4/board_info.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/board_info.c b/arch/arm/mach-uniphier/ph1-pro4/board_info.c similarity index 100% rename from arch/arm/cpu/armv7/uniphier/ph1-pro4/board_info.c rename to arch/arm/mach-uniphier/ph1-pro4/board_info.c 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/board_info.c b/arch/arm/mach-uniphier/ph1-sld8/board_info.c similarity index 100% rename from arch/arm/cpu/armv7/uniphier/ph1-sld8/board_info.c rename to arch/arm/mach-uniphier/ph1-sld8/board_info.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/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