arm: zynq: serial: Drop non-device-tree serial driver portions
authorSimon Glass <sjg@chromium.org>
Sun, 18 Oct 2015 01:41:26 +0000 (19:41 -0600)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 4 Nov 2015 13:49:53 +0000 (14:49 +0100)
Since we use device tree in SPL also, we can drop this code.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/serial/serial_zynq.c

index 3b12c015387633999eeccfb7dbc53eaffe2dc5d2..926ba51dbb4790271e21cb7f382a451bc7bae6ad 100644 (file)
@@ -195,7 +195,6 @@ DECLARE_PSSERIAL_FUNCTIONS(1);
 static struct serial_device uart_zynq_serial1_device =
        INIT_PSSERIAL_STRUCTURE(1, "ttyPS1");
 
-#if CONFIG_IS_ENABLED(OF_CONTROL)
 __weak struct serial_device *default_serial_console(void)
 {
        const void *blob = gd->fdt_blob;
@@ -218,20 +217,6 @@ __weak struct serial_device *default_serial_console(void)
 
        return NULL;
 }
-#else
-__weak struct serial_device *default_serial_console(void)
-{
-#if defined(CONFIG_ZYNQ_SERIAL_UART0)
-       if (uart_zynq_ports[0])
-               return &uart_zynq_serial0_device;
-#endif
-#if defined(CONFIG_ZYNQ_SERIAL_UART1)
-       if (uart_zynq_ports[1])
-               return &uart_zynq_serial1_device;
-#endif
-       return NULL;
-}
-#endif
 
 void zynq_serial_initialize(void)
 {