ARM: davinci: move SoC sources to mach-davinci
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Fri, 20 Feb 2015 08:04:05 +0000 (17:04 +0900)
committerTom Rini <trini@ti.com>
Sat, 21 Feb 2015 13:23:51 +0000 (08:23 -0500)
Move
arch/arm/cpu/arm926ejs/davinci/* -> arch/arm/mach-davinci/*

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Rini <trini@ti.com>
26 files changed:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/cpu/arm926ejs/Makefile
arch/arm/mach-davinci/Kconfig [moved from arch/arm/cpu/arm926ejs/davinci/Kconfig with 100% similarity]
arch/arm/mach-davinci/Makefile [moved from arch/arm/cpu/arm926ejs/davinci/Makefile with 100% similarity]
arch/arm/mach-davinci/config.mk [moved from arch/arm/cpu/arm926ejs/davinci/config.mk with 100% similarity]
arch/arm/mach-davinci/cpu.c [moved from arch/arm/cpu/arm926ejs/davinci/cpu.c with 100% similarity]
arch/arm/mach-davinci/da830_pinmux.c [moved from arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c with 100% similarity]
arch/arm/mach-davinci/da850_lowlevel.c [moved from arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c with 100% similarity]
arch/arm/mach-davinci/da850_pinmux.c [moved from arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c with 100% similarity]
arch/arm/mach-davinci/dm355.c [moved from arch/arm/cpu/arm926ejs/davinci/dm355.c with 100% similarity]
arch/arm/mach-davinci/dm365.c [moved from arch/arm/cpu/arm926ejs/davinci/dm365.c with 100% similarity]
arch/arm/mach-davinci/dm365_lowlevel.c [moved from arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c with 100% similarity]
arch/arm/mach-davinci/dm644x.c [moved from arch/arm/cpu/arm926ejs/davinci/dm644x.c with 100% similarity]
arch/arm/mach-davinci/dm646x.c [moved from arch/arm/cpu/arm926ejs/davinci/dm646x.c with 100% similarity]
arch/arm/mach-davinci/dp83848.c [moved from arch/arm/cpu/arm926ejs/davinci/dp83848.c with 98% similarity]
arch/arm/mach-davinci/et1011c.c [moved from arch/arm/cpu/arm926ejs/davinci/et1011c.c with 94% similarity]
arch/arm/mach-davinci/ksz8873.c [moved from arch/arm/cpu/arm926ejs/davinci/ksz8873.c with 95% similarity]
arch/arm/mach-davinci/lowlevel_init.S [moved from arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S with 100% similarity]
arch/arm/mach-davinci/lxt972.c [moved from arch/arm/cpu/arm926ejs/davinci/lxt972.c with 97% similarity]
arch/arm/mach-davinci/misc.c [moved from arch/arm/cpu/arm926ejs/davinci/misc.c with 100% similarity]
arch/arm/mach-davinci/pinmux.c [moved from arch/arm/cpu/arm926ejs/davinci/pinmux.c with 100% similarity]
arch/arm/mach-davinci/psc.c [moved from arch/arm/cpu/arm926ejs/davinci/psc.c with 100% similarity]
arch/arm/mach-davinci/reset.c [moved from arch/arm/cpu/arm926ejs/davinci/reset.c with 100% similarity]
arch/arm/mach-davinci/spl.c [moved from arch/arm/cpu/arm926ejs/davinci/spl.c with 100% similarity]
arch/arm/mach-davinci/timer.c [moved from arch/arm/cpu/arm926ejs/davinci/timer.c with 100% similarity]

index adecafc..887c0d5 100644 (file)
@@ -716,7 +716,7 @@ endchoice
 
 source "arch/arm/mach-at91/Kconfig"
 
-source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
+source "arch/arm/mach-davinci/Kconfig"
 
 source "arch/arm/cpu/arm1176/bcm2835/Kconfig"
 
index f1ae929..e321057 100644 (file)
@@ -5,6 +5,7 @@
 # Machine directory name.  This list is sorted alphanumerically
 # by CONFIG_* macro name.
 machine-$(CONFIG_ARCH_AT91)            += at91
+machine-$(CONFIG_ARCH_DAVINCI)         += davinci
 # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
 machine-$(CONFIG_TEGRA)                        += tegra
 
index f41357a..27b4353 100644 (file)
@@ -15,7 +15,6 @@ endif
 endif
 
 obj-$(CONFIG_ARMADA100) += armada100/
-obj-$(CONFIG_ARCH_DAVINCI) += davinci/
 obj-$(CONFIG_KIRKWOOD) += kirkwood/
 obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
 obj-$(CONFIG_MB86R0x) += mb86r0x/
similarity index 98%
rename from arch/arm/cpu/arm926ejs/davinci/dp83848.c
rename to arch/arm/mach-davinci/dp83848.c
index 603d507..6387e95 100644 (file)
@@ -13,7 +13,7 @@
 #include <net.h>
 #include <dp83848.h>
 #include <asm/arch/emac_defs.h>
-#include "../../../../../drivers/net/davinci_emac.h"
+#include "../../../drivers/net/davinci_emac.h"
 
 #ifdef CONFIG_DRIVER_TI_EMAC
 
similarity index 94%
rename from arch/arm/cpu/arm926ejs/davinci/et1011c.c
rename to arch/arm/mach-davinci/et1011c.c
index 9d53875..151020d 100644 (file)
@@ -10,7 +10,7 @@
 #include <net.h>
 #include <miiphy.h>
 #include <asm/arch/emac_defs.h>
-#include "../../../../../drivers/net/davinci_emac.h"
+#include "../../../drivers/net/davinci_emac.h"
 
 #ifdef CONFIG_DRIVER_TI_EMAC
 
similarity index 95%
rename from arch/arm/cpu/arm926ejs/davinci/ksz8873.c
rename to arch/arm/mach-davinci/ksz8873.c
index 4af5dd2..75af135 100644 (file)
@@ -20,7 +20,7 @@
 #include <net.h>
 #include <asm/arch/emac_defs.h>
 #include <asm/io.h>
-#include "../../../../../drivers/net/davinci_emac.h"
+#include "../../../drivers/net/davinci_emac.h"
 
 int ksz8873_is_phy_connected(int phy_addr)
 {
similarity index 97%
rename from arch/arm/cpu/arm926ejs/davinci/lxt972.c
rename to arch/arm/mach-davinci/lxt972.c
index c482fd9..a7356f9 100644 (file)
@@ -14,7 +14,7 @@
 #include <miiphy.h>
 #include <lxt971a.h>
 #include <asm/arch/emac_defs.h>
-#include "../../../../../drivers/net/davinci_emac.h"
+#include "../../../drivers/net/davinci_emac.h"
 
 #ifdef CONFIG_DRIVER_TI_EMAC