ARM: exynos: reorganize SoC code

PATCH New Thomas Abraham 5 participants 7 messages Aug 3, 2015 – Aug 17, 2015

Subsystems (5)

Arm (32-bit) Arm sub-architectures SPI Arm Samsung Exynos +1 more subsystems

lore

Share & tools

lore

Thomas Abraham

author

2015-08-03 12:27 UTC #0 lore raw

cover ARM: exynos: reorganize SoC code

In order to reuse existing ARMv7 based Exynos SoC support for ARMv8 based Exynos platforms, move the existing sources from arch/arm/cpu/armv7/exynos to arch/arm/mach-exynos.

This patch series has been tested on origen (Exynos4210), smdk5250 and smdk5420 boards. And compile tested for the following configs

smdkv310, trats, snow, trats2, odroid, peach-pit, s5p_goni, s5pc210_universal, peach-pi, arndale.

This patch series is based on master branch of Samsung u-boot repo
(git://git.denx.de/u-boot-samsung.git)

Thomas Abraham (2):
ARM: exynos: move SoC sources to mach-exynos
ARM: exynos: fix regression for Origen4210

 arch/arm/Kconfig                                   |    2 +-
 arch/arm/Makefile                                  |    1 +
 arch/arm/cpu/armv7/Makefile                        |    1 -
 arch/arm/{cpu/armv7/exynos => mach-exynos}/Kconfig |    0
 .../arm/{cpu/armv7/exynos => mach-exynos}/Makefile |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/clock.c |    0
 .../{cpu/armv7/exynos => mach-exynos}/clock_init.h |    0
 .../exynos => mach-exynos}/clock_init_exynos4.c    |    0
 .../exynos => mach-exynos}/clock_init_exynos5.c    |    0
 .../armv7/exynos => mach-exynos}/common_setup.h    |    2 +-
 .../{cpu/armv7/exynos => mach-exynos}/config.mk    |    0
 .../{cpu/armv7/exynos => mach-exynos}/dmc_common.c |    0
 .../armv7/exynos => mach-exynos}/dmc_init_ddr3.c   |    0
 .../exynos => mach-exynos}/dmc_init_exynos4.c      |    0
 .../armv7/exynos => mach-exynos}/exynos4_setup.h   |    0
 .../armv7/exynos => mach-exynos}/exynos5_setup.h   |    0
 .../arch-exynos => mach-exynos/include/mach}/adc.h |    0
 .../include/mach}/board.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/clk.h |    0
 .../include/mach}/clock.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/cpu.h |    0
 .../arch-exynos => mach-exynos/include/mach}/dmc.h |    0
 .../arch-exynos => mach-exynos/include/mach}/dp.h  |    0
 .../include/mach}/dp_info.h                        |    0
 .../include/mach}/dsim.h                           |    0
 .../include/mach}/dwmmc.h                          |    0
 .../include/mach}/ehci.h                           |    0
 .../arch-exynos => mach-exynos/include/mach}/fb.h  |    0
 .../include/mach}/gpio.h                           |    0
 .../include/mach}/i2s-regs.h                       |    0
 .../include/mach}/mipi_dsim.h                      |    0
 .../arch-exynos => mach-exynos/include/mach}/mmc.h |    0
 .../include/mach}/periph.h                         |    0
 .../include/mach}/pinmux.h                         |    0
 .../include/mach}/power.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/pwm.h |    0
 .../include/mach}/pwm_backlight.h                  |    0
 .../include/mach}/sound.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/spi.h |    0
 .../arch-exynos => mach-exynos/include/mach}/spl.h |    2 +-
 .../include/mach}/sromc.h                          |    0
 .../include/mach}/sys_proto.h                      |    0
 .../include/mach}/system.h                         |    0
 .../arch-exynos => mach-exynos/include/mach}/tmu.h |    0
 .../include/mach}/tzpc.h                           |    0
 .../include/mach}/uart.h                           |    0
 .../include/mach}/watchdog.h                       |    0
 .../include/mach}/xhci-exynos.h                    |    0
 .../armv7/exynos => mach-exynos}/lowlevel_init.c   |    4 +---
 .../arm/{cpu/armv7/exynos => mach-exynos}/pinmux.c |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/power.c |    0
 .../{cpu/armv7/exynos => mach-exynos}/sec_boot.S   |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/soc.c   |    0
 .../{cpu/armv7/exynos => mach-exynos}/spl_boot.c   |    0
 .../arm/{cpu/armv7/exynos => mach-exynos}/system.c |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/tzpc.c  |    0
 drivers/spi/exynos_spi.c                           |    2 +-
 57 files changed, 6 insertions(+), 8 deletions(-)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/Kconfig (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/Makefile (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init.h (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init_exynos4.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init_exynos5.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/common_setup.h (97%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/config.mk (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_common.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_init_ddr3.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_init_exynos4.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/exynos4_setup.h (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/exynos5_setup.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/adc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/board.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/clk.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/clock.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/cpu.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dmc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dp.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dp_info.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dsim.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dwmmc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/ehci.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/fb.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/gpio.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/i2s-regs.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/mipi_dsim.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/mmc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/periph.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pinmux.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/power.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pwm.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pwm_backlight.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sound.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/spi.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/spl.h (98%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sromc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sys_proto.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/system.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/tmu.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/tzpc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/uart.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/watchdog.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/xhci-exynos.h (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/lowlevel_init.c (98%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/pinmux.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/power.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/sec_boot.S (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/soc.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/spl_boot.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/system.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/tzpc.c (100%)

Thomas Abraham

author

2015-08-03 12:28 UTC #1 lore raw

PATCH 1/2 ARM: exynos: move SoC sources to mach-exynos

Move arch/arm/cpu/armv7/exynos/* to arch/arm/mach-exynos/* to allow reuse of existing code for ARMv8 based Exynos platforms.

Cc Minkyu Kang <[email protected]>

Cc Albert Aribaud <[email protected]>

Cc Masahiro Yamada <[email protected]>

Signed-off-by Thomas Abraham <[email protected]>

---
 arch/arm/Kconfig                                   |    2 +-
 arch/arm/Makefile                                  |    1 +
 arch/arm/cpu/armv7/Makefile                        |    1 -
 arch/arm/{cpu/armv7/exynos => mach-exynos}/Kconfig |    0
 .../arm/{cpu/armv7/exynos => mach-exynos}/Makefile |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/clock.c |    0
 .../{cpu/armv7/exynos => mach-exynos}/clock_init.h |    0
 .../exynos => mach-exynos}/clock_init_exynos4.c    |    0
 .../exynos => mach-exynos}/clock_init_exynos5.c    |    0
 .../armv7/exynos => mach-exynos}/common_setup.h    |    0
 .../{cpu/armv7/exynos => mach-exynos}/config.mk    |    0
 .../{cpu/armv7/exynos => mach-exynos}/dmc_common.c |    0
 .../armv7/exynos => mach-exynos}/dmc_init_ddr3.c   |    0
 .../exynos => mach-exynos}/dmc_init_exynos4.c      |    0
 .../armv7/exynos => mach-exynos}/exynos4_setup.h   |    0
 .../armv7/exynos => mach-exynos}/exynos5_setup.h   |    0
 .../arch-exynos => mach-exynos/include/mach}/adc.h |    0
 .../include/mach}/board.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/clk.h |    0
 .../include/mach}/clock.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/cpu.h |    0
 .../arch-exynos => mach-exynos/include/mach}/dmc.h |    0
 .../arch-exynos => mach-exynos/include/mach}/dp.h  |    0
 .../include/mach}/dp_info.h                        |    0
 .../include/mach}/dsim.h                           |    0
 .../include/mach}/dwmmc.h                          |    0
 .../include/mach}/ehci.h                           |    0
 .../arch-exynos => mach-exynos/include/mach}/fb.h  |    0
 .../include/mach}/gpio.h                           |    0
 .../include/mach}/i2s-regs.h                       |    0
 .../include/mach}/mipi_dsim.h                      |    0
 .../arch-exynos => mach-exynos/include/mach}/mmc.h |    0
 .../include/mach}/periph.h                         |    0
 .../include/mach}/pinmux.h                         |    0
 .../include/mach}/power.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/pwm.h |    0
 .../include/mach}/pwm_backlight.h                  |    0
 .../include/mach}/sound.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/spi.h |    0
 .../arch-exynos => mach-exynos/include/mach}/spl.h |    2 +-
 .../include/mach}/sromc.h                          |    0
 .../include/mach}/sys_proto.h                      |    0
 .../include/mach}/system.h                         |    0
 .../arch-exynos => mach-exynos/include/mach}/tmu.h |    0
 .../include/mach}/tzpc.h                           |    0
 .../include/mach}/uart.h                           |    0
 .../include/mach}/watchdog.h                       |    0
 .../include/mach}/xhci-exynos.h                    |    0
 .../armv7/exynos => mach-exynos}/lowlevel_init.c   |    0
 .../arm/{cpu/armv7/exynos => mach-exynos}/pinmux.c |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/power.c |    0
 .../{cpu/armv7/exynos => mach-exynos}/sec_boot.S   |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/soc.c   |    0
 .../{cpu/armv7/exynos => mach-exynos}/spl_boot.c   |    0
 .../arm/{cpu/armv7/exynos => mach-exynos}/system.c |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/tzpc.c  |    0
 drivers/spi/exynos_spi.c                           |    2 +-
 57 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/Kconfig (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/Makefile (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init.h (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init_exynos4.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init_exynos5.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/common_setup.h (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/config.mk (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_common.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_init_ddr3.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_init_exynos4.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/exynos4_setup.h (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/exynos5_setup.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/adc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/board.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/clk.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/clock.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/cpu.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dmc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dp.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dp_info.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dsim.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dwmmc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/ehci.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/fb.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/gpio.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/i2s-regs.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/mipi_dsim.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/mmc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/periph.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pinmux.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/power.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pwm.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pwm_backlight.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sound.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/spi.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/spl.h (98%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sromc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sys_proto.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/system.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/tmu.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/tzpc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/uart.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/watchdog.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/xhci-exynos.h (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/lowlevel_init.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/pinmux.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/power.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/sec_boot.S (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/soc.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/spl_boot.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/system.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/tzpc.c (100%)

arch/arm/Kconfig +1 -1

index 9908b43..e4a92bd 100644
@@ -825,7 +825,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"

arch/arm/Makefile +1 -0

index 6f30098..f60f171 100644
@@ -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

arch/arm/cpu/armv7/Makefile +0 -1

index 5a76100..6769d8f 100644
@@ -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/

arch/arm/mach-exynos/Kconfig renamed from arch/arm/cpu/armv7/exynos/Kconfig +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/Kconfig
rename to arch/arm/mach-exynos/Kconfig

arch/arm/mach-exynos/Makefile renamed from arch/arm/cpu/armv7/exynos/Makefile +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/Makefile
rename to arch/arm/mach-exynos/Makefile

arch/arm/mach-exynos/clock.c renamed from arch/arm/cpu/armv7/exynos/clock.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/clock.c
rename to arch/arm/mach-exynos/clock.c

arch/arm/mach-exynos/clock_init.h renamed from arch/arm/cpu/armv7/exynos/clock_init.h +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/clock_init.h
rename to arch/arm/mach-exynos/clock_init.h

arch/arm/mach-exynos/clock_init_exynos4.c renamed from arch/arm/cpu/armv7/exynos/clock_init_exynos4.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/clock_init_exynos4.c
rename to arch/arm/mach-exynos/clock_init_exynos4.c

arch/arm/mach-exynos/clock_init_exynos5.c renamed from arch/arm/cpu/armv7/exynos/clock_init_exynos5.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/clock_init_exynos5.c
rename to arch/arm/mach-exynos/clock_init_exynos5.c

arch/arm/mach-exynos/common_setup.h renamed from arch/arm/cpu/armv7/exynos/common_setup.h +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/common_setup.h
rename to arch/arm/mach-exynos/common_setup.h

arch/arm/mach-exynos/config.mk renamed from arch/arm/cpu/armv7/exynos/config.mk +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/config.mk
rename to arch/arm/mach-exynos/config.mk

arch/arm/mach-exynos/dmc_common.c renamed from arch/arm/cpu/armv7/exynos/dmc_common.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/dmc_common.c
rename to arch/arm/mach-exynos/dmc_common.c

arch/arm/mach-exynos/dmc_init_ddr3.c renamed from arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c
rename to arch/arm/mach-exynos/dmc_init_ddr3.c

arch/arm/mach-exynos/dmc_init_exynos4.c renamed from arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c
rename to arch/arm/mach-exynos/dmc_init_exynos4.c

arch/arm/mach-exynos/exynos4_setup.h renamed from arch/arm/cpu/armv7/exynos/exynos4_setup.h +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/exynos4_setup.h
rename to arch/arm/mach-exynos/exynos4_setup.h

arch/arm/mach-exynos/exynos5_setup.h renamed from arch/arm/cpu/armv7/exynos/exynos5_setup.h +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/exynos5_setup.h
rename to arch/arm/mach-exynos/exynos5_setup.h

arch/arm/mach-exynos/include/mach/adc.h renamed from arch/arm/include/asm/arch-exynos/adc.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/adc.h
rename to arch/arm/mach-exynos/include/mach/adc.h

arch/arm/mach-exynos/include/mach/board.h renamed from arch/arm/include/asm/arch-exynos/board.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/board.h
rename to arch/arm/mach-exynos/include/mach/board.h

arch/arm/mach-exynos/include/mach/clk.h renamed from arch/arm/include/asm/arch-exynos/clk.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/clk.h
rename to arch/arm/mach-exynos/include/mach/clk.h

arch/arm/mach-exynos/include/mach/clock.h renamed from arch/arm/include/asm/arch-exynos/clock.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/clock.h
rename to arch/arm/mach-exynos/include/mach/clock.h

arch/arm/mach-exynos/include/mach/cpu.h renamed from arch/arm/include/asm/arch-exynos/cpu.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/cpu.h
rename to arch/arm/mach-exynos/include/mach/cpu.h

arch/arm/mach-exynos/include/mach/dmc.h renamed from arch/arm/include/asm/arch-exynos/dmc.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/dmc.h
rename to arch/arm/mach-exynos/include/mach/dmc.h

arch/arm/mach-exynos/include/mach/dp.h renamed from arch/arm/include/asm/arch-exynos/dp.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/dp.h
rename to arch/arm/mach-exynos/include/mach/dp.h

arch/arm/mach-exynos/include/mach/dp_info.h renamed from arch/arm/include/asm/arch-exynos/dp_info.h +0 -0

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

arch/arm/mach-exynos/include/mach/dsim.h renamed from arch/arm/include/asm/arch-exynos/dsim.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/dsim.h
rename to arch/arm/mach-exynos/include/mach/dsim.h

arch/arm/mach-exynos/include/mach/dwmmc.h renamed from arch/arm/include/asm/arch-exynos/dwmmc.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/dwmmc.h
rename to arch/arm/mach-exynos/include/mach/dwmmc.h

arch/arm/mach-exynos/include/mach/ehci.h renamed from arch/arm/include/asm/arch-exynos/ehci.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/ehci.h
rename to arch/arm/mach-exynos/include/mach/ehci.h

arch/arm/mach-exynos/include/mach/fb.h renamed from arch/arm/include/asm/arch-exynos/fb.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/fb.h
rename to arch/arm/mach-exynos/include/mach/fb.h

arch/arm/mach-exynos/include/mach/gpio.h renamed from arch/arm/include/asm/arch-exynos/gpio.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/gpio.h
rename to arch/arm/mach-exynos/include/mach/gpio.h

arch/arm/mach-exynos/include/mach/i2s-regs.h renamed from arch/arm/include/asm/arch-exynos/i2s-regs.h +0 -0

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

arch/arm/mach-exynos/include/mach/mipi_dsim.h renamed from arch/arm/include/asm/arch-exynos/mipi_dsim.h +0 -0

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

arch/arm/mach-exynos/include/mach/mmc.h renamed from arch/arm/include/asm/arch-exynos/mmc.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/mmc.h
rename to arch/arm/mach-exynos/include/mach/mmc.h

arch/arm/mach-exynos/include/mach/periph.h renamed from arch/arm/include/asm/arch-exynos/periph.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/periph.h
rename to arch/arm/mach-exynos/include/mach/periph.h

arch/arm/mach-exynos/include/mach/pinmux.h renamed from arch/arm/include/asm/arch-exynos/pinmux.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/pinmux.h
rename to arch/arm/mach-exynos/include/mach/pinmux.h

arch/arm/mach-exynos/include/mach/power.h renamed from arch/arm/include/asm/arch-exynos/power.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/power.h
rename to arch/arm/mach-exynos/include/mach/power.h

arch/arm/mach-exynos/include/mach/pwm.h renamed from arch/arm/include/asm/arch-exynos/pwm.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/pwm.h
rename to arch/arm/mach-exynos/include/mach/pwm.h

arch/arm/mach-exynos/include/mach/pwm_backlight.h renamed from arch/arm/include/asm/arch-exynos/pwm_backlight.h +0 -0

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

arch/arm/mach-exynos/include/mach/sound.h renamed from arch/arm/include/asm/arch-exynos/sound.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/sound.h
rename to arch/arm/mach-exynos/include/mach/sound.h

arch/arm/mach-exynos/include/mach/spi.h renamed from arch/arm/include/asm/arch-exynos/spi.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/spi.h
rename to arch/arm/mach-exynos/include/mach/spi.h

arch/arm/mach-exynos/include/mach/spl.h renamed from arch/arm/include/asm/arch-exynos/spl.h +1 -1

similarity index 98%
rename from arch/arm/include/asm/arch-exynos/spl.h
rename to arch/arm/mach-exynos/include/mach/spl.h
index cdcb2bc..0c480ac 100644
@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_EXYNOS_SPL_H__
 #define __ASM_ARCH_EXYNOS_SPL_H__
 
-#include <asm/arch-exynos/dmc.h>
+#include <asm/arch/dmc.h>
 #include <asm/arch/power.h>
 
 #ifndef __ASSEMBLY__

arch/arm/mach-exynos/include/mach/sromc.h renamed from arch/arm/include/asm/arch-exynos/sromc.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/sromc.h
rename to arch/arm/mach-exynos/include/mach/sromc.h

arch/arm/mach-exynos/include/mach/sys_proto.h renamed from arch/arm/include/asm/arch-exynos/sys_proto.h +0 -0

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

arch/arm/mach-exynos/include/mach/system.h renamed from arch/arm/include/asm/arch-exynos/system.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/system.h
rename to arch/arm/mach-exynos/include/mach/system.h

arch/arm/mach-exynos/include/mach/tmu.h renamed from arch/arm/include/asm/arch-exynos/tmu.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/tmu.h
rename to arch/arm/mach-exynos/include/mach/tmu.h

arch/arm/mach-exynos/include/mach/tzpc.h renamed from arch/arm/include/asm/arch-exynos/tzpc.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/tzpc.h
rename to arch/arm/mach-exynos/include/mach/tzpc.h

arch/arm/mach-exynos/include/mach/uart.h renamed from arch/arm/include/asm/arch-exynos/uart.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/uart.h
rename to arch/arm/mach-exynos/include/mach/uart.h

arch/arm/mach-exynos/include/mach/watchdog.h renamed from arch/arm/include/asm/arch-exynos/watchdog.h +0 -0

similarity index 100%
rename from arch/arm/include/asm/arch-exynos/watchdog.h
rename to arch/arm/mach-exynos/include/mach/watchdog.h

arch/arm/mach-exynos/include/mach/xhci-exynos.h renamed from arch/arm/include/asm/arch-exynos/xhci-exynos.h +0 -0

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

arch/arm/mach-exynos/lowlevel_init.c renamed from arch/arm/cpu/armv7/exynos/lowlevel_init.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/lowlevel_init.c
rename to arch/arm/mach-exynos/lowlevel_init.c

arch/arm/mach-exynos/pinmux.c renamed from arch/arm/cpu/armv7/exynos/pinmux.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/pinmux.c
rename to arch/arm/mach-exynos/pinmux.c

arch/arm/mach-exynos/power.c renamed from arch/arm/cpu/armv7/exynos/power.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/power.c
rename to arch/arm/mach-exynos/power.c

arch/arm/mach-exynos/sec_boot.S renamed from arch/arm/cpu/armv7/exynos/sec_boot.S +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/sec_boot.S
rename to arch/arm/mach-exynos/sec_boot.S

arch/arm/mach-exynos/soc.c renamed from arch/arm/cpu/armv7/exynos/soc.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/soc.c
rename to arch/arm/mach-exynos/soc.c

arch/arm/mach-exynos/spl_boot.c renamed from arch/arm/cpu/armv7/exynos/spl_boot.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/spl_boot.c
rename to arch/arm/mach-exynos/spl_boot.c

arch/arm/mach-exynos/system.c renamed from arch/arm/cpu/armv7/exynos/system.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/system.c
rename to arch/arm/mach-exynos/system.c

arch/arm/mach-exynos/tzpc.c renamed from arch/arm/cpu/armv7/exynos/tzpc.c +0 -0

similarity index 100%
rename from arch/arm/cpu/armv7/exynos/tzpc.c
rename to arch/arm/mach-exynos/tzpc.c

drivers/spi/exynos_spi.c +1 -1

index 67f6b2d..f194b7e 100644
@@ -16,7 +16,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/pinmux.h>
-#include <asm/arch-exynos/spi.h>
+#include <asm/arch/spi.h>
 #include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;

Signature · 1 line

1.6.6.rc2

Masahiro Yamada

2015-08-03 18:41 UTC #2 lore raw

PATCH 1/2 ARM: exynos: move SoC sources to mach-exynos

2015-08-03 21:28 GMT+09:00 Thomas Abraham <[email protected]>:

Quoted 7 lines

Move arch/arm/cpu/armv7/exynos/* to arch/arm/mach-exynos/* to allow reuse of existing code for ARMv8 based Exynos platforms.
Cc Minkyu Kang <[email protected]>
Cc Albert Aribaud <[email protected]>
Cc Masahiro Yamada <[email protected]>
Signed-off-by Thomas Abraham <[email protected]>

Very nice!

Reviewed-by Masahiro Yamada <[email protected]>

Signature · 2 lines

Best Regards
Masahiro Yamada

Simon Glass

2015-08-13 02:56 UTC #3 lore raw

PATCH 1/2 ARM: exynos: move SoC sources to mach-exynos

Hi,

Quoted 4 lines · Masahiro Yamada

2015-08-03 21:28 GMT+09:00 Thomas Abraham <[email protected]>:
Quoted 3 lines
Move arch/arm/cpu/armv7/exynos/* to arch/arm/mach-exynos/* to allow reuse of existing code for ARMv8 based Exynos platforms.

Quoted 8 lines

Quoted 4 lines
Cc Minkyu Kang <[email protected]>
Cc Albert Aribaud <[email protected]>
Cc Masahiro Yamada <[email protected]>
Signed-off-by Thomas Abraham <[email protected]>
Very nice!
Reviewed-by Masahiro Yamada <[email protected]>

It would be great if this could be applied soon!

Regards,
Simon

Thomas Abraham

author

2015-08-03 12:28 UTC #4 lore raw

PATCH 2/2 ARM: exynos: fix regression for Origen4210

In reply to Thomas Abraham

The do_lowlevel_init() function includes certian CA15 specific L2 cache configuration which is only applicable on Exynos5420 and members of its family. Fix the regression on Origen4210 by skipping the Exynos5420 specific portions of the code.

Cc Minkyu Kang <[email protected]>

Cc Albert Aribaud <[email protected]>

Signed-off-by Thomas Abraham <[email protected]>

---
 arch/arm/mach-exynos/common_setup.h  |    2 +-
 arch/arm/mach-exynos/lowlevel_init.c |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

arch/arm/mach-exynos/common_setup.h +1 -1

index 5235abb..67aac2d 100644
@@ -60,7 +60,7 @@ enum l2_cache_params {
 };
 
 
-#ifndef CONFIG_SYS_L2CACHE_OFF
+#if !defined(CONFIG_SYS_L2CACHE_OFF) && defined(CONFIG_EXYNOS5420)
 /*
  * Configure L2CTLR to get timings that keep us from hanging/crashing.
  *

arch/arm/mach-exynos/lowlevel_init.c +1 -3

index 120aaf8..1c125f6 100644
@@ -174,7 +174,7 @@ int do_lowlevel_init(void)
 
 	arch_cpu_init();
 
-#ifndef CONFIG_SYS_L2CACHE_OFF
+#if !defined(CONFIG_SYS_L2CACHE_OFF) && defined(CONFIG_EXYNOS5420)
 	/*
 	 * Init L2 cache parameters here for use by boot and resume
 	 *

@@ -187,9 +187,7 @@ int do_lowlevel_init(void)
 	configure_l2_actlr();
 	dsb();
 	isb();
-#endif
 
-#ifdef CONFIG_EXYNOS5420
 	relocate_wait_code();
 
 	/* Reconfigure secondary cores */

Signature · 1 line

1.6.6.rc2

Przemyslaw Marczak

2015-08-13 08:46 UTC #5 lore raw

cover ARM: exynos: reorganize SoC code

In reply to Thomas Abraham

Hello Thomas,

Quoted 120 lines · Thomas Abraham

In order to reuse existing ARMv7 based Exynos SoC support for ARMv8 based Exynos platforms, move the existing sources from arch/arm/cpu/armv7/exynos to arch/arm/mach-exynos.
This patch series has been tested on origen (Exynos4210), smdk5250 and smdk5420 boards. And compile tested for the following configs
smdkv310, trats, snow, trats2, odroid, peach-pit, s5p_goni, s5pc210_universal, peach-pi, arndale.
This patch series is based on master branch of Samsung u-boot repo
(git://git.denx.de/u-boot-samsung.git)
Thomas Abraham (2):
ARM: exynos: move SoC sources to mach-exynos
ARM: exynos: fix regression for Origen4210
  arch/arm/Kconfig                                   |    2 +-
  arch/arm/Makefile                                  |    1 +
  arch/arm/cpu/armv7/Makefile                        |    1 -
  arch/arm/{cpu/armv7/exynos => mach-exynos}/Kconfig |    0
  .../arm/{cpu/armv7/exynos => mach-exynos}/Makefile |    0
  arch/arm/{cpu/armv7/exynos => mach-exynos}/clock.c |    0
  .../{cpu/armv7/exynos => mach-exynos}/clock_init.h |    0
  .../exynos => mach-exynos}/clock_init_exynos4.c    |    0
  .../exynos => mach-exynos}/clock_init_exynos5.c    |    0
  .../armv7/exynos => mach-exynos}/common_setup.h    |    2 +-
  .../{cpu/armv7/exynos => mach-exynos}/config.mk    |    0
  .../{cpu/armv7/exynos => mach-exynos}/dmc_common.c |    0
  .../armv7/exynos => mach-exynos}/dmc_init_ddr3.c   |    0
  .../exynos => mach-exynos}/dmc_init_exynos4.c      |    0
  .../armv7/exynos => mach-exynos}/exynos4_setup.h   |    0
  .../armv7/exynos => mach-exynos}/exynos5_setup.h   |    0
  .../arch-exynos => mach-exynos/include/mach}/adc.h |    0
  .../include/mach}/board.h                          |    0
  .../arch-exynos => mach-exynos/include/mach}/clk.h |    0
  .../include/mach}/clock.h                          |    0
  .../arch-exynos => mach-exynos/include/mach}/cpu.h |    0
  .../arch-exynos => mach-exynos/include/mach}/dmc.h |    0
  .../arch-exynos => mach-exynos/include/mach}/dp.h  |    0
  .../include/mach}/dp_info.h                        |    0
  .../include/mach}/dsim.h                           |    0
  .../include/mach}/dwmmc.h                          |    0
  .../include/mach}/ehci.h                           |    0
  .../arch-exynos => mach-exynos/include/mach}/fb.h  |    0
  .../include/mach}/gpio.h                           |    0
  .../include/mach}/i2s-regs.h                       |    0
  .../include/mach}/mipi_dsim.h                      |    0
  .../arch-exynos => mach-exynos/include/mach}/mmc.h |    0
  .../include/mach}/periph.h                         |    0
  .../include/mach}/pinmux.h                         |    0
  .../include/mach}/power.h                          |    0
  .../arch-exynos => mach-exynos/include/mach}/pwm.h |    0
  .../include/mach}/pwm_backlight.h                  |    0
  .../include/mach}/sound.h                          |    0
  .../arch-exynos => mach-exynos/include/mach}/spi.h |    0
  .../arch-exynos => mach-exynos/include/mach}/spl.h |    2 +-
  .../include/mach}/sromc.h                          |    0
  .../include/mach}/sys_proto.h                      |    0
  .../include/mach}/system.h                         |    0
  .../arch-exynos => mach-exynos/include/mach}/tmu.h |    0
  .../include/mach}/tzpc.h                           |    0
  .../include/mach}/uart.h                           |    0
  .../include/mach}/watchdog.h                       |    0
  .../include/mach}/xhci-exynos.h                    |    0
  .../armv7/exynos => mach-exynos}/lowlevel_init.c   |    4 +---
  .../arm/{cpu/armv7/exynos => mach-exynos}/pinmux.c |    0
  arch/arm/{cpu/armv7/exynos => mach-exynos}/power.c |    0
  .../{cpu/armv7/exynos => mach-exynos}/sec_boot.S   |    0
  arch/arm/{cpu/armv7/exynos => mach-exynos}/soc.c   |    0
  .../{cpu/armv7/exynos => mach-exynos}/spl_boot.c   |    0
  .../arm/{cpu/armv7/exynos => mach-exynos}/system.c |    0
  arch/arm/{cpu/armv7/exynos => mach-exynos}/tzpc.c  |    0
  drivers/spi/exynos_spi.c                           |    2 +-
  57 files changed, 6 insertions(+), 8 deletions(-)
rename arch/arm/{cpu/armv7/exynos => mach-exynos}/Kconfig (100%)
rename arch/arm/{cpu/armv7/exynos => mach-exynos}/Makefile (100%)
rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock.c (100%)
rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init.h (100%)
rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init_exynos4.c (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init_exynos5.c (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/common_setup.h (97%)
rename arch/arm/{cpu/armv7/exynos => mach-exynos}/config.mk (100%)
rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_common.c (100%)
rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_init_ddr3.c (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_init_exynos4.c (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/exynos4_setup.h (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/exynos5_setup.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/adc.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/board.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/clk.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/clock.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/cpu.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dmc.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dp.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dp_info.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dsim.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dwmmc.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/ehci.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/fb.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/i2s-regs.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/mipi_dsim.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/mmc.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/periph.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pinmux.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/power.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pwm.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pwm_backlight.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sound.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/spi.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/spl.h (98%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sromc.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sys_proto.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/system.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/tmu.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/tzpc.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/uart.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/watchdog.h (100%) rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/xhci-exynos.h (100%)

Quoted 9 lines

rename arch/arm/{cpu/armv7/exynos => mach-exynos}/lowlevel_init.c (98%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/pinmux.c (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/power.c (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/sec_boot.S (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/soc.c (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/spl_boot.c (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/system.c (100%) rename arch/arm/{cpu/armv7/exynos => mach-exynos}/tzpc.c (100%)

Tested on: Trats2, Odroid U3, Odroid XU3

Tested-by Przemyslaw Marczak <[email protected]>

Acked-by Przemyslaw Marczak <[email protected]>

Best regards,

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com

Minkyu Kang

2015-08-17 06:33 UTC #6 lore raw

cover ARM: exynos: reorganize SoC code

In reply to Thomas Abraham

Dear Thomas Abraham,

Quoted 120 lines · Thomas Abraham

In order to reuse existing ARMv7 based Exynos SoC support for ARMv8 based Exynos platforms, move the existing sources from arch/arm/cpu/armv7/exynos to arch/arm/mach-exynos.

This patch series has been tested on origen (Exynos4210), smdk5250 and smdk5420 boards. And compile tested for the following configs

smdkv310, trats, snow, trats2, odroid, peach-pit, s5p_goni, s5pc210_universal, peach-pi, arndale.

This patch series is based on master branch of Samsung u-boot repo
(git://git.denx.de/u-boot-samsung.git)

Thomas Abraham (2):
ARM: exynos: move SoC sources to mach-exynos
ARM: exynos: fix regression for Origen4210

 arch/arm/Kconfig                                   |    2 +-
 arch/arm/Makefile                                  |    1 +
 arch/arm/cpu/armv7/Makefile                        |    1 -
 arch/arm/{cpu/armv7/exynos => mach-exynos}/Kconfig |    0
 .../arm/{cpu/armv7/exynos => mach-exynos}/Makefile |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/clock.c |    0
 .../{cpu/armv7/exynos => mach-exynos}/clock_init.h |    0
 .../exynos => mach-exynos}/clock_init_exynos4.c    |    0
 .../exynos => mach-exynos}/clock_init_exynos5.c    |    0
 .../armv7/exynos => mach-exynos}/common_setup.h    |    2 +-
 .../{cpu/armv7/exynos => mach-exynos}/config.mk    |    0
 .../{cpu/armv7/exynos => mach-exynos}/dmc_common.c |    0
 .../armv7/exynos => mach-exynos}/dmc_init_ddr3.c   |    0
 .../exynos => mach-exynos}/dmc_init_exynos4.c      |    0
 .../armv7/exynos => mach-exynos}/exynos4_setup.h   |    0
 .../armv7/exynos => mach-exynos}/exynos5_setup.h   |    0
 .../arch-exynos => mach-exynos/include/mach}/adc.h |    0
 .../include/mach}/board.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/clk.h |    0
 .../include/mach}/clock.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/cpu.h |    0
 .../arch-exynos => mach-exynos/include/mach}/dmc.h |    0
 .../arch-exynos => mach-exynos/include/mach}/dp.h  |    0
 .../include/mach}/dp_info.h                        |    0
 .../include/mach}/dsim.h                           |    0
 .../include/mach}/dwmmc.h                          |    0
 .../include/mach}/ehci.h                           |    0
 .../arch-exynos => mach-exynos/include/mach}/fb.h  |    0
 .../include/mach}/gpio.h                           |    0
 .../include/mach}/i2s-regs.h                       |    0
 .../include/mach}/mipi_dsim.h                      |    0
 .../arch-exynos => mach-exynos/include/mach}/mmc.h |    0
 .../include/mach}/periph.h                         |    0
 .../include/mach}/pinmux.h                         |    0
 .../include/mach}/power.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/pwm.h |    0
 .../include/mach}/pwm_backlight.h                  |    0
 .../include/mach}/sound.h                          |    0
 .../arch-exynos => mach-exynos/include/mach}/spi.h |    0
 .../arch-exynos => mach-exynos/include/mach}/spl.h |    2 +-
 .../include/mach}/sromc.h                          |    0
 .../include/mach}/sys_proto.h                      |    0
 .../include/mach}/system.h                         |    0
 .../arch-exynos => mach-exynos/include/mach}/tmu.h |    0
 .../include/mach}/tzpc.h                           |    0
 .../include/mach}/uart.h                           |    0
 .../include/mach}/watchdog.h                       |    0
 .../include/mach}/xhci-exynos.h                    |    0
 .../armv7/exynos => mach-exynos}/lowlevel_init.c   |    4 +---
 .../arm/{cpu/armv7/exynos => mach-exynos}/pinmux.c |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/power.c |    0
 .../{cpu/armv7/exynos => mach-exynos}/sec_boot.S   |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/soc.c   |    0
 .../{cpu/armv7/exynos => mach-exynos}/spl_boot.c   |    0
 .../arm/{cpu/armv7/exynos => mach-exynos}/system.c |    0
 arch/arm/{cpu/armv7/exynos => mach-exynos}/tzpc.c  |    0
 drivers/spi/exynos_spi.c                           |    2 +-
 57 files changed, 6 insertions(+), 8 deletions(-)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/Kconfig (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/Makefile (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init.h (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init_exynos4.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/clock_init_exynos5.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/common_setup.h (97%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/config.mk (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_common.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_init_ddr3.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/dmc_init_exynos4.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/exynos4_setup.h (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/exynos5_setup.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/adc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/board.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/clk.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/clock.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/cpu.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dmc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dp.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dp_info.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dsim.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/dwmmc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/ehci.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/fb.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/gpio.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/i2s-regs.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/mipi_dsim.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/mmc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/periph.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pinmux.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/power.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pwm.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/pwm_backlight.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sound.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/spi.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/spl.h (98%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sromc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/sys_proto.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/system.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/tmu.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/tzpc.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/uart.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/watchdog.h (100%)
 rename arch/arm/{include/asm/arch-exynos => mach-exynos/include/mach}/xhci-exynos.h (100%)

Quoted 9 lines

 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/lowlevel_init.c (98%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/pinmux.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/power.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/sec_boot.S (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/soc.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/spl_boot.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/system.c (100%)
 rename arch/arm/{cpu/armv7/exynos => mach-exynos}/tzpc.c (100%)

applied to u-boot-samsung.

Thanks,
Minkyu Kang.