Merge branch 'serial' of git://www.denx.de/git/u-boot-microblaze

Tom Rini
2 parents 33b0f7b5e6 870e0bda43
Showing 2 changed files Side-by-side Diff
drivers/serial/serial.c
drivers/serial/serial_zynq.c
@@ -117,7 +117,7 @@
 serial_initfunc(pxa_serial_initialize);
 serial_initfunc(s3c24xx_serial_initialize);
 serial_initfunc(s5p_serial_initialize);
-serial_initfunc(zynq_serial_initalize);
+serial_initfunc(zynq_serial_initialize);
 serial_initfunc(bfin_serial_initialize);
 serial_initfunc(bfin_jtag_initialize);
 serial_initfunc(mpc512x_serial_initialize);
@@ -214,7 +214,7 @@
 	bfin_serial_initialize();
 	bfin_jtag_initialize();
 	uartlite_serial_initialize();
-	zynq_serial_initalize();
+	zynq_serial_initialize();
 	au1x00_serial_initialize();
 	asc_serial_initialize();
 	jz_serial_initialize();
@@ -153,17 +153,17 @@
  
 /* Multi serial device functions */
 #define DECLARE_PSSERIAL_FUNCTIONS(port) \
-	int uart_zynq##port##_init(void) \
+	static int uart_zynq##port##_init(void) \
 				{ return uart_zynq_serial_init(port); } \
-	void uart_zynq##port##_setbrg(void) \
+	static void uart_zynq##port##_setbrg(void) \
 				{ return uart_zynq_serial_setbrg(port); } \
-	int uart_zynq##port##_getc(void) \
+	static int uart_zynq##port##_getc(void) \
 				{ return uart_zynq_serial_getc(port); } \
-	int uart_zynq##port##_tstc(void) \
+	static int uart_zynq##port##_tstc(void) \
 				{ return uart_zynq_serial_tstc(port); } \
-	void uart_zynq##port##_putc(const char c) \
+	static void uart_zynq##port##_putc(const char c) \
 				{ uart_zynq_serial_putc(c, port); } \
-	void uart_zynq##port##_puts(const char *s) \
+	static void uart_zynq##port##_puts(const char *s) \
 				{ uart_zynq_serial_puts(s, port); }
  
 /* Serial device descriptor */
  
@@ -179,10 +179,10 @@
 }
  
 DECLARE_PSSERIAL_FUNCTIONS(0);
-struct serial_device uart_zynq_serial0_device =
+static struct serial_device uart_zynq_serial0_device =
 	INIT_PSSERIAL_STRUCTURE(0, "ttyPS0");
 DECLARE_PSSERIAL_FUNCTIONS(1);
-struct serial_device uart_zynq_serial1_device =
+static struct serial_device uart_zynq_serial1_device =
 	INIT_PSSERIAL_STRUCTURE(1, "ttyPS1");
  
 #ifdef CONFIG_OF_CONTROL
@@ -223,7 +223,7 @@
 }
 #endif
  
-void zynq_serial_initalize(void)
+void zynq_serial_initialize(void)
 {
 	serial_register(&uart_zynq_serial0_device);
 	serial_register(&uart_zynq_serial1_device);
...	...	@@ -117,7 +117,7 @@
117	117	serial_initfunc(pxa_serial_initialize);
118	118	serial_initfunc(s3c24xx_serial_initialize);
119	119	serial_initfunc(s5p_serial_initialize);
120		-serial_initfunc(zynq_serial_initalize);
	120	+serial_initfunc(zynq_serial_initialize);
121	121	serial_initfunc(bfin_serial_initialize);
122	122	serial_initfunc(bfin_jtag_initialize);
123	123	serial_initfunc(mpc512x_serial_initialize);
...	...	@@ -214,7 +214,7 @@
214	214	bfin_serial_initialize();
215	215	bfin_jtag_initialize();
216	216	uartlite_serial_initialize();
217		- zynq_serial_initalize();
	217	+ zynq_serial_initialize();
218	218	au1x00_serial_initialize();
219	219	asc_serial_initialize();
220	220	jz_serial_initialize();
...	...	@@ -153,17 +153,17 @@
153	153
154	154	/* Multi serial device functions */
155	155	#define DECLARE_PSSERIAL_FUNCTIONS(port) \
156		- int uart_zynq##port##_init(void) \
	156	+ static int uart_zynq##port##_init(void) \
157	157	{ return uart_zynq_serial_init(port); } \
158		- void uart_zynq##port##_setbrg(void) \
	158	+ static void uart_zynq##port##_setbrg(void) \
159	159	{ return uart_zynq_serial_setbrg(port); } \
160		- int uart_zynq##port##_getc(void) \
	160	+ static int uart_zynq##port##_getc(void) \
161	161	{ return uart_zynq_serial_getc(port); } \
162		- int uart_zynq##port##_tstc(void) \
	162	+ static int uart_zynq##port##_tstc(void) \
163	163	{ return uart_zynq_serial_tstc(port); } \
164		- void uart_zynq##port##_putc(const char c) \
	164	+ static void uart_zynq##port##_putc(const char c) \
165	165	{ uart_zynq_serial_putc(c, port); } \
166		- void uart_zynq##port##_puts(const char *s) \
	166	+ static void uart_zynq##port##_puts(const char *s) \
167	167	{ uart_zynq_serial_puts(s, port); }
168	168
169	169	/* Serial device descriptor */
170	170
...	...	@@ -179,10 +179,10 @@
179	179	}
180	180
181	181	DECLARE_PSSERIAL_FUNCTIONS(0);
182		-struct serial_device uart_zynq_serial0_device =
	182	+static struct serial_device uart_zynq_serial0_device =
183	183	INIT_PSSERIAL_STRUCTURE(0, "ttyPS0");
184	184	DECLARE_PSSERIAL_FUNCTIONS(1);
185		-struct serial_device uart_zynq_serial1_device =
	185	+static struct serial_device uart_zynq_serial1_device =
186	186	INIT_PSSERIAL_STRUCTURE(1, "ttyPS1");
187	187
188	188	#ifdef CONFIG_OF_CONTROL
...	...	@@ -223,7 +223,7 @@
223	223	}
224	224	#endif
225	225
226		-void zynq_serial_initalize(void)
	226	+void zynq_serial_initialize(void)
227	227	{
228	228	serial_register(&uart_zynq_serial0_device);
229	229	serial_register(&uart_zynq_serial1_device);