LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial: zynq: Add OF initialization support 

Add console selection from DTB which is enough to have
OF driven solution.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2014-02-24 11:16:33 +01:00 committed by Tom Rini
parent 9e0e37accd
commit c9416b9292
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/serial/serial_zynq.c
View File

@ -6,6 +6,7 @@
*/ */
#include <common.h> #include <common.h>
#include <fdtdec.h>
#include <watchdog.h> #include <watchdog.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/compiler.h> #include <linux/compiler.h>
@ -13,6 +14,8 @@
#include <asm/arch/clk.h> #include <asm/arch/clk.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
DECLARE_GLOBAL_DATA_PTR;
#define ZYNQ_UART_SR_TXFULL 0x00000010 /* TX FIFO full */ #define ZYNQ_UART_SR_TXFULL 0x00000010 /* TX FIFO full */
#define ZYNQ_UART_SR_RXEMPTY 0x00000002 /* RX FIFO empty */ #define ZYNQ_UART_SR_RXEMPTY 0x00000002 /* RX FIFO empty */
@ -182,6 +185,30 @@ DECLARE_PSSERIAL_FUNCTIONS(1);
struct serial_device uart_zynq_serial1_device = struct serial_device uart_zynq_serial1_device =
INIT_PSSERIAL_STRUCTURE(1, "ttyPS1"); INIT_PSSERIAL_STRUCTURE(1, "ttyPS1");
#ifdef CONFIG_OF_CONTROL
__weak struct serial_device *default_serial_console(void)
{
const void *blob = gd->fdt_blob;
int node;
unsigned int base_addr;
node = fdt_path_offset(blob, "serial0");
if (node < 0)
return NULL;
base_addr = fdtdec_get_addr(blob, node, "reg");
if (base_addr == FDT_ADDR_T_NONE)
return NULL;
if (base_addr == ZYNQ_SERIAL_BASEADDR0)
return &uart_zynq_serial0_device;
if (base_addr == ZYNQ_SERIAL_BASEADDR1)
return &uart_zynq_serial1_device;
return NULL;
}
#else
__weak struct serial_device *default_serial_console(void) __weak struct serial_device *default_serial_console(void)
{ {
#if defined(CONFIG_ZYNQ_SERIAL_UART0) #if defined(CONFIG_ZYNQ_SERIAL_UART0)
@ -194,6 +221,7 @@ __weak struct serial_device *default_serial_console(void)
#endif #endif
return NULL; return NULL;
} }
#endif
void zynq_serial_initalize(void) void zynq_serial_initalize(void)
{ {