sh: Consolidate SH-Mobile CPU code in arch/sh/kernel/cpu/shmobile/.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile
index f471d242774e13c60b31f3766ebfc6ab9f7f496d..2600641a483f743ab7938f4daf9a42e58111733a 100644 (file)
--- a/arch/sh/kernel/cpu/Makefile
+++ b/arch/sh/kernel/cpu/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_CPU_SH5)         = sh5/
 # Special cases for family ancestry.
 
 obj-$(CONFIG_CPU_SH4A)         += sh4a/
+obj-$(CONFIG_ARCH_SHMOBILE)    += shmobile/
 
 # Common interfaces.
 

diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile
index 09967dc0065a151358beb1242ef837cf087cbda4..1a92361feeb9db95e50e4f97d5d06a076a66f28e 100644 (file)
--- a/arch/sh/kernel/cpu/sh4a/Makefile
+++ b/arch/sh/kernel/cpu/sh4a/Makefile
@@ -35,10 +35,6 @@ pinmux-$(CONFIG_CPU_SUBTYPE_SH7723)  := pinmux-sh7723.o
 pinmux-$(CONFIG_CPU_SUBTYPE_SH7785)    := pinmux-sh7785.o
 pinmux-$(CONFIG_CPU_SUBTYPE_SH7786)    := pinmux-sh7786.o
 
-# Power Mangement & Sleep mode
-pm-$(CONFIG_ARCH_SHMOBILE)             := pm-sh_mobile.o sleep-sh_mobile.o
-
 obj-y                  += $(clock-y)
 obj-$(CONFIG_SMP)      += $(smp-y)
 obj-$(CONFIG_GENERIC_GPIO)     += $(pinmux-y)
-obj-$(CONFIG_PM)       += $(pm-y)

diff --git a/arch/sh/kernel/cpu/shmobile/Makefile b/arch/sh/kernel/cpu/shmobile/Makefile
new file mode 100644 (file)
index 0000000..08bfa7c
--- /dev/null
+++ b/arch/sh/kernel/cpu/shmobile/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Linux/SuperH SH-Mobile backends.
+#
+
+# Power Management & Sleep mode
+obj-$(CONFIG_PM)       += pm.o sleep.o

diff --git a/arch/sh/kernel/cpu/sh4a/pm-sh_mobile.c b/arch/sh/kernel/cpu/shmobile/pm.c
similarity index 100%
rename from arch/sh/kernel/cpu/sh4a/pm-sh_mobile.c
rename to arch/sh/kernel/cpu/shmobile/pm.c

diff --git a/arch/sh/kernel/cpu/sh4a/sleep-sh_mobile.S b/arch/sh/kernel/cpu/shmobile/sleep.S
similarity index 100%
rename from arch/sh/kernel/cpu/sh4a/sleep-sh_mobile.S
rename to arch/sh/kernel/cpu/shmobile/sleep.S