Introduce driver model serial uclass
Subsystems (6)
v5 cover Introduce driver model serial uclass
This series adds support for a serial uclass, enabling serial drivers to be converted to use driver model.
With v4, exynos boards all build and a second attempt has been made to add Tegra support via the ns16550 driver, tested on beaver, Jetson-TK1 and seaboard (i.e. 3 of the 4 SoCs in mainline).
To see the current state of driver model, look at u-boot-dm.git branch 'working'. This branch is at 'serial-working'.
Changes in v5:
- Add new patch to add a function to look up a chosen node
- Add struct udevice declaration
- Use /chosen/stdout-path instead of /aliases/console to specify the console
Changes in v4:
- Add a binding for sandbox serial
- Add a separate Tegra serial driver to deal with the clock issue
- Add new CONFIG_TEGRA_SERIAL option to enable dm driver
- Remove 'clock-frequency' property from serial nodes
- Remove clock frequency setup for ns16550 driver
- Remove pre-reloc fdt property
- Use hard-coded UART clock from Tegra configuration
Changes in v3:
- Add new change to enhance lists_bind_fdt()
- Add new patch for tegra serial port details
- Add new patch to collect common baud rate code in ns16550
- Add new patch to enable driver model for serial on tegra
- Add new patch to move baud rate calculation to ns16550.c
- Add new patch to support driver model in ns16550
- Add new patch to use V_NS16550_CLK only in SPL builds
- Automatically bind the console even if not marked for pre-relocation
- Avoid reordering functions
- Change pre-reloc fdt property to 'u-boot,dm-pre-reloc'
- Fix typo in commit message
Changes in v2:
- Rename struct device to struct udevice
Simon Glass (14):
serial: Set up the 'priv' pointer when creating a serial device
dm: fdt: Add a function to look up a chosen node
dm: Adjust lists_bind_fdt() to return the bound device
dm: Add a uclass for serial devices
sandbox: Convert serial driver to use driver model
sandbox: serial: Support a coloured console
sandbox: dts: Add a serial console node
dm: exynos: Mark exynos5 console as pre-reloc
dm: exynos: Move serial to driver model
dm: serial: Move baud rate calculation to ns16550.c
dm: serial: Collect common baud rate code in ns16550
dm: serial: Add driver model support for ns16550
tegra: dts: Add serial port details
dm: tegra: Enable driver model for serial
arch/arm/dts/exynos5.dtsi | 1 + arch/arm/dts/tegra114-dalmore.dts | 4 + arch/arm/dts/tegra114.dtsi | 53 ++++ arch/arm/dts/tegra124-jetson-tk1.dts | 4 + arch/arm/dts/tegra124-venice2.dts | 4 + arch/arm/dts/tegra124.dtsi | 66 ++++ arch/arm/dts/tegra20-colibri_t20_iris.dts | 4 + arch/arm/dts/tegra20-harmony.dts | 4 + arch/arm/dts/tegra20-medcom-wide.dts | 4 + arch/arm/dts/tegra20-paz00.dts | 4 + arch/arm/dts/tegra20-plutux.dts | 4 + arch/arm/dts/tegra20-seaboard.dts | 4 + arch/arm/dts/tegra20-tec.dts | 4 + arch/arm/dts/tegra20-trimslice.dts | 4 + arch/arm/dts/tegra20-ventana.dts | 4 + arch/arm/dts/tegra20-whistler.dts | 4 + arch/arm/dts/tegra20.dtsi | 51 ++- arch/arm/dts/tegra30-beaver.dts | 4 + arch/arm/dts/tegra30-cardhu.dts | 4 + arch/arm/dts/tegra30-tamonten.dtsi | 4 + arch/arm/dts/tegra30.dtsi | 66 ++++ arch/sandbox/dts/sandbox.dts | 10 + doc/device-tree-bindings/serial/ns16550.txt | 10 + doc/device-tree-bindings/serial/sandbox-serial.txt | 13 + drivers/core/lists.c | 10 +- drivers/core/root.c | 2 +- drivers/serial/Makefile | 7 +- drivers/serial/ns16550.c | 203 ++++++++++-- drivers/serial/sandbox.c | 140 +++++++-- drivers/serial/serial-uclass.c | 214 +++++++++++++ drivers/serial/serial.c | 1 + drivers/serial/serial_ns16550.c | 14 +- drivers/serial/serial_s5p.c | 255 +++++---------- drivers/serial/serial_tegra.c | 38 +++ include/configs/exynos-common.h | 1 + include/configs/sandbox.h | 3 + include/configs/tegra-common.h | 9 +- include/dm/lists.h | 6 +- include/dm/uclass-id.h | 1 + include/dt-bindings/clock/tegra114-car.h | 342 +++++++++++++++++++++ include/dt-bindings/clock/tegra124-car.h | 342 +++++++++++++++++++++ include/dt-bindings/clock/tegra20-car.h | 158 ++++++++++ include/dt-bindings/clock/tegra30-car.h | 273 ++++++++++++++++ include/fdtdec.h | 12 + include/ns16550.h | 66 ++++ include/serial.h | 92 ++++++ lib/fdtdec.c | 15 + 47 files changed, 2281 insertions(+), 257 deletions(-) create mode 100644 doc/device-tree-bindings/serial/ns16550.txt create mode 100644 doc/device-tree-bindings/serial/sandbox-serial.txt create mode 100644 drivers/serial/serial-uclass.c create mode 100644 drivers/serial/serial_tegra.c create mode 100644 include/dt-bindings/clock/tegra114-car.h create mode 100644 include/dt-bindings/clock/tegra124-car.h create mode 100644 include/dt-bindings/clock/tegra20-car.h create mode 100644 include/dt-bindings/clock/tegra30-car.h
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 1/14 serial: Set up the 'priv' pointer when creating a serial device
The stdio_dev structure has a private pointer for its creator, but it is not set up by the serial system. Set it to point to the serial device so that it can be found by code called by stdio.
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Fix typo in commit message
Changes in v2: None
drivers/serial/serial.c | 1 + 1 file changed, 1 insertion(+)
drivers/serial/serial.c +1 -0
@@ -320,6 +320,7 @@ void serial_stdio_init(void) dev.puts = serial_stub_puts; dev.getc = serial_stub_getc; dev.tstc = serial_stub_tstc; + dev.priv = s;stdio_register (&dev);
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 1/14 serial: Set up the 'priv' pointer when creating a serial device
Quoted 5 lines · Simon Glass
The
stdio_devstructure has a private pointer for its creator, but it is not set up by the serial system. Set it to point to the serial device so that it can be found by code called by stdio.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 2/14 dm: fdt: Add a function to look up a chosen node
In reply to Simon GlassWithin /chosen we may have a node which points to another node, similar to how /aliases works. Add a helper function to do this lookup.
---
Changes in v5:
- Add new patch to add a function to look up a chosen node
Changes in v4: None
Changes in v3: None
Changes in v2: None
include/fdtdec.h | 12 ++++++++++++ lib/fdtdec.c | 15 +++++++++++++++ 2 files changed, 27 insertions(+)
include/fdtdec.h +12 -0
@@ -376,6 +376,18 @@ int fdtdec_get_alias_seq(const void *blob, const char *base, int node,*/ int fdtdec_get_alias_node (const void *blob,const char *name); +/** +* Get the offset of the given chosen node +* +* This looks up a property in /chosen containing the path to another node, +* then finds the offset of that node. +* +* @param blob Device tree blob (if NULL, then error is returned) +* @param name Property name, e.g. "stdout-path" +* @return Node offset referred to by that chosen node, or -ve FDT_ERR_... +*/ +int fdtdec_get_chosen_node (const void *blob,const char *name); +/* * Get the name for a compatible ID *
lib/fdtdec.c +15 -0
@@ -382,6 +382,21 @@ int fdtdec_get_alias_node(const void *blob, const char *name)return fdt_path_offset (blob, prop); } +int fdtdec_get_chosen_node (const void *blob,const char *name) +{ +const char *prop; +int chosen_node; +int len; + +if (!blob) +return -FDT_ERR_NOTFOUND ; + chosen_node =fdt_path_offset (blob,"/chosen" ); + prop =fdt_getprop (blob, chosen_node, name, &len); +if (!prop) +return -FDT_ERR_NOTFOUND ; +return fdt_path_offset (blob, prop); +} +int fdtdec_check_fdt (void ) {/*
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 2/14 dm: fdt: Add a function to look up a chosen node
Quoted 4 lines · Simon Glass
Within /chosen we may have a node which points to another node, similar to how /aliases works. Add a helper function to do this lookup.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 3/14 dm: Adjust lists_bind_fdt() to return the bound device
In reply to Simon GlassAllow the caller to find out the device that was bound in response to this call.
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Add new change to enhance lists_bind_fdt()
Changes in v2: None
drivers/core/lists.c | 10 +++++++--- drivers/core/root.c | 2 +- include/dm/lists.h | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-)
drivers/core/lists.c +7 -3
@@ -118,7 +118,8 @@ static int driver_check_compatible(const void *blob, int offset,return -ENOENT ; } -int lists_bind_fdt (struct udevice *parent,const void *blob,int offset) +int lists_bind_fdt (struct udevice *parent,const void *blob,int offset, +struct udevice **devp) { struct driver *driver = ll_entry_start(struct driver, driver); const int n_ents = ll_entry_count(struct driver, driver);
@@ -130,6 +131,8 @@ int lists_bind_fdt(struct udevice *parent, const void *blob, int offset)int ret =0 ;dm_dbg ("bind node %s\n" ,fdt_get_name (blob, offset,NULL )); +if (devp) + *devp =NULL ;for (entry = driver; entry != driver + n_ents; entry++) { ret =driver_check_compatible (blob, offset, entry->of_match); name =fdt_get_name (blob, offset,NULL );
@@ -149,10 +152,11 @@ int lists_bind_fdt(struct udevice *parent, const void *blob, int offset) ret =device_bind (parent, entry, name,NULL , offset, &dev);if (ret) {dm_warn ("Error binding driver '%s'\n" , entry->name); -if (!result || ret != -ENOENT ) - result = ret; +return ret; }else { found = true; +if (devp) + *devp = dev; }break ; }
drivers/core/root.c +1 -1
@@ -91,7 +91,7 @@ int dm_scan_fdt_node(struct udevice *parent, const void *blob, int offset,if (pre_reloc_only && !fdt_getprop (blob, offset,"u-boot,dm-pre-reloc" ,NULL ))continue ; - err =lists_bind_fdt (parent, blob, offset); + err =lists_bind_fdt (parent, blob, offset,NULL );if (err && !ret) ret = err; }
include/dm/lists.h +5 -1
@@ -53,7 +53,11 @@ int lists_bind_drivers(struct udevice *parent, bool pre_reloc_only);* @parent: parent driver (root) * @blob: device tree blob * @offset: offset of this device tree node +* @devp: if non-NULL, returns a pointer to the bound device +* @return 0 if device was bound, -EINVAL if the device tree is invalid, +* other -ve value on error */ -int lists_bind_fdt (struct udevice *parent,const void *blob,int offset); +int lists_bind_fdt (struct udevice *parent,const void *blob,int offset, +struct udevice **devp);#endif
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 3/14 dm: Adjust lists_bind_fdt() to return the bound device
Quoted 4 lines · Simon Glass
Allow the caller to find out the device that was bound in response to this call.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 4/14 dm: Add a uclass for serial devices
In reply to Simon GlassSerial devices support simple byte input/output and a few operations to find out whether data is available. Add a basic uclass for serial devices to be used by drivers that are converted to driver model.
---
Changes in v5:
- Use /chosen/stdout-path instead of /aliases/console to specify the console
Changes in v4: None
Changes in v3:
- Automatically bind the console even if not marked for pre-relocation
Changes in v2:
- Rename struct device to struct udevice
drivers/serial/Makefile | 4 + drivers/serial/serial-uclass.c | 214 +++++++++++++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/serial.h | 92 ++++++++++++++++++ 4 files changed, 311 insertions(+) create mode 100644 drivers/serial/serial-uclass.c
drivers/serial/Makefile +4 -0
@@ -5,7 +5,11 @@ # SPDX-License-Identifier: GPL-2.0+ # +ifdef CONFIG_DM_SERIAL +obj-y += serial-uclass.o +else obj-y += serial.o +endif obj-$(CONFIG_ALTERA_UART) += altera_uart.o obj-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o
drivers/serial/serial-uclass.c new file +214 -0
214 lines not on this page · raw message
include/dm/uclass-id.h +1 -0
@@ -21,6 +21,7 @@ enum uclass_id {/* U-Boot uclasses start here */ UCLASS_GPIO ,/* Bank of general-purpose I/O pins */ +UCLASS_SERIAL ,/* Serial UART */ UCLASS_COUNT , UCLASS_INVALID = -1,
include/serial.h +92 -0
96 lines not on this page · raw message
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 4/14 dm: Add a uclass for serial devices
Quoted 5 lines · Simon Glass
Serial devices support simple byte input/output and a few operations to find out whether data is available. Add a basic uclass for serial devices to be used by drivers that are converted to driver model.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 5/14 sandbox: Convert serial driver to use driver model
In reply to Simon GlassAdjust the sandbox serial driver to use the new driver model uclass. The driver works much as before, but within the new framework.
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- Rename struct device to struct udevice
drivers/serial/sandbox.c | 67 +++++++++++++++++++++++++---------------------- include/configs/sandbox.h | 3 +++ 2 files changed, 39 insertions(+), 31 deletions(-)
drivers/serial/sandbox.c +36 -31
@@ -11,12 +11,16 @@*/ #include <common.h> +#include <dm.h> +#include <fdtdec.h> #include <lcd.h> #include <os.h> #include <serial.h> #include <linux/compiler.h> #include <asm/state.h> +DECLARE_GLOBAL_DATA_PTR ; +/* * * serial_buf: A buffer that holds keyboard characters for the
@@ -30,27 +34,21 @@ static char serial_buf[16];static unsigned int serial_buf_write;static unsigned int serial_buf_read; -static int sandbox_serial_init (void ) +static int sandbox_serial_probe (struct udevice *dev) {struct sandbox_state *state =state_get_current ();if (state->term_raw !=STATE_TERM_COOKED )os_tty_raw (0 , state->term_raw ==STATE_TERM_RAW_WITH_SIGS ); -return 0 ; -} -static void sandbox_serial_setbrg (void ) -{ +return 0 ; } -static void sandbox_serial_putc (const char ch) +static int sandbox_serial_putc (struct udevice *dev,const char ch) {os_write (1 , &ch,1 ); -} -static void sandbox_serial_puts (const char *str) -{ -os_write (1 , str,strlen (str)); +return 0 ; }static unsigned int increment_buffer_index (unsigned int index)
@@ -58,12 +56,15 @@ static unsigned int increment_buffer_index(unsigned int index)return (index +1 ) %ARRAY_SIZE (serial_buf); } -static int sandbox_serial_tstc (void ) +static int sandbox_serial_pending (struct udevice *dev,bool input) {const unsigned int next_index =increment_buffer_index (serial_buf_write);ssize_t count; +if (!input) +return 0 ; +os_usleep (100 );#ifdef CONFIG_LCD lcd_sync ();
@@ -74,38 +75,42 @@ static int sandbox_serial_tstc(void) count =os_read_no_block (0 , &serial_buf[serial_buf_write],1 );if (count ==1 ) serial_buf_write = next_index; +return serial_buf_write != serial_buf_read; } -static int sandbox_serial_getc (void ) +static int sandbox_serial_getc (struct udevice *dev) {int result; -while (!sandbox_serial_tstc ()) - ;/* buffer empty */ +if (!sandbox_serial_pending (dev, true)) +return -EAGAIN ;/* buffer empty */ result = serial_buf[serial_buf_read]; serial_buf_read =increment_buffer_index (serial_buf_read);return result; } -static struct serial_device sandbox_serial_drv = { - .name ="sandbox_serial" , - .start = sandbox_serial_init, - .stop =NULL , - .setbrg = sandbox_serial_setbrg, - .putc = sandbox_serial_putc, - .puts = sandbox_serial_puts, - .getc = sandbox_serial_getc, - .tstc = sandbox_serial_tstc, +static const struct dm_serial_ops sandbox_serial_ops = { + .putc = sandbox_serial_putc, + .pending = sandbox_serial_pending, + .getc = sandbox_serial_getc, }; -void sandbox_serial_initialize (void ) -{ -serial_register (&sandbox_serial_drv); -} +static const struct udevice_id sandbox_serial_ids[] = { + { .compatible ="sandbox,serial" }, + { } +}; -__weak struct serial_device *default_serial_console (void ) -{ -return &sandbox_serial_drv; -} +U_BOOT_DRIVER (serial_sandbox) = { + .name ="serial_sandbox" , + .id =UCLASS_SERIAL , + .of_match = sandbox_serial_ids, + .probe = sandbox_serial_probe, + .ops = &sandbox_serial_ops, + .flags =DM_FLAG_PRE_RELOC , +}; + +U_BOOT_DEVICE (serial_sandbox_non_fdt) = { + .name ="serial_sandbox" , +};
include/configs/sandbox.h +3 -0
@@ -31,6 +31,9 @@#define CONFIG_DM_DEMO_SHAPE #define CONFIG_DM_GPIO #define CONFIG_DM_TEST +#define CONFIG_DM_SERIAL + +#define CONFIG_SYS_STDIO_DEREGISTER /* Number of bits in a C 'long' on this architecture */ #define CONFIG_SANDBOX_BITS_PER_LONG 64
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 5/14 sandbox: Convert serial driver to use driver model
Quoted 4 lines · Simon Glass
Adjust the sandbox serial driver to use the new driver model uclass. The driver works much as before, but within the new framework.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 6/14 sandbox: serial: Support a coloured console
In reply to Simon GlassThe current sandbox serial driver is a pretty trivial example and does not have the featues that might be needed for other board serial drivers. To help provide a better example, add a text colour property to the device tree for sandbox. This uses platform data, a device tree node, driver private data and a remove() method.
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- Rename struct device to struct udevice
drivers/serial/sandbox.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)
drivers/serial/sandbox.c +83 -0
@@ -34,19 +34,67 @@ static char serial_buf[16];static unsigned int serial_buf_write;static unsigned int serial_buf_read; +struct sandbox_serial_platdata { +int colour;/* Text colour to use for output, -1 for none */ +}; + +struct sandbox_serial_priv { +bool start_of_line; +}; + +/** +* output_ansi_colour() - Output an ANSI colour code +* +* @colour: Colour to output (0-7) +*/ +static void output_ansi_colour (int colour) +{ +char ansi_code[] ="\x1b[1;3Xm" ; + + ansi_code[5 ] ='0' + colour; +os_write (1 , ansi_code,sizeof (ansi_code) -1 ); +} + +static void output_ansi_reset (void ) +{ +os_write (1 ,"\x1b[0m" ,4 ); +} +static int sandbox_serial_probe (struct udevice *dev) {struct sandbox_state *state =state_get_current (); +struct sandbox_serial_priv *priv =dev_get_priv (dev);if (state->term_raw !=STATE_TERM_COOKED )os_tty_raw (0 , state->term_raw ==STATE_TERM_RAW_WITH_SIGS ); + priv->start_of_line =0 ; + +return 0 ; +} + +static int sandbox_serial_remove (struct udevice *dev) +{ +struct sandbox_serial_platdata *plat = dev->platdata; + +if (plat->colour !=-1 ) +output_ansi_reset ();return 0 ; }static int sandbox_serial_putc (struct udevice *dev,const char ch) { +struct sandbox_serial_priv *priv =dev_get_priv (dev); +struct sandbox_serial_platdata *plat = dev->platdata; + +if (priv->start_of_line && plat->colour !=-1 ) { + priv->start_of_line = false; +output_ansi_colour (plat->colour); + } +os_write (1 , &ch,1 ); +if (ch =='\n' ) + priv->start_of_line = true;return 0 ; }
@@ -91,6 +139,32 @@ static int sandbox_serial_getc(struct udevice *dev)return result; } +static const char *const ansi_colour[] = { +"black" ,"red" ,"green" ,"yellow" ,"blue" ,"megenta" ,"cyan" , +"white" , +}; + +static int sandbox_serial_ofdata_to_platdata (struct udevice *dev) +{ +struct sandbox_serial_platdata *plat = dev->platdata; +const char *colour; +int i; + + plat->colour =-1 ; + colour =fdt_getprop (gd->fdt_blob, dev->of_offset, +"sandbox,text-colour" ,NULL ); +if (colour) { +for (i =0 ; i <ARRAY_SIZE (ansi_colour); i++) { +if (!strcmp (colour, ansi_colour[i])) { + plat->colour = i; +break ; + } + } + } + +return 0 ; +} +static const struct dm_serial_ops sandbox_serial_ops = { .putc = sandbox_serial_putc, .pending = sandbox_serial_pending,
@@ -106,11 +180,20 @@ U_BOOT_DRIVER(serial_sandbox) = { .name = "serial_sandbox", .id = UCLASS_SERIAL, .of_match = sandbox_serial_ids, + .ofdata_to_platdata = sandbox_serial_ofdata_to_platdata, + .platdata_auto_alloc_size = sizeof(struct sandbox_serial_platdata), + .priv_auto_alloc_size = sizeof(struct sandbox_serial_priv), .probe = sandbox_serial_probe, + .remove = sandbox_serial_remove, .ops = &sandbox_serial_ops, .flags = DM_FLAG_PRE_RELOC, }; +static const struct sandbox_serial_platdata platdata_non_fdt = { + .colour =-1 , +}; +U_BOOT_DEVICE (serial_sandbox_non_fdt) = { .name ="serial_sandbox" , + .platdata = &platdata_non_fdt, };
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 6/14 sandbox: serial: Support a coloured console
Quoted 7 lines · Simon Glass
The current sandbox serial driver is a pretty trivial example and does not have the featues that might be needed for other board serial drivers. To help provide a better example, add a text colour property to the device tree for sandbox. This uses platform data, a device tree node, driver private data and a
remove()method.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 7/14 sandbox: dts: Add a serial console node
In reply to Simon GlassIf the sandbox device tree is provided to U-Boot (with the -d flag) then it will use the device tree version in preference to the built-in device. The only difference is the colour.
---
Changes in v5:
- Use /chosen/stdout-path instead of /aliases/console to specify the console
Changes in v4:
- Add a binding for sandbox serial
- Remove pre-reloc fdt property
Changes in v3:
- Change pre-reloc fdt property to 'u-boot,dm-pre-reloc'
Changes in v2: None
arch/sandbox/dts/sandbox.dts | 10 ++++++++++ doc/device-tree-bindings/serial/sandbox-serial.txt | 13 +++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 doc/device-tree-bindings/serial/sandbox-serial.txt
arch/sandbox/dts/sandbox.dts +10 -0
@@ -1,6 +1,16 @@ /dts-v1/; / { + chosen { + stdout-path = "/serial"; + }; + + /* Needs to be available prior to relocation */ + uart0: serial { + compatible = "sandbox,serial"; + sandbox,text-colour = "cyan"; + }; + triangle { compatible = "demo-shape"; colour = "cyan";
doc/device-tree-bindings/serial/sandbox-serial.txt new file +13 -0
@@ -0,0 +1,13 @@ +Sandbox serial + +The sandbox serial device is an emulated device which displays its output +on the host machine's console, and accepts input from its keyboard. + +Required properties: + compatible: "sandbox,serial" + +Optional properties: + sandbox,text-colour: If present, this is the colour of the console text. + Supported values are: + "black", "red", "green", "yellow", "blue", "megenta", "cyan", + "white"
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 7/14 sandbox: dts: Add a serial console node
Quoted 5 lines · Simon Glass
If the sandbox device tree is provided to U-Boot (with the -d flag) then it will use the device tree version in preference to the built-in device. The only difference is the colour.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 8/14 dm: exynos: Mark exynos5 console as pre-reloc
In reply to Simon GlassWe will need the console before relocation, so mark it that way.
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Change pre-reloc fdt property to 'u-boot,dm-pre-reloc'
Changes in v2: None
arch/arm/dts/exynos5.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/dts/exynos5.dtsi +1 -0
@@ -244,6 +244,7 @@ compatible = "samsung,exynos4210-uart"; reg = <0x12C30000 0x100>; interrupts = <0 54 0>; + u-boot,dm-pre-reloc; id = <3>; };
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 9/14 dm: exynos: Move serial to driver model
In reply to Simon GlassChange the Exynos serial driver to work with driver model and switch over all Exynos5 boards to use it.
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Avoid reordering functions
Changes in v2: None
drivers/serial/serial_s5p.c | 255 ++++++++++++---------------------------- include/configs/exynos-common.h | 1 + 2 files changed, 73 insertions(+), 183 deletions(-)
drivers/serial/serial_s5p.c +72 -183
@@ -9,6 +9,8 @@*/ #include <common.h> +#include <dm.h> +#include <errno.h> #include <fdtdec.h> #include <linux/compiler.h> #include <asm/io.h>
@@ -18,26 +20,18 @@DECLARE_GLOBAL_DATA_PTR ; -#define RX_FIFO_COUNT_MASK 0xff -#define RX_FIFO_FULL_MASK (1 << 8) -#define TX_FIFO_FULL_MASK (1 << 24) +#define RX_FIFO_COUNT_SHIFT 0 +#define RX_FIFO_COUNT_MASK (0xff << RX_FIFO_COUNT_SHIFT) +#define RX_FIFO_FULL (1 << 8) +#define TX_FIFO_COUNT_SHIFT 16 +#define TX_FIFO_COUNT_MASK (0xff << TX_FIFO_COUNT_SHIFT) +#define TX_FIFO_FULL (1 << 24)/* Information about a serial port */ -struct fdt_serial { -u32 base_addr;/* address of registers in physical memory */ +struct s5p_serial_platdata { +struct s5p_uart *reg;/* address of registers in physical memory */ u8 port_id;/* uart port number */ -u8 enabled;/* 1 if enabled, 0 if disabled */ -} config __attribute__ ((section(".data"))); - -static inline struct s5p_uart *s5p_get_base_uart (int dev_index) -{ -#ifdef CONFIG_OF_CONTROL -return (struct s5p_uart *)(config.base_addr); -#else -u32 offset = dev_index *sizeof (struct s5p_uart ); -return (struct s5p_uart *)(samsung_get_base_uart () + offset); -#endif -} +};/* * The coefficient, used to calculate the baudrate on S5P UARTs is
@@ -65,23 +59,13 @@ static const int udivslot[] = { 0xffdf, }; -static void serial_setbrg_dev (const int dev_index) +int s5p_serial_setbrg (struct udevice *dev,int baudrate) { -struct s5p_uart *const uart =s5p_get_base_uart (dev_index); -u32 uclk =get_uart_clk (dev_index); -u32 baudrate = gd->baudrate; +struct s5p_serial_platdata *plat = dev->platdata; +struct s5p_uart *const uart = plat->reg; +u32 uclk =get_uart_clk (plat->port_id);u32 val; -#if defined(CONFIG_SILENT_CONSOLE ) && \ - defined(CONFIG_OF_CONTROL ) && \ - !defined(CONFIG_SPL_BUILD ) -if (fdtdec_get_config_int (gd->fdt_blob,"silent_console" ,0 )) - gd->flags |=GD_FLG_SILENT ; -#endif - -if (!config.enabled) -return ; - val = uclk / baudrate;writel (val /16 -1 , &uart->ubrdiv);
@@ -90,15 +74,14 @@ static void serial_setbrg_dev(const int dev_index)writew (udivslot[val %16 ], &uart->rest.slot); else writeb(val % 16, &uart->rest.value); + +return 0 ; } -/* -* Initialise the serial port with the given baudrate. The settings -* are always 8 data bits, no parity, 1 stop bit, no start bits. -*/ -static int serial_init_dev (const int dev_index) +static int s5p_serial_probe (struct udevice *dev) { -struct s5p_uart *const uart =s5p_get_base_uart (dev_index); +struct s5p_serial_platdata *plat = dev->platdata; +struct s5p_uart *const uart = plat->reg;/* enable FIFOs, auto clear Rx FIFO */ writel (0x3 , &uart->ufcon);
@@ -108,14 +91,11 @@ static int serial_init_dev(const int dev_index)/* No interrupts, no DMA, pure polling */ writel (0x245 , &uart->ucon); -serial_setbrg_dev (dev_index); -return 0 ; } -static int serial_err_check (const int dev_index,int op) +static int serial_err_check (const struct s5p_uart *const uart,int op) { -struct s5p_uart *const uart =s5p_get_base_uart (dev_index);unsigned int mask;/*
@@ -133,169 +113,78 @@ static int serial_err_check(const int dev_index, int op)return readl (&uart->uerstat) & mask; } -/* -* Read a single byte from the serial port. Returns 1 on success, 0 -* otherwise. When the function is succesfull, the character read is -* written into its argument c. -*/ -static int serial_getc_dev (const int dev_index) +static int s5p_serial_getc (struct udevice *dev) { -struct s5p_uart *const uart =s5p_get_base_uart (dev_index); - -if (!config.enabled) -return 0 ; +struct s5p_serial_platdata *plat = dev->platdata; +struct s5p_uart *const uart = plat->reg; -/* wait for character to arrive */ -while (!(readl (&uart->ufstat) & (RX_FIFO_COUNT_MASK | -RX_FIFO_FULL_MASK ))) { -if (serial_err_check (dev_index,0 )) -return 0 ; - } +if (!(readl (&uart->ufstat) &RX_FIFO_COUNT_MASK )) +return -EAGAIN ; +serial_err_check (uart,0 );return (int )(readb (&uart->urxh) &0xff ); } -/* -* Output a single byte to the serial port. -*/ -static void serial_putc_dev (const char c,const int dev_index) +static int s5p_serial_putc (struct udevice *dev,const char ch) { -struct s5p_uart *const uart =s5p_get_base_uart (dev_index); - -if (!config.enabled) -return ; - -/* wait for room in the tx FIFO */ -while ((readl (&uart->ufstat) &TX_FIFO_FULL_MASK )) { -if (serial_err_check (dev_index,1 )) -return ; - } +struct s5p_serial_platdata *plat = dev->platdata; +struct s5p_uart *const uart = plat->reg; -writeb (c, &uart->utxh); +if (readl (&uart->ufstat) &TX_FIFO_FULL ) +return -EAGAIN ; -/* If \n, also do \r */ -if (c =='\n' ) -serial_putc ('\r' ); -} - -/* -* Test whether a character is in the RX buffer -*/ -static int serial_tstc_dev (const int dev_index) -{ -struct s5p_uart *const uart =s5p_get_base_uart (dev_index); +writeb (ch, &uart->utxh); +serial_err_check (uart,1 ); -if (!config.enabled) -return 0 ; - -return (int )(readl (&uart->utrstat) &0x1 ); +return 0 ; } -static void serial_puts_dev (const char *s,const int dev_index) +static int s5p_serial_pending (struct udevice *dev,bool input) { -while (*s) -serial_putc_dev (*s++, dev_index); -} +struct s5p_serial_platdata *plat = dev->platdata; +struct s5p_uart *const uart = plat->reg; +uint32_t ufstat =readl (&uart->ufstat); -/* Multi serial device functions */ -#define DECLARE_S5P_SERIAL_FUNCTIONS (port) \ -static int s5p_serial##port##_init(void) { return serial_init_dev(port); } \ -static void s5p_serial##port##_setbrg(void) { serial_setbrg_dev(port); } \ -static int s5p_serial##port##_getc(void) { return serial_getc_dev(port); } \ -static int s5p_serial##port##_tstc(void) { return serial_tstc_dev(port); } \ -static void s5p_serial##port##_putc(const char c) { serial_putc_dev(c, port); } \ -static void s5p_serial##port##_puts(const char *s) { serial_puts_dev(s, port); } - -#define INIT_S5P_SERIAL_STRUCTURE (port, __name) { \ - .name = __name, \ - .start = s5p_serial##port##_init, \ - .stop = NULL, \ - .setbrg = s5p_serial##port##_setbrg, \ - .getc = s5p_serial##port##_getc, \ - .tstc = s5p_serial##port##_tstc, \ - .putc = s5p_serial##port##_putc, \ - .puts = s5p_serial##port##_puts, \ +if (input) +return (ufstat &RX_FIFO_COUNT_MASK ) >>RX_FIFO_COUNT_SHIFT ; +else +return (ufstat &TX_FIFO_COUNT_MASK ) >>TX_FIFO_COUNT_SHIFT ; } -DECLARE_S5P_SERIAL_FUNCTIONS (0 ); -struct serial_device s5p_serial0_device = -INIT_S5P_SERIAL_STRUCTURE (0 ,"s5pser0" ); -DECLARE_S5P_SERIAL_FUNCTIONS (1 ); -struct serial_device s5p_serial1_device = -INIT_S5P_SERIAL_STRUCTURE (1 ,"s5pser1" ); -DECLARE_S5P_SERIAL_FUNCTIONS (2 ); -struct serial_device s5p_serial2_device = -INIT_S5P_SERIAL_STRUCTURE (2 ,"s5pser2" ); -DECLARE_S5P_SERIAL_FUNCTIONS (3 ); -struct serial_device s5p_serial3_device = -INIT_S5P_SERIAL_STRUCTURE (3 ,"s5pser3" ); - -#ifdef CONFIG_OF_CONTROL -int fdtdec_decode_console (int *index,struct fdt_serial *uart) +static int s5p_serial_ofdata_to_platdata (struct udevice *dev) { -const void *blob = gd->fdt_blob; -int node; +struct s5p_serial_platdata *plat = dev->platdata; +fdt_addr_t addr; - node =fdt_path_offset (blob,"console" ); -if (node <0 ) -return node; + addr =fdtdec_get_addr (gd->fdt_blob, dev->of_offset,"reg" ); +if (addr ==FDT_ADDR_T_NONE ) +return -EINVAL ; - uart->base_addr =fdtdec_get_addr (blob, node,"reg" ); -if (uart->base_addr ==FDT_ADDR_T_NONE ) -return -FDT_ERR_NOTFOUND ; - - uart->port_id =fdtdec_get_int (blob, node,"id" ,-1 ); - uart->enabled =fdtdec_get_is_enabled (blob, node); + plat->reg = (struct s5p_uart *)addr; + plat->port_id =fdtdec_get_int (gd->fdt_blob, dev->of_offset,"id" ,-1 );return 0 ; } -#endif -__weak struct serial_device *default_serial_console (void ) -{ -#ifdef CONFIG_OF_CONTROL -int index =0 ; - -if ((!config.base_addr) && (fdtdec_decode_console (&index, &config))) { -debug ("Cannot decode default console node\n" ); -return NULL ; - } - -switch (config.port_id) { -case 0 : -return &s5p_serial0_device; -case 1 : -return &s5p_serial1_device; -case 2 : -return &s5p_serial2_device; -case 3 : -return &s5p_serial3_device; -default : -debug ("Unknown config.port_id: %d" , config.port_id); -break ; - } - -return NULL ; -#else - config.enabled =1 ; -#if defined(CONFIG_SERIAL0 ) -return &s5p_serial0_device; -#elif defined(CONFIG_SERIAL1 ) -return &s5p_serial1_device; -#elif defined(CONFIG_SERIAL2 ) -return &s5p_serial2_device; -#elif defined(CONFIG_SERIAL3 ) -return &s5p_serial3_device; -#else -#error "CONFIG_SERIAL? missing." -#endif -#endif -} +static const struct dm_serial_ops s5p_serial_ops = { + .putc = s5p_serial_putc, + .pending = s5p_serial_pending, + .getc = s5p_serial_getc, + .setbrg = s5p_serial_setbrg, +}; -void s5p_serial_initialize (void ) -{ -serial_register (&s5p_serial0_device); -serial_register (&s5p_serial1_device); -serial_register (&s5p_serial2_device); -serial_register (&s5p_serial3_device); -} +static const struct udevice_id s5p_serial_ids[] = { + { .compatible ="samsung,exynos4210-uart" }, + { } +}; + +U_BOOT_DRIVER (serial_s5p) = { + .name ="serial_s5p" , + .id =UCLASS_SERIAL , + .of_match = s5p_serial_ids, + .ofdata_to_platdata = s5p_serial_ofdata_to_platdata, + .platdata_auto_alloc_size =sizeof (struct s5p_serial_platdata ), + .probe = s5p_serial_probe, + .ops = &s5p_serial_ops, + .flags =DM_FLAG_PRE_RELOC , +};
include/configs/exynos-common.h +1 -0
@@ -20,6 +20,7 @@#define CONFIG_DM #define CONFIG_CMD_DM #define CONFIG_DM_GPIO +#define CONFIG_DM_SERIAL #define CONFIG_ARCH_CPU_INIT #define CONFIG_DISPLAY_CPUINFO
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 10/14 dm: serial: Move baud rate calculation to ns16550.c
In reply to Simon GlassMove the function that calculates the baud rate divisor into ns16550.c so it can be used by that file.
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Add new patch to move baud rate calculation to ns16550.c
Changes in v2: None
drivers/serial/ns16550.c | 18 +++++++++++++++++- drivers/serial/serial_ns16550.c | 14 ++++---------- include/ns16550.h | 13 +++++++++++++ 3 files changed, 34 insertions(+), 11 deletions(-)
drivers/serial/ns16550.c +17 -1
@@ -4,7 +4,7 @@* modified to use CONFIG_SYS_ISA_MEM and new defines */ -#include <config.h> +#include <common.h> #include <ns16550.h> #include <watchdog.h> #include <linux/types.h>
@@ -45,6 +45,22 @@#define CONFIG_SYS_NS16550_IER 0x00#endif /* CONFIG_SYS_NS16550_IER */ +int ns16550_calc_divisor (NS16550_t port,int clock,int baudrate) +{ +const unsigned int mode_x_div =16 ; + +#ifdef CONFIG_OMAP1510 +/* If can't cleanly clock 115200 set div to 1 */ +if ((clock ==12000000 ) && (baudrate ==115200 )) { + port->osc_12m_sel =OSC_12M_SEL ;/* enable 6.5 * divisor */ +return 1 ;/* return 1 for base divisor */ + } + port->osc_12m_sel =0 ;/* clear if previsouly set */ +#endif + +return DIV_ROUND_CLOSEST (clock, mode_x_div * baudrate); +} +void NS16550_init (NS16550_t com_port,int baud_divisor) {#if (defined(CONFIG_SPL_BUILD ) && defined(CONFIG_OMAP34XX ))
drivers/serial/serial_ns16550.c +4 -10
@@ -81,7 +81,8 @@ static NS16550_t serial_ports[6] = { static int eserial##port##_init(void) \ { \int clock_divisor; \ - clock_divisor =calc_divisor (serial_ports[port-1 ]); \ + clock_divisor =ns16550_calc_divisor (serial_ports[port-1 ], \ +CONFIG_SYS_NS16550_CLK , gd->baudrate); \NS16550_init (serial_ports[port-1 ], clock_divisor); \return 0 ; \ } \
@@ -118,14 +119,6 @@ static NS16550_t serial_ports[6] = { .puts = eserial##port##_puts, \ } -static int calc_divisor (NS16550_t port) -{ -const unsigned int mode_x_div =16 ; - -return DIV_ROUND_CLOSEST (CONFIG_SYS_NS16550_CLK , - mode_x_div * gd->baudrate); -} -void _serial_putc (const char c,const int port) {
@@ -167,7 +160,8 @@ _serial_setbrg (const int port) {int clock_divisor; - clock_divisor =calc_divisor (PORT ); + clock_divisor =ns16550_calc_divisor (PORT ,CONFIG_SYS_NS16550_CLK , + gd->baudrate);NS16550_reinit (PORT , clock_divisor); }
include/ns16550.h +13 -0
@@ -170,3 +170,16 @@ void NS16550_putc(NS16550_t com_port, char c);char NS16550_getc (NS16550_t com_port);int NS16550_tstc (NS16550_t com_port);void NS16550_reinit (NS16550_t com_port,int baud_divisor); + +/** +* ns16550_calc_divisor() - calculate the divisor given clock and baud rate +* +* Given the UART input clock and required baudrate, calculate the divisor +* that should be used. +* +* @port: UART port +* @clock: UART input clock speed in Hz +* @baudrate: Required baud rate +* @return baud rate divisor that should be used +*/ +int ns16550_calc_divisor (NS16550_t port,int clock,int baudrate);
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 10/14 dm: serial: Move baud rate calculation to ns16550.c
Quoted 4 lines · Simon Glass
Move the function that calculates the baud rate divisor into
ns16550.cso it can be used by that file.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 11/14 dm: serial: Collect common baud rate code in ns16550
In reply to Simon GlassThe same sequence is used in several places, so move it into a function. Note that UART_LCR_BKSE is an alias for UART_LCR_DLAB.
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Add new patch to collect common baud rate code in ns16550
Changes in v2: None
drivers/serial/ns16550.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
drivers/serial/ns16550.c +13 -20
@@ -61,6 +61,14 @@ int ns16550_calc_divisor(NS16550_t port, int clock, int baudrate)return DIV_ROUND_CLOSEST (clock, mode_x_div * baudrate); } +static void NS16550_setbrg (NS16550_t com_port,int baud_divisor) +{ +serial_out (UART_LCR_BKSE |UART_LCRVAL , &com_port->lcr); +serial_out (baud_divisor &0xff , &com_port->dll); +serial_out ((baud_divisor >>8 ) &0xff , &com_port->dlm); +serial_out (UART_LCRVAL , &com_port->lcr); +} +void NS16550_init (NS16550_t com_port,int baud_divisor) {#if (defined(CONFIG_SPL_BUILD ) && defined(CONFIG_OMAP34XX ))
@@ -71,10 +79,7 @@ void NS16550_init(NS16550_t com_port, int baud_divisor)*/ if ((serial_in (&com_port->lsr) & (UART_LSR_TEMT |UART_LSR_THRE )) ==UART_LSR_THRE ) { -serial_out (UART_LCR_DLAB , &com_port->lcr); -serial_out (baud_divisor &0xff , &com_port->dll); -serial_out ((baud_divisor >>8 ) &0xff , &com_port->dlm); -serial_out (UART_LCRVAL , &com_port->lcr); +NS16550_setbrg (com_port, baud_divisor);serial_out (0 , &com_port->mdr1); }#endif
@@ -87,16 +92,10 @@ void NS16550_init(NS16550_t com_port, int baud_divisor) defined(CONFIG_TI81XX) || defined(CONFIG_AM43XX)serial_out (0x7 , &com_port->mdr1);/* mode select reset TL16C750*/ #endif -serial_out (UART_LCR_BKSE |UART_LCRVAL , &com_port->lcr); -serial_out (0 , &com_port->dll); -serial_out (0 , &com_port->dlm); -serial_out (UART_LCRVAL , &com_port->lcr); +NS16550_setbrg (com_port,0 );serial_out (UART_MCRVAL , &com_port->mcr);serial_out (UART_FCRVAL , &com_port->fcr); -serial_out (UART_LCR_BKSE |UART_LCRVAL , &com_port->lcr); -serial_out (baud_divisor &0xff , &com_port->dll); -serial_out ((baud_divisor >>8 ) &0xff , &com_port->dlm); -serial_out (UART_LCRVAL , &com_port->lcr); +NS16550_setbrg (com_port, baud_divisor);#if defined(CONFIG_OMAP ) || \ defined(CONFIG_AM33XX ) || defined(CONFIG_SOC_DA8XX ) || \ defined(CONFIG_TI81XX ) || defined(CONFIG_AM43XX )
@@ -113,16 +112,10 @@ void NS16550_init(NS16550_t com_port, int baud_divisor)void NS16550_reinit (NS16550_t com_port,int baud_divisor) {serial_out (CONFIG_SYS_NS16550_IER , &com_port->ier); -serial_out (UART_LCR_BKSE |UART_LCRVAL , &com_port->lcr); -serial_out (0 , &com_port->dll); -serial_out (0 , &com_port->dlm); -serial_out (UART_LCRVAL , &com_port->lcr); +NS16550_setbrg (com_port,0 );serial_out (UART_MCRVAL , &com_port->mcr);serial_out (UART_FCRVAL , &com_port->fcr); -serial_out (UART_LCR_BKSE , &com_port->lcr); -serial_out (baud_divisor &0xff , &com_port->dll); -serial_out ((baud_divisor >>8 ) &0xff , &com_port->dlm); -serial_out (UART_LCRVAL , &com_port->lcr); +NS16550_setbrg (com_port, baud_divisor); }#endif /* CONFIG_NS16550_MIN_FUNCTIONS */
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 11/14 dm: serial: Collect common baud rate code in ns16550
Quoted 4 lines · Simon Glass
The same sequence is used in several places, so move it into a function. Note that
UART_LCR_BKSEis an alias forUART_LCR_DLAB.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 12/14 dm: serial: Add driver model support for ns16550
In reply to Simon GlassAdd driver model support so that ns16550 can support operation both with and without driver model.
The driver needs a clock frequency so cannot stand alone unfortunately. The clock frequency must be provided by a separate driver.
---
Changes in v5:
- Add struct udevice declaration
Changes in v4:
- Remove clock frequency setup for ns16550 driver
Changes in v3:
- Add new patch to support driver model in ns16550
Changes in v2: None
doc/device-tree-bindings/serial/ns16550.txt | 10 ++ drivers/serial/Makefile | 2 +- drivers/serial/ns16550.c | 156 +++++++++++++++++++++++++++- include/ns16550.h | 53 ++++++++++ 4 files changed, 218 insertions(+), 3 deletions(-) create mode 100644 doc/device-tree-bindings/serial/ns16550.txt
doc/device-tree-bindings/serial/ns16550.txt new file +10 -0
@@ -0,0 +1,10 @@ +NS16550 UART + +This UART driver supports many chip variants and is used in mamy SoCs. + +Required properties: +- compatible: "ns16550" or "nvidia,tegra20-uart" +- reg: start address and size of registers +- reg-shift: shift value indicating register size: 0=byte, 1=16bit,2=32bit etc. +- clock-frequency: input clock frequency for the UART (used to calculate the + baud rate divisor)
drivers/serial/Makefile +1 -1
@@ -9,6 +9,7 @@ ifdef CONFIG_DM_SERIAL obj-y += serial-uclass.o else obj-y += serial.o +obj-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o endif obj-$(CONFIG_ALTERA_UART) += altera_uart.o
@@ -20,7 +21,6 @@ obj-$(CONFIG_MCFUART) += mcfuart.o obj-$(CONFIG_OPENCORES_YANU) += opencores_yanu.o obj-$(CONFIG_SYS_NS16550) += ns16550.o obj-$(CONFIG_S5P) += serial_s5p.o -obj-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o obj-$(CONFIG_IMX_SERIAL) += serial_imx.o obj-$(CONFIG_KS8695_SERIAL) += serial_ks8695.o obj-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
drivers/serial/ns16550.c +154 -2
200 lines not on this page · raw message
include/ns16550.h +53 -0
74 lines not on this page · raw message
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 12/14 dm: serial: Add driver model support for ns16550
Quoted 7 lines · Simon Glass
Add driver model support so that ns16550 can support operation both with and without driver model.
The driver needs a clock frequency so cannot stand alone unfortunately. The clock frequency must be provided by a separate driver.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 13/14 tegra: dts: Add serial port details
In reply to Simon GlassSome Tegra device tree files do not include information about the serial ports. Add this and also add information about the input clock speed.
The console alias needs to be set up to indicate which port is used for the console.
Also add a binding file since this is missing.
Series-changes; 5
- Add full serial port nodes from Linux tree (commit fc9d4dbe)
- Use /chosen/stdout-path instead of /aliases/console to specify the console
---
Changes in v5: None
Changes in v4:
- Remove 'clock-frequency' property from serial nodes
Changes in v3:
- Add new patch for tegra serial port details
Changes in v2: None
arch/arm/dts/tegra114-dalmore.dts | 4 + arch/arm/dts/tegra114.dtsi | 53 +++++ arch/arm/dts/tegra124-jetson-tk1.dts | 4 + arch/arm/dts/tegra124-venice2.dts | 4 + arch/arm/dts/tegra124.dtsi | 66 ++++++ arch/arm/dts/tegra20-colibri_t20_iris.dts | 4 + arch/arm/dts/tegra20-harmony.dts | 4 + arch/arm/dts/tegra20-medcom-wide.dts | 4 + arch/arm/dts/tegra20-paz00.dts | 4 + arch/arm/dts/tegra20-plutux.dts | 4 + arch/arm/dts/tegra20-seaboard.dts | 4 + arch/arm/dts/tegra20-tec.dts | 4 + arch/arm/dts/tegra20-trimslice.dts | 4 + arch/arm/dts/tegra20-ventana.dts | 4 + arch/arm/dts/tegra20-whistler.dts | 4 + arch/arm/dts/tegra20.dtsi | 51 ++++- arch/arm/dts/tegra30-beaver.dts | 4 + arch/arm/dts/tegra30-cardhu.dts | 4 + arch/arm/dts/tegra30-tamonten.dtsi | 4 + arch/arm/dts/tegra30.dtsi | 66 ++++++ include/dt-bindings/clock/tegra114-car.h | 342 ++++++++++++++++++++++++++++++ include/dt-bindings/clock/tegra124-car.h | 342 ++++++++++++++++++++++++++++++ include/dt-bindings/clock/tegra20-car.h | 158 ++++++++++++++ include/dt-bindings/clock/tegra30-car.h | 273 ++++++++++++++++++++++++ 24 files changed, 1405 insertions(+), 10 deletions(-) create mode 100644 include/dt-bindings/clock/tegra114-car.h create mode 100644 include/dt-bindings/clock/tegra124-car.h create mode 100644 include/dt-bindings/clock/tegra20-car.h create mode 100644 include/dt-bindings/clock/tegra30-car.h
arch/arm/dts/tegra114-dalmore.dts +4 -0
@@ -6,6 +6,10 @@ model = "NVIDIA Dalmore"; compatible = "nvidia,dalmore", "nvidia,tegra114"; + chosen { + stdout-path = &uartd; + }; + aliases { i2c0 = "/i2c at 7000d000"; i2c1 = "/i2c at 7000c000";
arch/arm/dts/tegra114.dtsi +53 -0
62 lines not on this page · raw message
arch/arm/dts/tegra124-jetson-tk1.dts +4 -0
@@ -6,6 +6,10 @@ model = "NVIDIA Jetson TK1"; compatible = "nvidia,jetson-tk1", "nvidia,tegra124"; + chosen { + stdout-path = &uartd; + }; + aliases { i2c0 = "/i2c at 7000d000"; i2c1 = "/i2c at 7000c000";
arch/arm/dts/tegra124-venice2.dts +4 -0
@@ -6,6 +6,10 @@ model = "NVIDIA Venice2"; compatible = "nvidia,venice2", "nvidia,tegra124"; + chosen { + stdout-path = &uarta; + }; + aliases { i2c0 = "/i2c at 7000d000"; i2c1 = "/i2c at 7000c000";
arch/arm/dts/tegra124.dtsi +66 -0
75 lines not on this page · raw message
arch/arm/dts/tegra20-colibri_t20_iris.dts +4 -0
@@ -6,6 +6,10 @@ model = "Toradex Colibri T20"; compatible = "toradex,t20", "nvidia,tegra20"; + chosen { + stdout-path = &uarta; + }; + aliases { usb0 = "/usb at c5008000"; usb1 = "/usb at c5000000";
arch/arm/dts/tegra20-harmony.dts +4 -0
@@ -6,6 +6,10 @@ model = "NVIDIA Tegra20 Harmony evaluation board"; compatible = "nvidia,harmony", "nvidia,tegra20"; + chosen { + stdout-path = &uartd; + }; + aliases { usb0 = "/usb at c5008000"; usb1 = "/usb at c5004000";
arch/arm/dts/tegra20-medcom-wide.dts +4 -0
@@ -6,6 +6,10 @@ model = "Avionic Design Medcom-Wide"; compatible = "ad,medcom-wide", "nvidia,tegra20"; + chosen { + stdout-path = &uartd; + }; + aliases { usb0 = "/usb at c5008000"; sdhci0 = "/sdhci at c8000600";
arch/arm/dts/tegra20-paz00.dts +4 -0
@@ -6,6 +6,10 @@ model = "Toshiba AC100 / Dynabook AZ"; compatible = "compal,paz00", "nvidia,tegra20"; + chosen { + stdout-path = &uarta; + }; + aliases { usb0 = "/usb at c5008000"; sdhci0 = "/sdhci at c8000600";
arch/arm/dts/tegra20-plutux.dts +4 -0
@@ -6,6 +6,10 @@ model = "Avionic Design Plutux"; compatible = "ad,plutux", "nvidia,tegra20"; + chosen { + stdout-path = &uartd; + }; + aliases { usb0 = "/usb at c5008000"; sdhci0 = "/sdhci at c8000600";
arch/arm/dts/tegra20-seaboard.dts +4 -0
@@ -10,6 +10,10 @@ bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait"; }; + chosen { + stdout-path = &uartd; + }; + aliases { /* This defines the order of our ports */ usb0 = "/usb at c5008000";
arch/arm/dts/tegra20-tec.dts +4 -0
@@ -6,6 +6,10 @@ model = "Avionic Design Tamonten Evaluation Carrier"; compatible = "ad,tec", "nvidia,tegra20"; + chosen { + stdout-path = &uartd; + }; + aliases { usb0 = "/usb at c5008000"; sdhci0 = "/sdhci at c8000600";
arch/arm/dts/tegra20-trimslice.dts +4 -0
@@ -6,6 +6,10 @@ model = "Compulab TrimSlice board"; compatible = "compulab,trimslice", "nvidia,tegra20"; + chosen { + stdout-path = &uarta; + }; + aliases { usb0 = "/usb at c5008000"; usb1 = "/usb at c5000000";
arch/arm/dts/tegra20-ventana.dts +4 -0
@@ -6,6 +6,10 @@ model = "NVIDIA Tegra20 Ventana evaluation board"; compatible = "nvidia,ventana", "nvidia,tegra20"; + chosen { + stdout-path = &uartd; + }; + aliases { usb0 = "/usb at c5008000"; sdhci0 = "/sdhci at c8000600";
arch/arm/dts/tegra20-whistler.dts +4 -0
@@ -6,6 +6,10 @@ model = "NVIDIA Tegra20 Whistler evaluation board"; compatible = "nvidia,whistler", "nvidia,tegra20"; + chosen { + stdout-path = &uarta; + }; + aliases { i2c0 = "/i2c at 7000d000"; usb0 = "/usb at c5008000";
arch/arm/dts/tegra20.dtsi +41 -10
83 lines not on this page · raw message
arch/arm/dts/tegra30-beaver.dts +4 -0
@@ -6,6 +6,10 @@ model = "NVIDIA Beaver"; compatible = "nvidia,beaver", "nvidia,tegra30"; + chosen { + stdout-path = &uarta; + }; + aliases { i2c0 = "/i2c at 7000d000"; i2c1 = "/i2c at 7000c000";
arch/arm/dts/tegra30-cardhu.dts +4 -0
@@ -6,6 +6,10 @@ model = "NVIDIA Cardhu"; compatible = "nvidia,cardhu", "nvidia,tegra30"; + chosen { + stdout-path = &uarta; + }; + aliases { i2c0 = "/i2c at 7000d000"; i2c1 = "/i2c at 7000c000";
arch/arm/dts/tegra30-tamonten.dtsi +4 -0
@@ -8,6 +8,10 @@ reg = <0x80000000 0x40000000>; }; + chosen { + stdout-path = &uartd; + }; + aliases { i2c0 = "/i2c at 7000c000"; i2c1 = "/i2c at 7000c700";
arch/arm/dts/tegra30.dtsi +66 -0
75 lines not on this page · raw message
include/dt-bindings/clock/tegra114-car.h new file +342 -0
342 lines not on this page · raw message
include/dt-bindings/clock/tegra124-car.h new file +342 -0
342 lines not on this page · raw message
include/dt-bindings/clock/tegra20-car.h new file +158 -0
158 lines not on this page · raw message
include/dt-bindings/clock/tegra30-car.h new file +273 -0
273 lines not on this page · raw message
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 13/14 tegra: dts: Add serial port details
Quoted 6 lines · Simon Glass
Some Tegra device tree files do not include information about the serial ports. Add this and also add information about the input clock speed.
The console alias needs to be set up to indicate which port is used for the console.
Quoted 7 lines
Also add a binding file since this is missing.
Series-changes; 5
- Add full serial port nodes from Linux tree (commitfc9d4dbe)
- Use /chosen/stdout-path instead of /aliases/console to specify the consoleSigned-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
PATCH v5 14/14 dm: tegra: Enable driver model for serial
In reply to Simon GlassUse driver model for serial ports.
Since Tegra now uses driver model for serial, adjust the definition of V_NS16550_CLK so that it is clear that this is only used for SPL.
---
Changes in v5: None
Changes in v4:
- Add a separate Tegra serial driver to deal with the clock issue
- Add new CONFIG_TEGRA_SERIAL option to enable dm driver
- Use hard-coded UART clock from Tegra configuration
Changes in v3:
- Add new patch to enable driver model for serial on tegra
- Add new patch to use V_NS16550_CLK only in SPL builds
Changes in v2: None
drivers/serial/Makefile | 1 + drivers/serial/serial_tegra.c | 38 ++++++++++++++++++++++++++++++++++++++ include/configs/tegra-common.h | 9 ++++++++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 drivers/serial/serial_tegra.c
drivers/serial/Makefile +1 -0
@@ -38,6 +38,7 @@ obj-$(CONFIG_BFIN_SERIAL) += serial_bfin.o obj-$(CONFIG_FSL_LPUART) += serial_lpuart.o obj-$(CONFIG_MXS_AUART) += mxs_auart.o obj-$(CONFIG_ARC_SERIAL) += serial_arc.o +obj-$(CONFIG_TEGRA_SERIAL) += serial_tegra.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_USB_TTY) += usbtty.o
drivers/serial/serial_tegra.c new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Copyright (c) 2014 Google, Inc +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <dm.h> +#include <ns16550.h> +#include <serial.h> + +static const struct udevice_id tegra_serial_ids[] = { + { .compatible ="nvidia,tegra20-uart" }, + { } +}; + +static int tegra_serial_ofdata_to_platdata (struct udevice *dev) +{ +struct ns16550_platdata *plat =dev_get_platdata (dev); +int ret; + + ret =ns16550_serial_ofdata_to_platdata (dev); +if (ret) +return ret; + plat->clock =V_NS16550_CLK ; + +return 0 ; +} +U_BOOT_DRIVER (serial_ns16550) = { + .name ="serial_tegra20" , + .id =UCLASS_SERIAL , + .of_match = tegra_serial_ids, + .ofdata_to_platdata = tegra_serial_ofdata_to_platdata, + .platdata_auto_alloc_size =sizeof (struct ns16550_platdata ), + .priv_auto_alloc_size =sizeof (struct NS16550 ), + .probe = ns16550_serial_probe, + .ops = &ns16550_serial_ops, +};
include/configs/tegra-common.h +8 -1
@@ -21,6 +21,9 @@#define CONFIG_DM #define CONFIG_CMD_DM #define CONFIG_DM_GPIO +#ifndef CONFIG_SPL_BUILD +#define CONFIG_DM_SERIAL +#endif #define CONFIG_SYS_TIMER_RATE 1000000#define CONFIG_SYS_TIMER_COUNTER NV_PA_TMRUS_BASE
@@ -46,10 +49,14 @@/* * NS16550 Configuration */ -#define CONFIG_SYS_NS16550 +#ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4)#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK +#else +#define CONFIG_TEGRA_SERIAL +#endif +#define CONFIG_SYS_NS16550 /* * Common HW configuration.
Signature · 1 line
2.1.0.rc2.206.gedb03e5
PATCH v5 14/14 dm: tegra: Enable driver model for serial
Hi,
Quoted 9 lines · Simon Glass
Use driver model for serial ports.
Since Tegra now uses driver model for serial, adjust the definition of
V_NS16550_CLKso that it is clear that this is only used for SPL.Signed-off-by Simon Glass <[email protected]>---
I've tested this series as much as I can, and in particular on Tegra 20, 30 and 124. Are there any final comments before I pull it into dm/master? I'd like to allow plenty of test time before the release.
Regards,
Simon
PATCH v5 14/14 dm: tegra: Enable driver model for serial
Quoted 9 lines · Simon Glass
Hi,
Quoted 5 lines · Simon Glass
Use driver model for serial ports.
Since Tegra now uses driver model for serial, adjust the definition of
V_NS16550_CLKso that it is clear that this is only used for SPL.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Simon Glass <[email protected]>---
I've tested this series as much as I can, and in particular on Tegra 20, 30 and 124. Are there any final comments before I pull it into dm/master? I'd like to allow plenty of test time before the release.
I think we're too late for this release as we're basically 30 days away.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140915/701881d7/attachment.pgp>
PATCH v5 14/14 dm: tegra: Enable driver model for serial
Quoted 14 lines · Tom Rini
Quoted 13 lines · Simon Glass
Hi,
Quoted 9 lines · Simon Glass
Use driver model for serial ports.
Since Tegra now uses driver model for serial, adjust the definition of
V_NS16550_CLKso that it is clear that this is only used for SPL.Signed-off-by Simon Glass <[email protected]>---
Quoted 5 lines
Quoted 3 lines
I've tested this series as much as I can, and in particular on Tegra 20, 30 and 124. Are there any final comments before I pull it into dm/master? I'd like to allow plenty of test time before the release.
I think we're too late for this release as we're basically 30 days away.
Agreed but please get this merged in the began of 2015.01 merge window.
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
PATCH v5 14/14 dm: tegra: Enable driver model for serial
In reply to Simon GlassQuoted 6 lines · Simon Glass
Use driver model for serial ports.
Since Tegra now uses driver model for serial, adjust the definition of
V_NS16550_CLKso that it is clear that this is only used for SPL.Signed-off-by Simon Glass <[email protected]>
Applied to u-boot-dm/master and now in mainline.
v5 cover Introduce driver model serial uclass
In reply to Simon GlassHi,
Quoted 40 lines · Simon Glass
This series adds support for a serial uclass, enabling serial drivers to be converted to use driver model.
With v4, exynos boards all build and a second attempt has been made to add Tegra support via the ns16550 driver, tested on beaver, Jetson-TK1 and seaboard (i.e. 3 of the 4 SoCs in mainline).
To see the current state of driver model, look at u-boot-dm.git branch 'working'. This branch is at 'serial-working'.
Changes in v5:
- Add new patch to add a function to look up a chosen node
- Add struct udevice declaration
- Use /chosen/stdout-path instead of /aliases/console to specify the consoleChanges in v4:
- Add a binding for sandbox serial
- Add a separate Tegra serial driver to deal with the clock issue
- Add newCONFIG_TEGRA_SERIALoption to enable dm driver
- Remove 'clock-frequency' property from serial nodes
- Remove clock frequency setup for ns16550 driver
- Remove pre-reloc fdt property
- Use hard-coded UART clock from Tegra configurationChanges in v3:
- Add new change to enhancelists_bind_fdt()
- Add new patch for tegra serial port details
- Add new patch to collect common baud rate code in ns16550
- Add new patch to enable driver model for serial on tegra
- Add new patch to move baud rate calculation tons16550.c
- Add new patch to support driver model in ns16550
- Add new patch to useV_NS16550_CLKonly in SPL builds
- Automatically bind the console even if not marked for pre-relocation
- Avoid reordering functions
- Change pre-reloc fdt property to 'u-boot,dm-pre-reloc'
- Fix typo in commit messageChanges in v2:
- Rename struct device to struct udevice
Quoted 15 lines
Simon Glass (14):
serial: Set up the 'priv' pointer when creating a serial device
dm: fdt: Add a function to look up a chosen node
dm: Adjustlists_bind_fdt()to return the bound device
dm: Add a uclass for serial devices
sandbox: Convert serial driver to use driver model
sandbox: serial: Support a coloured console
sandbox: dts: Add a serial console node
dm: exynos: Mark exynos5 console as pre-reloc
dm: exynos: Move serial to driver model
dm: serial: Move baud rate calculation tons16550.c
dm: serial: Collect common baud rate code in ns16550
dm: serial: Add driver model support for ns16550
tegra: dts: Add serial port details
dm: tegra: Enable driver model for serial
Are there any final comments on this series please?
I plan to apply the sandbox and tegra portions to dm/master early next week.
Regards,
Simon