ARM: imx6ul: Move liteSOM source to SoC directory

Moving arch/arm/mach-litesom/ to arch/arm/cpu/armv7/mx6/ was requested
in [1] during discussion of chiliSOM support patches.

[1] http://lists.denx.de/pipermail/u-boot/2017-January/279137.html

Suggested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c04adfbe5034fdbd5793dca9a136f0b1a5fa16dc..6e86c6c00fb1b26b0731e857a16988d66920a841 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1025,8 +1025,6 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
-source "arch/arm/mach-litesom/Kconfig"
-
 source "arch/arm/mach-mvebu/Kconfig"
 
 source "arch/arm/cpu/armv7/ls102xa/Kconfig"

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 4b8bf80c40394ed61e48d564943fba286f33474b..9c6834b3324266a8de47fb0cdc61a90fbba09d4a 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -58,7 +58,6 @@ machine-$(CONFIG_ARCH_HIGHBANK)               += highbank
 machine-$(CONFIG_ARCH_KEYSTONE)                += keystone
 # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
 machine-$(CONFIG_KIRKWOOD)             += kirkwood
-machine-$(CONFIG_LITESOM)              += litesom
 machine-$(CONFIG_ARCH_MESON)           += meson
 machine-$(CONFIG_ARCH_MVEBU)           += mvebu
 # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA

diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 3b0409122edc42d8c18a3ef730ec5dbfb83121d7..995a91073427c507b135e1072583722d024d204d 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -35,6 +35,13 @@ config MX6UL
        select ROM_UNIFIED_SECTIONS
        bool
 
+config MX6UL_LITESOM
+       bool
+       select MX6UL
+       select DM
+       select DM_THERMAL
+       select SUPPORT_SPL
+
 config MX6ULL
        bool
        select MX6UL
@@ -248,7 +255,7 @@ config TARGET_PICO_IMX6UL
 config TARGET_LITEBOARD
        bool "Grinn liteBoard (i.MX6UL)"
        select BOARD_LATE_INIT
-       select LITESOM
+       select MX6UL_LITESOM
 
 config TARGET_PLATINUM_PICON
        bool "platinum-picon"

diff --git a/arch/arm/cpu/armv7/mx6/Makefile b/arch/arm/cpu/armv7/mx6/Makefile
index 8af191d660b61f212dec4ed0df4d13d29da88f5a..024f7031ad661969319fc5ed6899349b9cc9bbe4 100644 (file)
--- a/arch/arm/cpu/armv7/mx6/Makefile
+++ b/arch/arm/cpu/armv7/mx6/Makefile
@@ -10,3 +10,4 @@
 obj-y  := soc.o clock.o
 obj-$(CONFIG_SPL_BUILD)             += ddr.o
 obj-$(CONFIG_MP)             += mp.o
+obj-$(CONFIG_MX6UL_LITESOM)  += litesom.o

diff --git a/arch/arm/mach-litesom/litesom.c b/arch/arm/cpu/armv7/mx6/litesom.c
similarity index 100%
rename from arch/arm/mach-litesom/litesom.c
rename to arch/arm/cpu/armv7/mx6/litesom.c

diff --git a/arch/arm/mach-litesom/include/mach/litesom.h b/arch/arm/include/asm/arch-mx6/litesom.h
similarity index 68%
rename from arch/arm/mach-litesom/include/mach/litesom.h
rename to arch/arm/include/asm/arch-mx6/litesom.h
index 6833949ae8d9ac73e96d96b5828531eba6586671..656b96aca9268751690e256be370f73a85fc9729 100644 (file)
--- a/arch/arm/mach-litesom/include/mach/litesom.h
+++ b/arch/arm/include/asm/arch-mx6/litesom.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#ifndef __ARCH_ARM_MACH_LITESOM_SOM_H__
-#define __ARCH_ARM_MACH_LITESOM_SOM_H__
+#ifndef __ARCH_ARM_MX6UL_LITESOM_H__
+#define __ARCH_ARM_MX6UL_LITESOM_H__
 
 int litesom_mmc_init(bd_t *bis);
 

diff --git a/arch/arm/mach-litesom/Kconfig b/arch/arm/mach-litesom/Kconfig
deleted file mode 100644 (file)
index 9b7f36d..0000000
--- a/arch/arm/mach-litesom/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-config LITESOM
-       bool
-       select MX6UL
-       select DM
-       select DM_THERMAL
-       select SUPPORT_SPL

diff --git a/arch/arm/mach-litesom/Makefile b/arch/arm/mach-litesom/Makefile
deleted file mode 100644 (file)
index b15eb64..0000000
--- a/arch/arm/mach-litesom/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# (C) Copyright 2016 Grinn
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y  := litesom.o

diff --git a/board/grinn/liteboard/board.c b/board/grinn/liteboard/board.c
index 13dd0a63db557dd0d61acf526d7cf269dc7e32b5..2d184c8125bbaac19ed82c9b73723687dd71ee1b 100644 (file)
--- a/board/grinn/liteboard/board.c
+++ b/board/grinn/liteboard/board.c
@@ -9,6 +9,7 @@
 #include <asm/arch/iomux.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
+#include <asm/arch/litesom.h>
 #include <asm/arch/mx6ul_pins.h>
 #include <asm/arch/mx6-pins.h>
 #include <asm/arch/sys_proto.h>
@@ -20,7 +21,6 @@
 #include <fsl_esdhc.h>
 #include <linux/sizes.h>
 #include <linux/fb.h>
-#include <mach/litesom.h>
 #include <miiphy.h>
 #include <mmc.h>
 #include <netdev.h>