public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v2] serial: atmel_usart: Add device tree support
@ 2016-06-01  0:36 Wenyou Yang
  2016-06-04 20:32 ` Andreas Bießmann
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Wenyou Yang @ 2016-06-01  0:36 UTC (permalink / raw)
  To: u-boot

Add device tree support.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---

Changes in v2:
 - Add conditional for device tree support.

 drivers/serial/atmel_usart.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
index 4fe992b..e450135 100644
--- a/drivers/serial/atmel_usart.c
+++ b/drivers/serial/atmel_usart.c
@@ -191,16 +191,35 @@ static int atmel_serial_probe(struct udevice *dev)
 {
 	struct atmel_serial_platdata *plat = dev->platdata;
 	struct atmel_serial_priv *priv = dev_get_priv(dev);
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+	fdt_addr_t addr_base;
 
+	addr_base = dev_get_addr(dev);
+	if (addr_base == FDT_ADDR_T_NONE)
+		return -ENODEV;
+
+	plat->base_addr = (uint32_t)addr_base;
+#endif
 	priv->usart = (atmel_usart3_t *)plat->base_addr;
 	atmel_serial_init_internal(priv->usart);
 
 	return 0;
 }
 
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+static const struct udevice_id atmel_serial_ids[] = {
+	{ .compatible = "atmel,at91sam9260-usart" },
+	{ }
+};
+#endif
+
 U_BOOT_DRIVER(serial_atmel) = {
 	.name	= "serial_atmel",
 	.id	= UCLASS_SERIAL,
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+	.of_match = atmel_serial_ids,
+	.platdata_auto_alloc_size = sizeof(struct atmel_serial_platdata),
+#endif
 	.probe = atmel_serial_probe,
 	.ops	= &atmel_serial_ops,
 	.flags = DM_FLAG_PRE_RELOC,
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [U-Boot] [PATCH v2] serial: atmel_usart: Add device tree support
  2016-06-01  0:36 [U-Boot] [PATCH v2] serial: atmel_usart: Add device tree support Wenyou Yang
@ 2016-06-04 20:32 ` Andreas Bießmann
  2016-06-10  0:36 ` Simon Glass
  2016-06-12 22:01 ` [U-Boot] [U-Boot, " Andreas Bießmann
  2 siblings, 0 replies; 4+ messages in thread
From: Andreas Bießmann @ 2016-06-04 20:32 UTC (permalink / raw)
  To: u-boot

On 01.06.16 02:36, Wenyou Yang wrote:
> Add device tree support.
> 
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>

Reviewed-by: Andreas Bie?mann <andreas@biessmann.org>

> ---
> 
> Changes in v2:
>  - Add conditional for device tree support.
> 
>  drivers/serial/atmel_usart.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
> 
> diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c
> index 4fe992b..e450135 100644
> --- a/drivers/serial/atmel_usart.c
> +++ b/drivers/serial/atmel_usart.c
> @@ -191,16 +191,35 @@ static int atmel_serial_probe(struct udevice *dev)
>  {
>  	struct atmel_serial_platdata *plat = dev->platdata;
>  	struct atmel_serial_priv *priv = dev_get_priv(dev);
> +#if CONFIG_IS_ENABLED(OF_CONTROL)
> +	fdt_addr_t addr_base;
>  
> +	addr_base = dev_get_addr(dev);
> +	if (addr_base == FDT_ADDR_T_NONE)
> +		return -ENODEV;
> +
> +	plat->base_addr = (uint32_t)addr_base;
> +#endif
>  	priv->usart = (atmel_usart3_t *)plat->base_addr;
>  	atmel_serial_init_internal(priv->usart);
>  
>  	return 0;
>  }
>  
> +#if CONFIG_IS_ENABLED(OF_CONTROL)
> +static const struct udevice_id atmel_serial_ids[] = {
> +	{ .compatible = "atmel,at91sam9260-usart" },
> +	{ }
> +};
> +#endif
> +
>  U_BOOT_DRIVER(serial_atmel) = {
>  	.name	= "serial_atmel",
>  	.id	= UCLASS_SERIAL,
> +#if CONFIG_IS_ENABLED(OF_CONTROL)
> +	.of_match = atmel_serial_ids,
> +	.platdata_auto_alloc_size = sizeof(struct atmel_serial_platdata),
> +#endif
>  	.probe = atmel_serial_probe,
>  	.ops	= &atmel_serial_ops,
>  	.flags = DM_FLAG_PRE_RELOC,
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot] [PATCH v2] serial: atmel_usart: Add device tree support
  2016-06-01  0:36 [U-Boot] [PATCH v2] serial: atmel_usart: Add device tree support Wenyou Yang
  2016-06-04 20:32 ` Andreas Bießmann
@ 2016-06-10  0:36 ` Simon Glass
  2016-06-12 22:01 ` [U-Boot] [U-Boot, " Andreas Bießmann
  2 siblings, 0 replies; 4+ messages in thread
From: Simon Glass @ 2016-06-10  0:36 UTC (permalink / raw)
  To: u-boot

On 31 May 2016 at 18:36, Wenyou Yang <wenyou.yang@atmel.com> wrote:
> Add device tree support.
>
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
> ---
>
> Changes in v2:
>  - Add conditional for device tree support.
>
>  drivers/serial/atmel_usart.c | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [U-Boot] [U-Boot, v2] serial: atmel_usart: Add device tree support
  2016-06-01  0:36 [U-Boot] [PATCH v2] serial: atmel_usart: Add device tree support Wenyou Yang
  2016-06-04 20:32 ` Andreas Bießmann
  2016-06-10  0:36 ` Simon Glass
@ 2016-06-12 22:01 ` Andreas Bießmann
  2 siblings, 0 replies; 4+ messages in thread
From: Andreas Bießmann @ 2016-06-12 22:01 UTC (permalink / raw)
  To: u-boot

Dear Wenyou Yang,

Wenyou Yang <wenyou.yang@atmel.com> writes:
>Add device tree support.
>
>Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
>Reviewed-by: Andreas Bie?mann <andreas@biessmann.org>
>Reviewed-by: Simon Glass <sjg@chromium.org>
>---
>
>Changes in v2:
> - Add conditional for device tree support.
>
> drivers/serial/atmel_usart.c | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-06-12 22:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-01  0:36 [U-Boot] [PATCH v2] serial: atmel_usart: Add device tree support Wenyou Yang
2016-06-04 20:32 ` Andreas Bießmann
2016-06-10  0:36 ` Simon Glass
2016-06-12 22:01 ` [U-Boot] [U-Boot, " Andreas Bießmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox