Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f8d1086851409ee16344932ef367b8a05c365b09

Authored by Marek Vasut
1 parent 0b2d3f209a
Exists in master and in 49 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

ARM: serial: Remove the IXP UART driver 

This driver is no longer used, remove it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Michael Schwingen <michael@schwingen.org>
Cc: Tom Rini <trini@ti.com>

Showing 4 changed files with 0 additions and 137 deletions Side-by-side Diff

doc/driver-model/UDM-serial.txt
Diff comments   View file @ f8d1086
... ... @@ -101,10 +101,6 @@
101 101 No support for CONFIG_SERIAL_MULTI. Simple conversion possible. This driver
102 102 might be removed in favor of serial_mxc.c .
103 103  
104   - serial_ixp.c
105   - ------------
106   - No support for CONFIG_SERIAL_MULTI. Simple conversion possible.
107   -
108 104 serial_ks8695.c
109 105 ---------------
110 106 No support for CONFIG_SERIAL_MULTI. Simple conversion possible.
drivers/serial/Makefile
Diff comments   View file @ f8d1086
... ... @@ -18,7 +18,6 @@
18 18 obj-$(CONFIG_S5P) += serial_s5p.o
19 19 obj-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o
20 20 obj-$(CONFIG_IMX_SERIAL) += serial_imx.o
21   -obj-$(CONFIG_IXP_SERIAL) += serial_ixp.o
22 21 obj-$(CONFIG_KS8695_SERIAL) += serial_ks8695.o
23 22 obj-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
24 23 obj-$(CONFIG_MXC_UART) += serial_mxc.o
drivers/serial/serial.c
Diff comments   View file @ f8d1086
... ... @@ -150,7 +150,6 @@
150 150 serial_initfunc(sandbox_serial_initialize);
151 151 serial_initfunc(clps7111_serial_initialize);
152 152 serial_initfunc(imx_serial_initialize);
153   -serial_initfunc(ixp_serial_initialize);
154 153 serial_initfunc(ks8695_serial_initialize);
155 154 serial_initfunc(lh7a40x_serial_initialize);
156 155 serial_initfunc(max3100_serial_initialize);
... ... @@ -243,7 +242,6 @@
243 242 sandbox_serial_initialize();
244 243 clps7111_serial_initialize();
245 244 imx_serial_initialize();
246   - ixp_serial_initialize();
247 245 ks8695_serial_initialize();
248 246 lh7a40x_serial_initialize();
249 247 max3100_serial_initialize();
drivers/serial/serial_ixp.c
View file @ f8d1086
1   -/*
2   - * (C) Copyright 2002
3   - * Wolfgang Denk, DENX Software Engineering, <wd@denx.de>
4   - *
5   - * (C) Copyright 2002
6   - * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
7   - * Marius Groeger <mgroeger@sysgo.de>
8   - *
9   - * (C) Copyright 2002
10   - * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
11   - * Alex Zuepke <azu@sysgo.de>
12   - *
13   - * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl)
14   - *
15   - * SPDX-License-Identifier: GPL-2.0+
16   - */
17   -
18   -#include <common.h>
19   -#include <asm/arch/ixp425.h>
20   -#include <watchdog.h>
21   -#include <serial.h>
22   -#include <linux/compiler.h>
23   -
24   -/*
25   - * 14.7456 MHz
26   - * Baud Rate = --------------
27   - * 16 x Divisor
28   - */
29   -#define SERIAL_CLOCK 921600
30   -
31   -DECLARE_GLOBAL_DATA_PTR;
32   -
33   -static void ixp_serial_setbrg(void)
34   -{
35   - unsigned int quot = 0;
36   - int uart = CONFIG_SYS_IXP425_CONSOLE;
37   -
38   - if ((gd->baudrate <= SERIAL_CLOCK) && (SERIAL_CLOCK % gd->baudrate == 0))
39   - quot = SERIAL_CLOCK / gd->baudrate;
40   - else
41   - hang ();
42   -
43   - IER(uart) = 0; /* Disable for now */
44   - FCR(uart) = 0; /* No fifos enabled */
45   -
46   - /* set baud rate */
47   - LCR(uart) = LCR_WLS0 | LCR_WLS1 | LCR_DLAB;
48   - DLL(uart) = quot & 0xff;
49   - DLH(uart) = quot >> 8;
50   - LCR(uart) = LCR_WLS0 | LCR_WLS1;
51   -#ifdef CONFIG_SERIAL_RTS_ACTIVE
52   - MCR(uart) = MCR_RTS; /* set RTS active */
53   -#else
54   - MCR(uart) = 0; /* set RTS inactive */
55   -#endif
56   - IER(uart) = IER_UUE;
57   -}
58   -
59   -/*
60   - * Initialise the serial port with the given baudrate. The settings
61   - * are always 8 data bits, no parity, 1 stop bit, no start bits.
62   - *
63   - */
64   -static int ixp_serial_init(void)
65   -{
66   - serial_setbrg ();
67   -
68   - return (0);
69   -}
70   -
71   -
72   -/*
73   - * Output a single byte to the serial port.
74   - */
75   -static void ixp_serial_putc(const char c)
76   -{
77   - /* wait for room in the tx FIFO on UART */
78   - while ((LSR(CONFIG_SYS_IXP425_CONSOLE) & LSR_TEMT) == 0)
79   - WATCHDOG_RESET(); /* Reset HW Watchdog, if needed */
80   -
81   - THR(CONFIG_SYS_IXP425_CONSOLE) = c;
82   -
83   - /* If \n, also do \r */
84   - if (c == '\n')
85   - serial_putc ('\r');
86   -}
87   -
88   -/*
89   - * Read a single byte from the serial port. Returns 1 on success, 0
90   - * otherwise. When the function is succesfull, the character read is
91   - * written into its argument c.
92   - */
93   -static int ixp_serial_tstc(void)
94   -{
95   - return LSR(CONFIG_SYS_IXP425_CONSOLE) & LSR_DR;
96   -}
97   -
98   -/*
99   - * Read a single byte from the serial port. Returns 1 on success, 0
100   - * otherwise. When the function is succesfull, the character read is
101   - * written into its argument c.
102   - */
103   -static int ixp_serial_getc(void)
104   -{
105   - while (!(LSR(CONFIG_SYS_IXP425_CONSOLE) & LSR_DR))
106   - WATCHDOG_RESET(); /* Reset HW Watchdog, if needed */
107   -
108   - return (char) RBR(CONFIG_SYS_IXP425_CONSOLE) & 0xff;
109   -}
110   -
111   -static struct serial_device ixp_serial_drv = {
112   - .name = "ixp_serial",
113   - .start = ixp_serial_init,
114   - .stop = NULL,
115   - .setbrg = ixp_serial_setbrg,
116   - .putc = ixp_serial_putc,
117   - .puts = default_serial_puts,
118   - .getc = ixp_serial_getc,
119   - .tstc = ixp_serial_tstc,
120   -};
121   -
122   -void ixp_serial_initialize(void)
123   -{
124   - serial_register(&ixp_serial_drv);
125   -}
126   -
127   -__weak struct serial_device *default_serial_console(void)
128   -{
129   - return &ixp_serial_drv;
130   -}