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 ---
Changes in v3: None
arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 + arch/arm/cpu/arm926ejs/Makefile | 1 - arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/Kconfig | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/Makefile | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/config.mk | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/cpu.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da830_pinmux.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da850_lowlevel.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da850_pinmux.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm355.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm365.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm365_lowlevel.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm644x.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm646x.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dp83848.c | 2 +- arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/et1011c.c | 2 +- arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/ksz8873.c | 2 +- arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/lowlevel_init.S | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/lxt972.c | 2 +- arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/misc.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/pinmux.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/psc.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/reset.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/spl.c | 0 arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/timer.c | 0 26 files changed, 6 insertions(+), 6 deletions(-) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/Kconfig (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/Makefile (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/config.mk (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/cpu.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da830_pinmux.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da850_lowlevel.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/da850_pinmux.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm355.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm365.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm365_lowlevel.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm644x.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dm646x.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/dp83848.c (98%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/et1011c.c (94%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/ksz8873.c (95%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/lowlevel_init.S (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/lxt972.c (97%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/misc.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/pinmux.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/psc.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/reset.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/spl.c (100%) rename arch/arm/{cpu/arm926ejs/davinci => mach-davinci}/timer.c (100%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index adecafc..887c0d5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f1ae929..e321057 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index f41357a..27b4353 100644 --- a/arch/arm/cpu/arm926ejs/Makefile +++ b/arch/arm/cpu/arm926ejs/Makefile @@ -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/ diff --git a/arch/arm/cpu/arm926ejs/davinci/Kconfig b/arch/arm/mach-davinci/Kconfig similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/Kconfig rename to arch/arm/mach-davinci/Kconfig diff --git a/arch/arm/cpu/arm926ejs/davinci/Makefile b/arch/arm/mach-davinci/Makefile similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/Makefile rename to arch/arm/mach-davinci/Makefile diff --git a/arch/arm/cpu/arm926ejs/davinci/config.mk b/arch/arm/mach-davinci/config.mk similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/config.mk rename to arch/arm/mach-davinci/config.mk diff --git a/arch/arm/cpu/arm926ejs/davinci/cpu.c b/arch/arm/mach-davinci/cpu.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/cpu.c rename to arch/arm/mach-davinci/cpu.c diff --git a/arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c b/arch/arm/mach-davinci/da830_pinmux.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c rename to arch/arm/mach-davinci/da830_pinmux.c diff --git a/arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/da850_lowlevel.c rename to arch/arm/mach-davinci/da850_lowlevel.c diff --git a/arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c b/arch/arm/mach-davinci/da850_pinmux.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c rename to arch/arm/mach-davinci/da850_pinmux.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dm355.c b/arch/arm/mach-davinci/dm355.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/dm355.c rename to arch/arm/mach-davinci/dm355.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dm365.c b/arch/arm/mach-davinci/dm365.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/dm365.c rename to arch/arm/mach-davinci/dm365.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c b/arch/arm/mach-davinci/dm365_lowlevel.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/dm365_lowlevel.c rename to arch/arm/mach-davinci/dm365_lowlevel.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/dm644x.c rename to arch/arm/mach-davinci/dm644x.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/dm646x.c rename to arch/arm/mach-davinci/dm646x.c diff --git a/arch/arm/cpu/arm926ejs/davinci/dp83848.c b/arch/arm/mach-davinci/dp83848.c similarity index 98% rename from arch/arm/cpu/arm926ejs/davinci/dp83848.c rename to arch/arm/mach-davinci/dp83848.c index 603d507..6387e95 100644 --- a/arch/arm/cpu/arm926ejs/davinci/dp83848.c +++ b/arch/arm/mach-davinci/dp83848.c @@ -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
diff --git a/arch/arm/cpu/arm926ejs/davinci/et1011c.c b/arch/arm/mach-davinci/et1011c.c similarity index 94% rename from arch/arm/cpu/arm926ejs/davinci/et1011c.c rename to arch/arm/mach-davinci/et1011c.c index 9d53875..151020d 100644 --- a/arch/arm/cpu/arm926ejs/davinci/et1011c.c +++ b/arch/arm/mach-davinci/et1011c.c @@ -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
diff --git a/arch/arm/cpu/arm926ejs/davinci/ksz8873.c b/arch/arm/mach-davinci/ksz8873.c similarity index 95% rename from arch/arm/cpu/arm926ejs/davinci/ksz8873.c rename to arch/arm/mach-davinci/ksz8873.c index 4af5dd2..75af135 100644 --- a/arch/arm/cpu/arm926ejs/davinci/ksz8873.c +++ b/arch/arm/mach-davinci/ksz8873.c @@ -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) { diff --git a/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S b/arch/arm/mach-davinci/lowlevel_init.S similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S rename to arch/arm/mach-davinci/lowlevel_init.S diff --git a/arch/arm/cpu/arm926ejs/davinci/lxt972.c b/arch/arm/mach-davinci/lxt972.c similarity index 97% rename from arch/arm/cpu/arm926ejs/davinci/lxt972.c rename to arch/arm/mach-davinci/lxt972.c index c482fd9..a7356f9 100644 --- a/arch/arm/cpu/arm926ejs/davinci/lxt972.c +++ b/arch/arm/mach-davinci/lxt972.c @@ -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
diff --git a/arch/arm/cpu/arm926ejs/davinci/misc.c b/arch/arm/mach-davinci/misc.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/misc.c rename to arch/arm/mach-davinci/misc.c diff --git a/arch/arm/cpu/arm926ejs/davinci/pinmux.c b/arch/arm/mach-davinci/pinmux.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/pinmux.c rename to arch/arm/mach-davinci/pinmux.c diff --git a/arch/arm/cpu/arm926ejs/davinci/psc.c b/arch/arm/mach-davinci/psc.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/psc.c rename to arch/arm/mach-davinci/psc.c diff --git a/arch/arm/cpu/arm926ejs/davinci/reset.c b/arch/arm/mach-davinci/reset.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/reset.c rename to arch/arm/mach-davinci/reset.c diff --git a/arch/arm/cpu/arm926ejs/davinci/spl.c b/arch/arm/mach-davinci/spl.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/spl.c rename to arch/arm/mach-davinci/spl.c diff --git a/arch/arm/cpu/arm926ejs/davinci/timer.c b/arch/arm/mach-davinci/timer.c similarity index 100% rename from arch/arm/cpu/arm926ejs/davinci/timer.c rename to arch/arm/mach-davinci/timer.c