diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ee9a1b3e65..735d971f4e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -838,7 +838,7 @@ source "arch/arm/mach-bcm283x/Kconfig" source "arch/arm/mach-davinci/Kconfig" -source "arch/arm/cpu/armv7/exynos/Kconfig" +source "arch/arm/mach-exynos/Kconfig" source "arch/arm/mach-highbank/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index ab0e9ce673..e84d6d366e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -44,6 +44,7 @@ PLATFORM_CPPFLAGS += $(arch-y) $(tune-y) machine-$(CONFIG_ARCH_AT91) += at91 machine-$(CONFIG_ARCH_BCM283X) += bcm283x machine-$(CONFIG_ARCH_DAVINCI) += davinci +machine-$(CONFIG_ARCH_EXYNOS) += exynos machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_KEYSTONE) += keystone # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 5a76100406..6769d8fbfe 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -41,7 +41,6 @@ obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/ 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-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/ obj-$(if $(filter mx5,$(SOC)),y) += mx5/ obj-$(CONFIG_MX6) += mx6/ diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/mach-exynos/Kconfig similarity index 100% rename from arch/arm/cpu/armv7/exynos/Kconfig rename to arch/arm/mach-exynos/Kconfig diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/mach-exynos/Makefile similarity index 100% rename from arch/arm/cpu/armv7/exynos/Makefile rename to arch/arm/mach-exynos/Makefile diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/mach-exynos/clock.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/clock.c rename to arch/arm/mach-exynos/clock.c diff --git a/arch/arm/cpu/armv7/exynos/clock_init.h b/arch/arm/mach-exynos/clock_init.h similarity index 100% rename from arch/arm/cpu/armv7/exynos/clock_init.h rename to arch/arm/mach-exynos/clock_init.h diff --git a/arch/arm/cpu/armv7/exynos/clock_init_exynos4.c b/arch/arm/mach-exynos/clock_init_exynos4.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/clock_init_exynos4.c rename to arch/arm/mach-exynos/clock_init_exynos4.c diff --git a/arch/arm/cpu/armv7/exynos/clock_init_exynos5.c b/arch/arm/mach-exynos/clock_init_exynos5.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/clock_init_exynos5.c rename to arch/arm/mach-exynos/clock_init_exynos5.c diff --git a/arch/arm/cpu/armv7/exynos/common_setup.h b/arch/arm/mach-exynos/common_setup.h similarity index 100% rename from arch/arm/cpu/armv7/exynos/common_setup.h rename to arch/arm/mach-exynos/common_setup.h diff --git a/arch/arm/cpu/armv7/exynos/config.mk b/arch/arm/mach-exynos/config.mk similarity index 100% rename from arch/arm/cpu/armv7/exynos/config.mk rename to arch/arm/mach-exynos/config.mk diff --git a/arch/arm/cpu/armv7/exynos/dmc_common.c b/arch/arm/mach-exynos/dmc_common.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/dmc_common.c rename to arch/arm/mach-exynos/dmc_common.c diff --git a/arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c rename to arch/arm/mach-exynos/dmc_init_ddr3.c diff --git a/arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c b/arch/arm/mach-exynos/dmc_init_exynos4.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c rename to arch/arm/mach-exynos/dmc_init_exynos4.c diff --git a/arch/arm/cpu/armv7/exynos/exynos4_setup.h b/arch/arm/mach-exynos/exynos4_setup.h similarity index 100% rename from arch/arm/cpu/armv7/exynos/exynos4_setup.h rename to arch/arm/mach-exynos/exynos4_setup.h diff --git a/arch/arm/cpu/armv7/exynos/exynos5_setup.h b/arch/arm/mach-exynos/exynos5_setup.h similarity index 100% rename from arch/arm/cpu/armv7/exynos/exynos5_setup.h rename to arch/arm/mach-exynos/exynos5_setup.h diff --git a/arch/arm/include/asm/arch-exynos/adc.h b/arch/arm/mach-exynos/include/mach/adc.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/adc.h rename to arch/arm/mach-exynos/include/mach/adc.h diff --git a/arch/arm/include/asm/arch-exynos/board.h b/arch/arm/mach-exynos/include/mach/board.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/board.h rename to arch/arm/mach-exynos/include/mach/board.h diff --git a/arch/arm/include/asm/arch-exynos/clk.h b/arch/arm/mach-exynos/include/mach/clk.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/clk.h rename to arch/arm/mach-exynos/include/mach/clk.h diff --git a/arch/arm/include/asm/arch-exynos/clock.h b/arch/arm/mach-exynos/include/mach/clock.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/clock.h rename to arch/arm/mach-exynos/include/mach/clock.h diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/mach-exynos/include/mach/cpu.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/cpu.h rename to arch/arm/mach-exynos/include/mach/cpu.h diff --git a/arch/arm/include/asm/arch-exynos/dmc.h b/arch/arm/mach-exynos/include/mach/dmc.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/dmc.h rename to arch/arm/mach-exynos/include/mach/dmc.h diff --git a/arch/arm/include/asm/arch-exynos/dp.h b/arch/arm/mach-exynos/include/mach/dp.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/dp.h rename to arch/arm/mach-exynos/include/mach/dp.h diff --git a/arch/arm/include/asm/arch-exynos/dp_info.h b/arch/arm/mach-exynos/include/mach/dp_info.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/dp_info.h rename to arch/arm/mach-exynos/include/mach/dp_info.h diff --git a/arch/arm/include/asm/arch-exynos/dsim.h b/arch/arm/mach-exynos/include/mach/dsim.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/dsim.h rename to arch/arm/mach-exynos/include/mach/dsim.h diff --git a/arch/arm/include/asm/arch-exynos/dwmmc.h b/arch/arm/mach-exynos/include/mach/dwmmc.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/dwmmc.h rename to arch/arm/mach-exynos/include/mach/dwmmc.h diff --git a/arch/arm/include/asm/arch-exynos/ehci.h b/arch/arm/mach-exynos/include/mach/ehci.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/ehci.h rename to arch/arm/mach-exynos/include/mach/ehci.h diff --git a/arch/arm/include/asm/arch-exynos/fb.h b/arch/arm/mach-exynos/include/mach/fb.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/fb.h rename to arch/arm/mach-exynos/include/mach/fb.h diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/mach-exynos/include/mach/gpio.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/gpio.h rename to arch/arm/mach-exynos/include/mach/gpio.h diff --git a/arch/arm/include/asm/arch-exynos/i2s-regs.h b/arch/arm/mach-exynos/include/mach/i2s-regs.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/i2s-regs.h rename to arch/arm/mach-exynos/include/mach/i2s-regs.h diff --git a/arch/arm/include/asm/arch-exynos/mipi_dsim.h b/arch/arm/mach-exynos/include/mach/mipi_dsim.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/mipi_dsim.h rename to arch/arm/mach-exynos/include/mach/mipi_dsim.h diff --git a/arch/arm/include/asm/arch-exynos/mmc.h b/arch/arm/mach-exynos/include/mach/mmc.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/mmc.h rename to arch/arm/mach-exynos/include/mach/mmc.h diff --git a/arch/arm/include/asm/arch-exynos/periph.h b/arch/arm/mach-exynos/include/mach/periph.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/periph.h rename to arch/arm/mach-exynos/include/mach/periph.h diff --git a/arch/arm/include/asm/arch-exynos/pinmux.h b/arch/arm/mach-exynos/include/mach/pinmux.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/pinmux.h rename to arch/arm/mach-exynos/include/mach/pinmux.h diff --git a/arch/arm/include/asm/arch-exynos/power.h b/arch/arm/mach-exynos/include/mach/power.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/power.h rename to arch/arm/mach-exynos/include/mach/power.h diff --git a/arch/arm/include/asm/arch-exynos/pwm.h b/arch/arm/mach-exynos/include/mach/pwm.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/pwm.h rename to arch/arm/mach-exynos/include/mach/pwm.h diff --git a/arch/arm/include/asm/arch-exynos/pwm_backlight.h b/arch/arm/mach-exynos/include/mach/pwm_backlight.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/pwm_backlight.h rename to arch/arm/mach-exynos/include/mach/pwm_backlight.h diff --git a/arch/arm/include/asm/arch-exynos/sound.h b/arch/arm/mach-exynos/include/mach/sound.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/sound.h rename to arch/arm/mach-exynos/include/mach/sound.h diff --git a/arch/arm/include/asm/arch-exynos/spi.h b/arch/arm/mach-exynos/include/mach/spi.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/spi.h rename to arch/arm/mach-exynos/include/mach/spi.h diff --git a/arch/arm/include/asm/arch-exynos/spl.h b/arch/arm/mach-exynos/include/mach/spl.h similarity index 98% rename from arch/arm/include/asm/arch-exynos/spl.h rename to arch/arm/mach-exynos/include/mach/spl.h index cdcb2bc7ad..0c480acb1a 100644 --- a/arch/arm/include/asm/arch-exynos/spl.h +++ b/arch/arm/mach-exynos/include/mach/spl.h @@ -7,7 +7,7 @@ #ifndef __ASM_ARCH_EXYNOS_SPL_H__ #define __ASM_ARCH_EXYNOS_SPL_H__ -#include +#include #include #ifndef __ASSEMBLY__ diff --git a/arch/arm/include/asm/arch-exynos/sromc.h b/arch/arm/mach-exynos/include/mach/sromc.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/sromc.h rename to arch/arm/mach-exynos/include/mach/sromc.h diff --git a/arch/arm/include/asm/arch-exynos/sys_proto.h b/arch/arm/mach-exynos/include/mach/sys_proto.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/sys_proto.h rename to arch/arm/mach-exynos/include/mach/sys_proto.h diff --git a/arch/arm/include/asm/arch-exynos/system.h b/arch/arm/mach-exynos/include/mach/system.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/system.h rename to arch/arm/mach-exynos/include/mach/system.h diff --git a/arch/arm/include/asm/arch-exynos/tmu.h b/arch/arm/mach-exynos/include/mach/tmu.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/tmu.h rename to arch/arm/mach-exynos/include/mach/tmu.h diff --git a/arch/arm/include/asm/arch-exynos/tzpc.h b/arch/arm/mach-exynos/include/mach/tzpc.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/tzpc.h rename to arch/arm/mach-exynos/include/mach/tzpc.h diff --git a/arch/arm/include/asm/arch-exynos/uart.h b/arch/arm/mach-exynos/include/mach/uart.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/uart.h rename to arch/arm/mach-exynos/include/mach/uart.h diff --git a/arch/arm/include/asm/arch-exynos/watchdog.h b/arch/arm/mach-exynos/include/mach/watchdog.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/watchdog.h rename to arch/arm/mach-exynos/include/mach/watchdog.h diff --git a/arch/arm/include/asm/arch-exynos/xhci-exynos.h b/arch/arm/mach-exynos/include/mach/xhci-exynos.h similarity index 100% rename from arch/arm/include/asm/arch-exynos/xhci-exynos.h rename to arch/arm/mach-exynos/include/mach/xhci-exynos.h diff --git a/arch/arm/cpu/armv7/exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/lowlevel_init.c rename to arch/arm/mach-exynos/lowlevel_init.c diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/pinmux.c rename to arch/arm/mach-exynos/pinmux.c diff --git a/arch/arm/cpu/armv7/exynos/power.c b/arch/arm/mach-exynos/power.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/power.c rename to arch/arm/mach-exynos/power.c diff --git a/arch/arm/cpu/armv7/exynos/sec_boot.S b/arch/arm/mach-exynos/sec_boot.S similarity index 100% rename from arch/arm/cpu/armv7/exynos/sec_boot.S rename to arch/arm/mach-exynos/sec_boot.S diff --git a/arch/arm/cpu/armv7/exynos/soc.c b/arch/arm/mach-exynos/soc.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/soc.c rename to arch/arm/mach-exynos/soc.c diff --git a/arch/arm/cpu/armv7/exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/spl_boot.c rename to arch/arm/mach-exynos/spl_boot.c diff --git a/arch/arm/cpu/armv7/exynos/system.c b/arch/arm/mach-exynos/system.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/system.c rename to arch/arm/mach-exynos/system.c diff --git a/arch/arm/cpu/armv7/exynos/tzpc.c b/arch/arm/mach-exynos/tzpc.c similarity index 100% rename from arch/arm/cpu/armv7/exynos/tzpc.c rename to arch/arm/mach-exynos/tzpc.c diff --git a/drivers/spi/exynos_spi.c b/drivers/spi/exynos_spi.c index 6d77c319e7..418b48120a 100644 --- a/drivers/spi/exynos_spi.c +++ b/drivers/spi/exynos_spi.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include DECLARE_GLOBAL_DATA_PTR;