From 39a723452f430a7ef89b0ffa934b2d4312890076 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 20 Feb 2015 17:04:11 +0900 Subject: [PATCH] ARM: keystone: move SoC sources to mach-keystone Move arch/arm/cpu/armv7/keystone/* -> arch/arm/mach-keystone/* Signed-off-by: Masahiro Yamada Cc: Tom Rini --- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 1 - arch/arm/{cpu/armv7/keystone => mach-keystone}/Kconfig | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/Makefile | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2e.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2hk.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2l.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/clock.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_clock.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_ddr3.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_mon.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/ddr3.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/init.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/keystone.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/msmc.c | 0 arch/arm/{cpu/armv7/keystone => mach-keystone}/psc.c | 0 17 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/Kconfig (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/Makefile (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2e.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2hk.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/clock-k2l.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/clock.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_clock.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_ddr3.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/cmd_mon.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/ddr3.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/init.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/keystone.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/msmc.c (100%) rename arch/arm/{cpu/armv7/keystone => mach-keystone}/psc.c (100%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9302b2a0b6..083823e8c4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -724,7 +724,7 @@ source "arch/arm/cpu/armv7/exynos/Kconfig" source "arch/arm/mach-highbank/Kconfig" -source "arch/arm/cpu/armv7/keystone/Kconfig" +source "arch/arm/mach-keystone/Kconfig" source "arch/arm/mach-kirkwood/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 0699a4d472..678ac132aa 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -7,6 +7,7 @@ machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_HIGHBANK) += highbank +machine-$(CONFIG_ARCH_KEYSTONE) += keystone # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD machine-$(CONFIG_KIRKWOOD) += kirkwood # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 29ba6e2125..1a76982d6e 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -43,7 +43,6 @@ obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/ obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/ obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/ obj-$(CONFIG_ARCH_EXYNOS) += exynos/ -obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/ obj-$(if $(filter mx5,$(SOC)),y) += mx5/ obj-$(CONFIG_MX6) += mx6/ diff --git a/arch/arm/cpu/armv7/keystone/Kconfig b/arch/arm/mach-keystone/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/keystone/Kconfig rename to arch/arm/mach-keystone/Kconfig diff --git a/arch/arm/cpu/armv7/keystone/Makefile b/arch/arm/mach-keystone/Makefile similarity index 100% rename from arch/arm/cpu/armv7/keystone/Makefile rename to arch/arm/mach-keystone/Makefile diff --git a/arch/arm/cpu/armv7/keystone/clock-k2e.c b/arch/arm/mach-keystone/clock-k2e.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/clock-k2e.c rename to arch/arm/mach-keystone/clock-k2e.c diff --git a/arch/arm/cpu/armv7/keystone/clock-k2hk.c b/arch/arm/mach-keystone/clock-k2hk.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/clock-k2hk.c rename to arch/arm/mach-keystone/clock-k2hk.c diff --git a/arch/arm/cpu/armv7/keystone/clock-k2l.c b/arch/arm/mach-keystone/clock-k2l.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/clock-k2l.c rename to arch/arm/mach-keystone/clock-k2l.c diff --git a/arch/arm/cpu/armv7/keystone/clock.c b/arch/arm/mach-keystone/clock.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/clock.c rename to arch/arm/mach-keystone/clock.c diff --git a/arch/arm/cpu/armv7/keystone/cmd_clock.c b/arch/arm/mach-keystone/cmd_clock.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/cmd_clock.c rename to arch/arm/mach-keystone/cmd_clock.c diff --git a/arch/arm/cpu/armv7/keystone/cmd_ddr3.c b/arch/arm/mach-keystone/cmd_ddr3.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/cmd_ddr3.c rename to arch/arm/mach-keystone/cmd_ddr3.c diff --git a/arch/arm/cpu/armv7/keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/cmd_mon.c rename to arch/arm/mach-keystone/cmd_mon.c diff --git a/arch/arm/cpu/armv7/keystone/ddr3.c b/arch/arm/mach-keystone/ddr3.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/ddr3.c rename to arch/arm/mach-keystone/ddr3.c diff --git a/arch/arm/cpu/armv7/keystone/init.c b/arch/arm/mach-keystone/init.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/init.c rename to arch/arm/mach-keystone/init.c diff --git a/arch/arm/cpu/armv7/keystone/keystone.c b/arch/arm/mach-keystone/keystone.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/keystone.c rename to arch/arm/mach-keystone/keystone.c diff --git a/arch/arm/cpu/armv7/keystone/msmc.c b/arch/arm/mach-keystone/msmc.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/msmc.c rename to arch/arm/mach-keystone/msmc.c diff --git a/arch/arm/cpu/armv7/keystone/psc.c b/arch/arm/mach-keystone/psc.c similarity index 100% rename from arch/arm/cpu/armv7/keystone/psc.c rename to arch/arm/mach-keystone/psc.c -- 2.39.5