integrator: switch to DM serial port

This switches the Integrator boards over to using the device model for its serial ports. Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

integrator: switch to DM serial port
This switches the Integrator boards over to using the device model for its serial ports. Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Linus Walleij · Tom Rini
1 parent e0266f4942
Showing 6 changed files with 28 additions and 20 deletions Side-by-side Diff
arch/arm/Kconfig
arch/arm/mach-integrator/Kconfig
board/armltd/integrator/integrator.c
include/configs/integrator-common.h
include/configs/integratorap.h
include/configs/integratorcp.h
@@ -458,6 +458,8 @@
  
 config ARCH_INTEGRATOR
 	bool "ARM Ltd. Integrator family"
+	select DM
+	select DM_SERIAL
  
 config ARCH_KEYSTONE
 	bool "TI Keystone"
@@ -53,5 +53,8 @@
 	default "integratorap" if ARCH_INTEGRATOR_AP
 	default "integratorcp" if ARCH_INTEGRATOR_CP
  
+config SYS_MALLOC_F_LEN
+	default 0x2000
+
 endmenu
@@ -20,10 +20,28 @@
 #include <common.h>
 #include <netdev.h>
 #include <asm/io.h>
+#include <dm/platdata.h>
+#include <dm/platform_data/serial_pl01x.h>
 #include "arm-ebi.h"
 #include "integrator-sc.h"
  
 DECLARE_GLOBAL_DATA_PTR;
+
+static const struct pl01x_serial_platdata serial_platdata = {
+	.base = 0x16000000,
+#ifdef CONFIG_ARCH_CINTEGRATOR
+	.type = TYPE_PL011,
+	.clock = 14745600,
+#else
+	.type = TYPE_PL010,
+	.clock = 0, /* Not used for PL010 */
+#endif
+};
+
+U_BOOT_DEVICE(integrator_serials) = {
+	.name = "serial_pl01x",
+	.platdata = &serial_platdata,
+};
  
 void peripheral_power_enable (void);
  
@@ -20,6 +20,11 @@
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/
 #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */
  
+/* Serial port PL010/PL011 through the device model */
+#define CONFIG_PL01X_SERIAL
+#define CONFIG_BAUDRATE			38400
+#define CONFIG_CONS_INDEX		0
+
 #define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs  */
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_OF_LIBFDT		/* enable passing a Device Tree */
@@ -21,17 +21,6 @@
 #define CONFIG_SYS_HZ_CLOCK		24000000	/* Timer 1 is clocked at 24Mhz */
  
 /*
- * PL010 Configuration
- */
-#define CONFIG_PL010_SERIAL
-#define CONFIG_CONS_INDEX	0
-#define CONFIG_BAUDRATE		38400
-#define CONFIG_PL01x_PORTS	{ (void *) (CONFIG_SYS_SERIAL0), (void *) (CONFIG_SYS_SERIAL1) }
-#define CONFIG_SYS_SERIAL0		0x16000000
-#define CONFIG_SYS_SERIAL1		0x17000000
-
-
-/*
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
@@ -28,15 +28,6 @@
 #define CONFIG_SMC91111_BASE    0xC8000000
 #undef CONFIG_SMC91111_EXT_PHY
  
-/* PL011 configuration */
-#define CONFIG_PL011_SERIAL
-#define CONFIG_PL011_CLOCK	14745600
-#define CONFIG_PL01x_PORTS	{ (void *)CONFIG_SYS_SERIAL0, (void *)CONFIG_SYS_SERIAL1 }
-#define CONFIG_CONS_INDEX	0
-#define CONFIG_BAUDRATE		38400
-#define CONFIG_SYS_SERIAL0		0x16000000
-#define CONFIG_SYS_SERIAL1		0x17000000
-
 /*
  * Command line configuration.
  */
...	...	@@ -458,6 +458,8 @@
458	458
459	459	config ARCH_INTEGRATOR
460	460	bool "ARM Ltd. Integrator family"
	461	+ select DM
	462	+ select DM_SERIAL
461	463
462	464	config ARCH_KEYSTONE
463	465	bool "TI Keystone"
...	...	@@ -53,5 +53,8 @@
53	53	default "integratorap" if ARCH_INTEGRATOR_AP
54	54	default "integratorcp" if ARCH_INTEGRATOR_CP
55	55
	56	+config SYS_MALLOC_F_LEN
	57	+ default 0x2000
	58	+
56	59	endmenu
...	...	@@ -20,10 +20,28 @@
20	20	#include <common.h>
21	21	#include <netdev.h>
22	22	#include <asm/io.h>
	23	+#include <dm/platdata.h>
	24	+#include <dm/platform_data/serial_pl01x.h>
23	25	#include "arm-ebi.h"
24	26	#include "integrator-sc.h"
25	27
26	28	DECLARE_GLOBAL_DATA_PTR;
	29	+
	30	+static const struct pl01x_serial_platdata serial_platdata = {
	31	+ .base = 0x16000000,
	32	+#ifdef CONFIG_ARCH_CINTEGRATOR
	33	+ .type = TYPE_PL011,
	34	+ .clock = 14745600,
	35	+#else
	36	+ .type = TYPE_PL010,
	37	+ .clock = 0, /* Not used for PL010 */
	38	+#endif
	39	+};
	40	+
	41	+U_BOOT_DEVICE(integrator_serials) = {
	42	+ .name = "serial_pl01x",
	43	+ .platdata = &serial_platdata,
	44	+};
27	45
28	46	void peripheral_power_enable (void);
29	47
...	...	@@ -20,6 +20,11 @@
20	20	#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/
21	21	#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 1281024) / Size of malloc() pool */
22	22
	23	+/* Serial port PL010/PL011 through the device model */
	24	+#define CONFIG_PL01X_SERIAL
	25	+#define CONFIG_BAUDRATE 38400
	26	+#define CONFIG_CONS_INDEX 0
	27	+
23	28	#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
24	29	#define CONFIG_SETUP_MEMORY_TAGS
25	30	#define CONFIG_OF_LIBFDT /* enable passing a Device Tree */
...	...	@@ -21,17 +21,6 @@
21	21	#define CONFIG_SYS_HZ_CLOCK 24000000 /* Timer 1 is clocked at 24Mhz */
22	22
23	23	/*
24		- * PL010 Configuration
25		- */
26		-#define CONFIG_PL010_SERIAL
27		-#define CONFIG_CONS_INDEX 0
28		-#define CONFIG_BAUDRATE 38400
29		-#define CONFIG_PL01x_PORTS { (void ) (CONFIG_SYS_SERIAL0), (void ) (CONFIG_SYS_SERIAL1) }
30		-#define CONFIG_SYS_SERIAL0 0x16000000
31		-#define CONFIG_SYS_SERIAL1 0x17000000
32		-
33		-
34		-/*
35	24	* BOOTP options
36	25	*/
37	26	#define CONFIG_BOOTP_BOOTFILESIZE
...	...	@@ -28,15 +28,6 @@
28	28	#define CONFIG_SMC91111_BASE 0xC8000000
29	29	#undef CONFIG_SMC91111_EXT_PHY
30	30
31		-/* PL011 configuration */
32		-#define CONFIG_PL011_SERIAL
33		-#define CONFIG_PL011_CLOCK 14745600
34		-#define CONFIG_PL01x_PORTS { (void )CONFIG_SYS_SERIAL0, (void )CONFIG_SYS_SERIAL1 }
35		-#define CONFIG_CONS_INDEX 0
36		-#define CONFIG_BAUDRATE 38400
37		-#define CONFIG_SYS_SERIAL0 0x16000000
38		-#define CONFIG_SYS_SERIAL1 0x17000000
39		-
40	31	/*
41	32	* Command line configuration.
42	33	*/