ARM: clps711x: Switch to devicetree usage

new file mode 100644
index 0000000000..9603facc10
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: Alexander Shiyan <[email protected]>
+
+#include <envfs.h>
+#include <init.h>
+#include <of.h>
+#include <stdio.h>
+#include <asm/io.h>
+#include <mach/clps711x.h>
+
+static int clep7212_dt_fixup(struct device_node *root, void *context)
+{
+	char *serial = basprintf("%08x%08x", 0, readl(UNIQID));
+
+	of_set_property(root, "serial-number", serial, strlen(serial) + 1, 1);
+
+	free(serial);
+
+	return 0;
+}
+
+static __init int clep7212_fixup(void)
+{
+	if (of_machine_is_compatible("cirrus,ep7209"))
+		of_register_fixup(clep7212_dt_fixup, NULL);
+
+	return 0;
+}
+postcore_initcall(clep7212_fixup);
+
+static __init int clep7212_defaultenv_init(void)
+{
+	if (of_machine_is_compatible("cirrus,ep7209"))
+		defaultenv_append_directory(defaultenv_clep7212);
+
+	return 0;
+}
+device_initcall(clep7212_defaultenv_init);

57 lines not on this page · raw message

index 41827dfa16..845e893d98 100644
@@ -1,22 +1,22 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-// SPDX-FileCopyrightText: 2012 Alexander Shiyan <[email protected]>
+// SPDX-FileCopyrightText: Alexander Shiyan <[email protected]>
 
+#include <asm/barebox-arm.h>
 #include <common.h>
-#include <init.h>
-
-#include <asm/barebox-arm-head.h>
-
 #include <mach/clps711x.h>
 
-#ifdef CONFIG_CLPS711X_RAISE_CPUFREQ
-# define CLPS711X_CPU_PLL_MULT	50
-#else
-# define CLPS711X_CPU_PLL_MULT	40
-#endif
+extern char __dtb_ep7212_clep7212_start[];
 
-void __naked __bare_init barebox_arm_reset_vector(uint32_t r0, uint32_t r1, uint32_t r2)
+ENTRY_FUNCTION(start_ep7212_clep7212, r0, r1, r2)
 {
+	void *fdt;
+
 	arm_cpu_lowlevel_init();
 
-	clps711x_barebox_entry(CLPS711X_CPU_PLL_MULT, NULL);
+	/* Stack in SRAM */
+	arm_setup_stack(CS6_BASE - 16);
+
+	fdt = __dtb_ep7212_clep7212_start;
+
+	clps711x_start(fdt + get_runtime_offset());
 }

76 lines not on this page · raw message

129 lines not on this page · raw message

index 957b2b8477..9aef7f3fd3 100644
@@ -1,13 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
- *  Hardware definitions for Cirrus Logic CLPS711X
- *
- *  Copyright (C) 2000 Deep Blue Solutions Ltd.
- *  Copyright (C) 2012 Alexander Shiyan <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Copyright (C) 2000 Deep Blue Solutions Ltd.
+ * Copyright (C) 2012-2022 Alexander Shiyan <[email protected]>
  */
 
 #ifndef __MACH_CLPS711X_H

@@ -159,6 +153,10 @@
 #define SYSCON2_CLKENSL		(1 << 13)
 #define SYSCON2_BUZFREQ		(1 << 14)
 
+#define SYSCON_UARTEN		(1 << 8)
+#define SYSFLG_UBUSY		(1 << 11)
+#define SYSFLG_UTXFF		(1 << 23)
+
 #define SYNCIO_FRMLEN(x)	(((x) & 0x1f) << 8)
 #define SYNCIO_SMCKEN		(1 << 13)
 #define SYNCIO_TXFRMEN		(1 << 14)

@@ -247,6 +245,16 @@
 #define MEMCFG_WAITSTATE_2_0	(14 << 2)
 #define MEMCFG_WAITSTATE_1_0	(15 << 2)
 
-void clps711x_barebox_entry(u32, void *);
+#define UBRLCR_BREAK		(1 << 12)
+#define UBRLCR_PRTEN		(1 << 13)
+#define UBRLCR_EVENPRT		(1 << 14)
+#define UBRLCR_XSTOP		(1 << 15)
+#define UBRLCR_FIFOEN		(1 << 16)
+#define UBRLCR_WRDLEN5		(0 << 17)
+#define UBRLCR_WRDLEN6		(1 << 17)
+#define UBRLCR_WRDLEN7		(2 << 17)
+#define UBRLCR_WRDLEN8		(3 << 17)
+
+void clps711x_start(void *);
 
 #endif

new file mode 100644
index 0000000000..342bb7628a
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-FileCopyrightText: Alexander Shiyan <[email protected]>
+
+#ifndef __MACH_DEBUG_LL_H__
+#define __MACH_DEBUG_LL_H__
+
+#include <asm/io.h>
+#include <mach/clps711x.h>
+
+static inline void PUTC_LL(char c)
+{
+	do {
+	} while (readl(SYSFLG1) & SYSFLG_UTXFF);
+
+	writew(c, UARTDR1);
+
+	do {
+	} while (readl(SYSFLG1) & SYSFLG_UBUSY);
+}
+
+#endif

deleted file mode 100644
index 77c43be25c..0000000000
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef __MACH_DEVICES_H
-#define __MACH_DEVICES_H
-
-void clps711x_setup_memcfg(int bank, u32 val);
-void clps711x_add_uart(unsigned int id);
-
-#endif

105 lines not on this page · raw message

deleted file mode 100644
index 90ddb8f5d2..0000000000
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2012 Alexander Shiyan <[email protected]>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- */
-
-#include <common.h>
-#include <init.h>
-#include <restart.h>
-
-static void __noreturn clps711x_restart_soc(struct restart_handler *rst)
-{
-	shutdown_barebox();
-
-	asm("mov pc, #0");
-
-	hang();
-}
-
-static int restart_register_feature(void)
-{
-	restart_handler_register_fn("vector", clps711x_restart_soc);
-
-	return 0;
-}
-coredevice_initcall(restart_register_feature);

index 1fe7f6c891..8465ee502f 100644
@@ -27,6 +27,11 @@ static int clps711x_cs_probe(struct device_d *dev)
 	struct resource *iores;
 	u32 rate;
 	struct clk *timer_clk;
+	int id;
+
+	id = of_alias_get_id(dev->device_node, "timer");
+	if (id != 1)
+		return 0;
 
 	timer_clk = clk_get(dev, NULL);
 	if (IS_ERR(timer_clk))

index a1965b33e4..45035e7a09 100644
@@ -10,13 +10,10 @@
 static int clps711x_gpio_probe(struct device_d *dev)
 {
 	struct resource *iores;
-	int err, id = dev->id;
+	int err, id = of_alias_get_id(dev->device_node, "gpio");
 	void __iomem *dat, *dir = NULL, *dir_inv = NULL;
 	struct bgpio_chip *bgc;
 
-	if (dev->device_node)
-		id = of_alias_get_id(dev->device_node, "gpio");
-
 	if (id < 0 || id > 4)
 		return -ENODEV;
 

120 lines not on this page · raw message