From 51bf6848bc309f4e1111a756f8800a9586c3e3dd Mon Sep 17 00:00:00 2001
From: Lucas Stach <l.stach@pengutronix.de>
Date: Thu, 12 Oct 2017 12:26:52 +0200
Subject: ARM: vexpress: switch to DT probe and multi-image build

This switches the VExpress support to use an internal DT, instead
of probing the peripherals from a board file. It also switches to
a multi-iamge build with both CA9 and CA15 variants of the VExpress
board being supported.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boards/vexpress/init.c | 115 ++--------------------------------------
 1 file changed, 4 insertions(+), 111 deletions(-)

(limited to 'arch/arm/boards/vexpress/init.c')

diff --git a/arch/arm/boards/vexpress/init.c b/arch/arm/boards/vexpress/init.c
index f89dff9392..1bbc8c3476 100644
--- a/arch/arm/boards/vexpress/init.c
+++ b/arch/arm/boards/vexpress/init.c
@@ -11,129 +11,23 @@
 #include <generated/mach-types.h>
 #include <mach/devices.h>
 #include <environment.h>
-#include <partition.h>
 #include <linux/sizes.h>
 #include <io.h>
 #include <envfs.h>
 #include <globalvar.h>
 #include <linux/amba/sp804.h>
-#include <mci.h>
-
-struct vexpress_init {
-	void (*core_init)(void);
-	void (*mem_init)(void);
-	void (*console_init)(void);
-	void (*devices_init)(void);
-};
-
-struct mmci_platform_data mmci_plat = {
-	.ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,
-	.clkdiv_init	= SDI_CLKCR_CLKDIV_INIT,
-};
-
-struct vexpress_init *v2m_init;
-
-static void vexpress_ax_mem_init(void)
-{
-	vexpress_add_ddram(SZ_512M);
-}
 
 #define V2M_SYS_FLASH	0x03c
 
-static void vexpress_ax_devices_init(void)
-{
-	add_cfi_flash_device(0, 0x08000000, SZ_64M, 0);
-	add_cfi_flash_device(1, 0x0c000000, SZ_64M, 0);
-	vexpress_register_mmc(&mmci_plat);
-	add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x1a000000,
-			64 * 1024, IORESOURCE_MEM, NULL);
-}
-
-static void vexpress_ax_console_init(void)
-{
-	vexpress_register_uart(0);
-	vexpress_register_uart(1);
-	vexpress_register_uart(2);
-	vexpress_register_uart(3);
-}
-
-struct vexpress_init vexpress_init_ax = {
-	.core_init = vexpress_init,
-	.mem_init = vexpress_ax_mem_init,
-	.console_init = vexpress_ax_console_init,
-	.devices_init = vexpress_ax_devices_init,
-};
-
-static void vexpress_a9_legacy_mem_init(void)
-{
-	vexpress_a9_legacy_add_ddram(SZ_512M, SZ_512M);
-}
-
-static void vexpress_a9_legacy_devices_init(void)
-{
-	add_cfi_flash_device(0, 0x40000000, SZ_64M, 0);
-	add_cfi_flash_device(1, 0x44000000, SZ_64M, 0);
-	add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x4e000000,
-			64 * 1024, IORESOURCE_MEM, NULL);
-	vexpress_a9_legacy_register_mmc(&mmci_plat);
-	armlinux_set_architecture(MACH_TYPE_VEXPRESS);
-}
-
-static void vexpress_a9_legacy_console_init(void)
-{
-	vexpress_a9_legacy_register_uart(0);
-	vexpress_a9_legacy_register_uart(1);
-	vexpress_a9_legacy_register_uart(2);
-	vexpress_a9_legacy_register_uart(3);
-}
-
-struct vexpress_init vexpress_init_a9_legacy = {
-	.core_init = vexpress_a9_legacy_init,
-	.mem_init = vexpress_a9_legacy_mem_init,
-	.console_init = vexpress_a9_legacy_console_init,
-	.devices_init = vexpress_a9_legacy_devices_init,
-};
-
-static int vexpress_mem_init(void)
-{
-	v2m_init->mem_init();
-
-	return 0;
-}
-mem_initcall(vexpress_mem_init);
-
-static int vexpress_devices_init(void)
-{
-	writel(1, v2m_sysreg_base + V2M_SYS_FLASH);
-	v2m_init->devices_init();
-
-	devfs_add_partition("nor0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self");
-	devfs_add_partition("nor0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0");
-
-	if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC))
-		defaultenv_append_directory(defaultenv_vexpress);
-
-	return 0;
-}
-device_initcall(vexpress_devices_init);
-
-static int vexpress_console_init(void)
-{
-	v2m_init->console_init();
-
-	return 0;
-}
-console_initcall(vexpress_console_init);
-
 static int vexpress_core_init(void)
 {
 	char *hostname = "vexpress-unknown";
 
 	if (amba_is_arm_sp804(IOMEM(0x10011000))) {
-		v2m_init = &vexpress_init_a9_legacy;
+		vexpress_a9_legacy_init();
 		hostname = "vexpress-a9-legacy";
 	} else {
-		v2m_init = &vexpress_init_ax;
+		vexpress_init();
 		if (cpu_is_cortex_a5())
 			hostname = "vexpress-a5";
 		else if (cpu_is_cortex_a7())
@@ -144,10 +38,9 @@ static int vexpress_core_init(void)
 			hostname = "vexpress-a15";
 	}
 
-	barebox_set_model("ARM Vexpress");
-	barebox_set_hostname(hostname);
+	writel(1, v2m_sysreg_base + V2M_SYS_FLASH);
 
-	v2m_init->core_init();
+	barebox_set_hostname(hostname);
 
 	return 0;
 }
-- 
cgit v1.2.3