tty: serial: Updates for altera_jtaguart driver

PATCH In review Tobias Klauser 6 participants 18 messages Feb 17, 2011 – Feb 28, 2011 1 message not in the archive

Subsystems (3)

Device tree bindings TTY layer and serial drivers Altera UART/jtag UART serial drivers

lore

Share & tools

lore

Tobias Klauser

author maintainer

2011-02-17 20:28 UTC #0 lore raw

cover tty: serial: Updates for altera_jtaguart driver

This patchset adds updates taken from the Nios2 Linux port (currently out-of-tree) repository to the altera_jtaguart driver.

And this time with the correct cover letter right away :-)

Tobias Klauser (5):
tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer
tty: serial: altera_jtaguart: Remove unused function
early_altera_jtaguart_setup
tty: serial: altera_jtaguart: Support getting mapbase and IRQ from
resources
tty: serial: altera_jtaguart: Fixup type usage of port flags
tty: serial: altera_jtaguart: Add device tree support

 .../devicetree/bindings/altera_jtaguart.txt        |    4 +
 drivers/tty/serial/altera_jtaguart.c               |  100 +++++++++++---------
 2 files changed, 60 insertions(+), 44 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/altera_jtaguart.txt

Tobias Klauser

author maintainer

2011-02-17 20:28 UTC #1 lore raw

PATCH 1/5 tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer

This fixes a sparse warning.

Signed-off-by Tobias Klauser <[email protected]>

---
 drivers/tty/serial/altera_jtaguart.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/tty/serial/altera_jtaguart.c +1 -1

index f9b49b5..0c0a8b6 100644
@@ -384,7 +384,7 @@ static int __init altera_jtaguart_console_setup(struct console *co,
 	if (co->index < 0 || co->index >= ALTERA_JTAGUART_MAXPORTS)
 		return -EINVAL;
 	port = &altera_jtaguart_ports[co->index].port;
-	if (port->membase == 0)
+	if (port->membase == NULL)
 		return -ENODEV;
 	return 0;
 }

Signature · 1 line

1.7.0.4

Tobias Klauser

author maintainer

2011-02-17 20:29 UTC #2 lore raw

PATCH 2/5 tty: serial: altera_jtaguart: Remove unused function early_altera_jtaguart_setup

In reply to Tobias Klauser

This is not even used in nios2 arch code anymore.

Signed-off-by Tobias Klauser <[email protected]>

---
 drivers/tty/serial/altera_jtaguart.c |   22 ----------------------
 1 files changed, 0 insertions(+), 22 deletions(-)

drivers/tty/serial/altera_jtaguart.c +0 ~~-22~~

index 0c0a8b6..94ccf47 100644
@@ -305,28 +305,6 @@ static struct altera_jtaguart altera_jtaguart_ports[ALTERA_JTAGUART_MAXPORTS];
 
 #if defined(CONFIG_SERIAL_ALTERA_JTAGUART_CONSOLE)
 
-int __init early_altera_jtaguart_setup(struct altera_jtaguart_platform_uart
-				       *platp)
-{
-	struct uart_port *port;
-	int i;
-
-	for (i = 0; i < ALTERA_JTAGUART_MAXPORTS && platp[i].mapbase; i++) {
-		port = &altera_jtaguart_ports[i].port;
-
-		port->line = i;
-		port->type = PORT_ALTERA_JTAGUART;
-		port->mapbase = platp[i].mapbase;
-		port->membase = ioremap(port->mapbase, ALTERA_JTAGUART_SIZE);
-		port->iotype = SERIAL_IO_MEM;
-		port->irq = platp[i].irq;
-		port->flags = ASYNC_BOOT_AUTOCONF;
-		port->ops = &altera_jtaguart_ops;
-	}
-
-	return 0;
-}
-
 #if defined(CONFIG_SERIAL_ALTERA_JTAGUART_CONSOLE_BYPASS)
 static void altera_jtaguart_console_putc(struct console *co, const char c)
 {

Signature · 1 line

1.7.0.4

Tobias Klauser

author maintainer

2011-02-17 20:29 UTC #3 lore raw

PATCH 3/5 tty: serial: altera_jtaguart: Support getting mapbase and IRQ from resources

In reply to Tobias Klauser

This will make it easier to get the driver to support device tree. The old platform data method is still supported though.

Also change the driver to use only one platform device per port.

Signed-off-by Tobias Klauser <[email protected]>

---
 drivers/tty/serial/altera_jtaguart.c |   61 +++++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 19 deletions(-)

drivers/tty/serial/altera_jtaguart.c +42 ~~-19~~

index 94ccf47..aa2a4ca 100644
@@ -409,22 +409,45 @@ static int __devinit altera_jtaguart_probe(struct platform_device *pdev)
 {
 	struct altera_jtaguart_platform_uart *platp = pdev->dev.platform_data;
 	struct uart_port *port;
-	int i;
+	struct resource *res_irq, *res_mem;
+	int i = pdev->id;
 
-	for (i = 0; i < ALTERA_JTAGUART_MAXPORTS && platp[i].mapbase; i++) {
-		port = &altera_jtaguart_ports[i].port;
+	/* -1 emphasizes that the platform must have one port, no .N suffix */
+	if (i == -1)
+		i = 0;
 
-		port->line = i;
-		port->type = PORT_ALTERA_JTAGUART;
-		port->mapbase = platp[i].mapbase;
-		port->membase = ioremap(port->mapbase, ALTERA_JTAGUART_SIZE);
-		port->iotype = SERIAL_IO_MEM;
-		port->irq = platp[i].irq;
-		port->ops = &altera_jtaguart_ops;
-		port->flags = ASYNC_BOOT_AUTOCONF;
+	if (i >= ALTERA_JTAGUART_MAXPORTS)
+		return -EINVAL;
 
-		uart_add_one_port(&altera_jtaguart_driver, port);
-	}
+	port = &altera_jtaguart_ports[i].port;
+
+	res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (res_mem)
+		port->mapbase = res_mem->start;
+	else if (platp)
+		port->mapbase = platp->mapbase;
+	else
+		return -ENODEV;
+
+	res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+	if (res_irq)
+		port->irq = res_irq->start;
+	else if (platp)
+		port->irq = platp->irq;
+	else
+		return -ENODEV;
+
+	port->membase = ioremap(port->mapbase, ALTERA_JTAGUART_SIZE);
+	if (!port->membase)
+		return -ENOMEM;
+
+	port->line = i;
+	port->type = PORT_ALTERA_JTAGUART;
+	port->iotype = SERIAL_IO_MEM;
+	port->ops = &altera_jtaguart_ops;
+	port->flags = ASYNC_BOOT_AUTOCONF;
+
+	uart_add_one_port(&altera_jtaguart_driver, port);
 
 	return 0;
 }

@@ -432,13 +455,13 @@ static int __devinit altera_jtaguart_probe(struct platform_device *pdev)
 static int __devexit altera_jtaguart_remove(struct platform_device *pdev)
 {
 	struct uart_port *port;
-	int i;
+	int i = pdev->id;
 
-	for (i = 0; i < ALTERA_JTAGUART_MAXPORTS; i++) {
-		port = &altera_jtaguart_ports[i].port;
-		if (port)
-			uart_remove_one_port(&altera_jtaguart_driver, port);
-	}
+	if (i == -1)
+		i = 0;
+
+	port = &altera_jtaguart_ports[i].port;
+	uart_remove_one_port(&altera_jtaguart_driver, port);
 
 	return 0;
 }

Signature · 1 line

1.7.0.4

Tobias Klauser

author maintainer

2011-02-17 20:29 UTC #4 lore raw

PATCH 4/5 tty: serial: altera_jtaguart: Fixup type usage of port flags

In reply to Tobias Klauser

port->flags is of type upf_t, which corresponds to UPF_* flags.

Signed-off-by Tobias Klauser <[email protected]>

---
 drivers/tty/serial/altera_jtaguart.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/tty/serial/altera_jtaguart.c +1 -1

index aa2a4ca..8f014bb 100644
@@ -445,7 +445,7 @@ static int __devinit altera_jtaguart_probe(struct platform_device *pdev)
 	port->type = PORT_ALTERA_JTAGUART;
 	port->iotype = SERIAL_IO_MEM;
 	port->ops = &altera_jtaguart_ops;
-	port->flags = ASYNC_BOOT_AUTOCONF;
+	port->flags = UPF_BOOT_AUTOCONF;
 
 	uart_add_one_port(&altera_jtaguart_driver, port);

Signature · 1 line

1.7.0.4

Tobias Klauser

author maintainer

2011-02-17 20:30 UTC #5 lore raw

PATCH 5/5 tty: serial: altera_jtaguart: Add device tree support

In reply to Tobias Klauser

Advertise the possibility to use this driver with device tree if CONFIG_OF is set.

Signed-off-by Tobias Klauser <[email protected]>

---
 .../devicetree/bindings/altera_jtaguart.txt        |    4 ++++
 drivers/tty/serial/altera_jtaguart.c               |   15 +++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/altera_jtaguart.txt

Documentation/devicetree/bindings/altera_jtaguart.txt new file +4 -0

new file mode 100644
index 0000000..c152f65
@@ -0,0 +1,4 @@
+Altera JTAG UART
+
+Required properties:
+- compatible : should be "ALTR,juart-1.0"

drivers/tty/serial/altera_jtaguart.c +13 -2

index 8f014bb..d0f8779 100644
@@ -466,12 +466,23 @@ static int __devexit altera_jtaguart_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_OF
+static struct of_device_id altera_jtaguart_match[] = {
+	{ .compatible = "ALTR,juart-1.0", },
+	{},
+}
+MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
+#else
+#define altera_jtaguart_match NULL
+#endif /* CONFIG_OF */
+
 static struct platform_driver altera_jtaguart_platform_driver = {
 	.probe	= altera_jtaguart_probe,
 	.remove	= __devexit_p(altera_jtaguart_remove),
 	.driver	= {
-		.name	= DRV_NAME,
-		.owner	= THIS_MODULE,
+		.name		= DRV_NAME,
+		.owner		= THIS_MODULE,
+		.of_match_table	= altera_jtaguart_match,
 	},
 };

Signature · 1 line

1.7.0.4

Tobias Klauser

author maintainer

2011-02-18 07:54 UTC #6 lore raw

PATCH v2 5/5 tty: serial: altera_jtaguart: Add device tree support

Advertise the possibility to use this driver with device tree if CONFIG_OF is set.

Signed-off-by Tobias Klauser <[email protected]>

---
 .../devicetree/bindings/altera_jtaguart.txt        |    4 ++++
 drivers/tty/serial/altera_jtaguart.c               |   15 +++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/altera_jtaguart.txt

Documentation/devicetree/bindings/altera_jtaguart.txt new file +4 -0

new file mode 100644
index 0000000..c152f65
@@ -0,0 +1,4 @@
+Altera JTAG UART
+
+Required properties:
+- compatible : should be "ALTR,juart-1.0"

drivers/tty/serial/altera_jtaguart.c +13 -2

index 8f014bb..60e049b 100644
@@ -466,12 +466,23 @@ static int __devexit altera_jtaguart_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_OF
+static struct of_device_id altera_jtaguart_match[] = {
+	{ .compatible = "ALTR,juart-1.0", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
+#else
+#define altera_jtaguart_match NULL
+#endif /* CONFIG_OF */
+
 static struct platform_driver altera_jtaguart_platform_driver = {
 	.probe	= altera_jtaguart_probe,
 	.remove	= __devexit_p(altera_jtaguart_remove),
 	.driver	= {
-		.name	= DRV_NAME,
-		.owner	= THIS_MODULE,
+		.name		= DRV_NAME,
+		.owner		= THIS_MODULE,
+		.of_match_table	= altera_jtaguart_match,
 	},
 };

Signature · 1 line

1.7.0.4

Grant Likely

Acked-by on v2 5/5

2011-02-18 07:59 UTC #7 lore raw

Re: [PATCH 5/5 v2] tty: serial: altera_jtaguart: Add device tree support

Documentation/devicetree/bindings/altera_jtaguart.txt

Quoted 15 lines · Tobias Klauser

Advertise the possibility to use this driver with device tree if CONFIG_OF is set.
Signed-off-by Tobias Klauser <[email protected]>
---
.../devicetree/bindings/altera_jtaguart.txt | 4 ++++ drivers/tty/serial/altera_jtaguart.c | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 Documentation/devicetree/bindings/altera_jtaguart.txt
Documentation/devicetree/bindings/altera_jtaguart.txt new file +0 -0
new file mode 100644
index 0000000..c152f65

This should be in Documentation/devicetree/bindings/serial/altera_jtaguart.txt, but otherwise:

Acked-by Grant Likely <[email protected]>

Quoted 39 lines

Documentation/devicetree/bindings/altera_jtaguart.txt new file +4 -0

@@ -0,0 +1,4 @@
+Altera JTAG UART
+
+Required properties:
+- compatible : should be "ALTR,juart-1.0"

drivers/tty/serial/altera_jtaguart.c +13 -3

index 8f014bb..60e049b 100644
@@ -466,12 +466,23 @@ static int __devexit altera_jtaguart_remove(struct platform_device *pdev)
        return 0;
  }
 
+#ifdef CONFIG_OF
+static struct of_device_id altera_jtaguart_match[] = {
+       { .compatible = "ALTR,juart-1.0", },
+       {},
+};
+MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
+#else
+#define altera_jtaguart_match NULL
+#endif /* CONFIG_OF */
+
  static struct platform_driver altera_jtaguart_platform_driver = {
        .probe  = altera_jtaguart_probe,
        .remove = __devexit_p(altera_jtaguart_remove),
        .driver = {
-               .name   = DRV_NAME,
-               .owner  = THIS_MODULE,
+               .name           = DRV_NAME,
+               .owner          = THIS_MODULE,
+               .of_match_table = altera_jtaguart_match,
        },
  };
 
--

1.7.0.4

Signature · 6 lines

Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): c28550ba11ed228f4137ced1ab34761c08ad38ad.1297974227.git.tklauser-93Khv+1bN0NyDzI6CaY1VQ@public.gmane.org

Tobias Klauser

2011-02-18 08:10 UTC #9 lore raw

PATCH v3 5/5 tty: serial: altera_jtaguart: Add device tree support

Advertise the possibility to use this driver with device tree if CONFIG_OF is set.

Signed-off-by Tobias Klauser <[email protected]>

---
v3:
- put device tree binding documentation in the correct place (thanks Grant Likely)
v2:
- add missing semicolon after definition of altera_jtaguart_match

 .../devicetree/bindings/serial/altera_jtaguart.txt |    4 ++++
 drivers/tty/serial/altera_jtaguart.c               |   15 +++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/serial/altera_jtaguart.txt

Documentation/devicetree/bindings/serial/altera_jtaguart.txt new file +4 -0

new file mode 100644
index 0000000..c152f65
@@ -0,0 +1,4 @@
+Altera JTAG UART
+
+Required properties:
+- compatible : should be "ALTR,juart-1.0"

drivers/tty/serial/altera_jtaguart.c +13 -2

index 8f014bb..60e049b 100644
@@ -466,12 +466,23 @@ static int __devexit altera_jtaguart_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_OF
+static struct of_device_id altera_jtaguart_match[] = {
+	{ .compatible = "ALTR,juart-1.0", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
+#else
+#define altera_jtaguart_match NULL
+#endif /* CONFIG_OF */
+
 static struct platform_driver altera_jtaguart_platform_driver = {
 	.probe	= altera_jtaguart_probe,
 	.remove	= __devexit_p(altera_jtaguart_remove),
 	.driver	= {
-		.name	= DRV_NAME,
-		.owner	= THIS_MODULE,
+		.name		= DRV_NAME,
+		.owner		= THIS_MODULE,
+		.of_match_table	= altera_jtaguart_match,
 	},
 };

Signature · 1 line

1.7.0.4

Grant Likely

Applied

2011-02-28 08:26 UTC #10 lore raw

Re: [PATCH 5/5 v3] tty: serial: altera_jtaguart: Add device tree support

Quoted 4 lines · Tobias Klauser

Advertise the possibility to use this driver with device tree if CONFIG_OF is set.
Signed-off-by Tobias Klauser <[email protected]>

Applied, thanks.

Quoted 55 lines

---
v3:
- put device tree binding documentation in the correct place (thanks Grant Likely)
v2:
- add missing semicolon after definition of altera_jtaguart_match

 .../devicetree/bindings/serial/altera_jtaguart.txt |    4 ++++
 drivers/tty/serial/altera_jtaguart.c               |   15 +++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/serial/altera_jtaguart.txt

Documentation/devicetree/bindings/serial/altera_jtaguart.txt new file +4 -0

new file mode 100644
index 0000000..c152f65
@@ -0,0 +1,4 @@
+Altera JTAG UART
+
+Required properties:
+- compatible : should be "ALTR,juart-1.0"

drivers/tty/serial/altera_jtaguart.c +13 -2

index 8f014bb..60e049b 100644
@@ -466,12 +466,23 @@ static int __devexit altera_jtaguart_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_OF
+static struct of_device_id altera_jtaguart_match[] = {
+	{ .compatible = "ALTR,juart-1.0", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, altera_jtaguart_match);
+#else
+#define altera_jtaguart_match NULL
+#endif /* CONFIG_OF */
+
 static struct platform_driver altera_jtaguart_platform_driver = {
 	.probe	= altera_jtaguart_probe,
 	.remove	= __devexit_p(altera_jtaguart_remove),
 	.driver	= {
-		.name	= DRV_NAME,
-		.owner	= THIS_MODULE,
+		.name		= DRV_NAME,
+		.owner		= THIS_MODULE,
+		.of_match_table	= altera_jtaguart_match,
 	},
 };

Signature · 1 line

1.7.0.4

Greg KH

2011-02-17 22:16 UTC #11 lore raw

In reply to Tobias Klauser

Quoted 5 lines · Tobias Klauser

This patchset adds updates taken from the Nios2 Linux port (currently out-of-tree) repository to the altera_jtaguart driver.
And this time with the correct cover letter right away :-)

Quoted 8 lines

Tobias Klauser (5):
tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer
tty: serial: altera_jtaguart: Remove unused function
early_altera_jtaguart_setup
tty: serial: altera_jtaguart: Support getting mapbase and IRQ from
resources
tty: serial: altera_jtaguart: Fixup type usage of port flags
tty: serial: altera_jtaguart: Add device tree support

After this series, I get the following build error:
CC [M] drivers/tty/serial/altera_jtaguart.o drivers/tty/serial/altera_jtaguart.c:485:3: error: unknown field ‘of_match_table’ specified in initializer

So I can't take them, sorry.

Care to fix this and resend them after testing them?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Tobias Klauser

author maintainer

2011-02-18 07:23 UTC #12 lore raw

Quoted 15 lines · Greg KH

Quoted 5 lines · Tobias Klauser
This patchset adds updates taken from the Nios2 Linux port (currently out-of-tree) repository to the altera_jtaguart driver.
And this time with the correct cover letter right away :-)
Quoted 8 lines
Tobias Klauser (5):
tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer
tty: serial: altera_jtaguart: Remove unused function
early_altera_jtaguart_setup
tty: serial: altera_jtaguart: Support getting mapbase and IRQ from
resources
tty: serial: altera_jtaguart: Fixup type usage of port flags
tty: serial: altera_jtaguart: Add device tree support

Quoted 3 lines

After this series, I get the following build error:
CC [M] drivers/tty/serial/altera_jtaguart.o
drivers/tty/serial/altera_jtaguart.c:485:3: error: unknown field ???of_match_table??? specified in initializer

Strange, I didn't get that one when compile testing against linux-next on x86_64. Though it seems I didn't correctly test it on nios2 and I got a compile error about a missing semicolon in the definition of altera_jtaguart_match there.

So that might be the culprit for the above message too. I'll resend the last PATCH of the series to fix that (and of course compile-test it before).

Thanks a lot and sorry
Tobias

Thomas Chou

2011-02-18 07:30 UTC #13 lore raw

Hi Tobias,

Quoted 16 lines · Tobias Klauser

Quoted 15 lines · Greg KH
Quoted 13 lines · Tobias Klauser
This patchset adds updates taken from the Nios2 Linux port (currently out-of-tree) repository to the altera_jtaguart driver.
And this time with the correct cover letter right away :-)
Tobias Klauser (5):
tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer
tty: serial: altera_jtaguart: Remove unused function
early_altera_jtaguart_setup
tty: serial: altera_jtaguart: Support getting mapbase and IRQ from
resources
tty: serial: altera_jtaguart: Fixup type usage of port flags
tty: serial: altera_jtaguart: Add device tree support

Quoted 8 lines

Quoted 3 lines
After this series, I get the following build error:
CC [M] drivers/tty/serial/altera_jtaguart.o
drivers/tty/serial/altera_jtaguart.c:485:3: error: unknown field ???of_match_table??? specified in initializer
Strange, I didn't get that one when compile testing against linux-next on x86_64. Though it seems I didn't correctly test it on nios2 and I got a compile error about a missing semicolon in the definition of altera_jtaguart_match there.

It might be that the of_match_table patch is available in Grant's branch only, which is for v3.6.39. Maybe you can ask Grant to take this patch 5/5.

- Thomas

Tobias Klauser

author maintainer

2011-02-18 07:45 UTC #14 lore raw

Quoted 21 lines · Thomas Chou

Quoted 20 lines · Tobias Klauser
Quoted 18 lines · Greg KH
Quoted 5 lines · Tobias Klauser
This patchset adds updates taken from the Nios2 Linux port (currently out-of-tree) repository to the altera_jtaguart driver.
And this time with the correct cover letter right away :-)
Quoted 8 lines
Tobias Klauser (5):
tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer
tty: serial: altera_jtaguart: Remove unused function
early_altera_jtaguart_setup
tty: serial: altera_jtaguart: Support getting mapbase and IRQ from
resources
tty: serial: altera_jtaguart: Fixup type usage of port flags
tty: serial: altera_jtaguart: Add device tree support
After this series, I get the following build error:
CC [M] drivers/tty/serial/altera_jtaguart.o
drivers/tty/serial/altera_jtaguart.c:485:3: error: unknown field ???of_match_table??? specified in initializer

Quoted 8 lines

Quoted 4 lines
Strange, I didn't get that one when compile testing against linux-next on x86_64. Though it seems I didn't correctly test it on nios2 and I got a compile error about a missing semicolon in the definition of altera_jtaguart_match there.
It might be that the of_match_table patch is available in Grant's branch only, which is for v3.6.39. Maybe you can ask Grant to take this patch 5/5.

That explains it, thanks Thomas.

Greg, care to take only patches 1/5 to 4/5 for now? I'll resubmit 5/5 for the 2.6.39 merge window, unless Grant already wants to take this to his tree.

Grant Likely

2011-02-18 08:06 UTC #15 lore raw

Quoted 31 lines · Tobias Klauser

Quoted 21 lines · Thomas Chou
Quoted 20 lines · Tobias Klauser
Quoted 18 lines · Greg KH
Quoted 5 lines · Tobias Klauser
This patchset adds updates taken from the Nios2 Linux port (currently out-of-tree) repository to the altera_jtaguart driver.
And this time with the correct cover letter right away :-)
Quoted 8 lines
Tobias Klauser (5):
tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer
tty: serial: altera_jtaguart: Remove unused function
early_altera_jtaguart_setup
tty: serial: altera_jtaguart: Support getting mapbase and IRQ from
resources
tty: serial: altera_jtaguart: Fixup type usage of port flags
tty: serial: altera_jtaguart: Add device tree support
After this series, I get the following build error:
CC [M] drivers/tty/serial/altera_jtaguart.o
drivers/tty/serial/altera_jtaguart.c:485:3: error: unknown field ???of_match_table??? specified in initializer
Quoted 8 lines
Quoted 4 lines
Strange, I didn't get that one when compile testing against linux-next on x86_64. Though it seems I didn't correctly test it on nios2 and I got a compile error about a missing semicolon in the definition of altera_jtaguart_match there.
It might be that the of_match_table patch is available in Grant's branch only, which is for v3.6.39. Maybe you can ask Grant to take this patch 5/5.

Quoted 5 lines

That explains it, thanks Thomas.
Greg, care to take only patches 1/5 to 4/5 for now? I'll resubmit 5/5 for the 2.6.39 merge window, unless Grant already wants to take this to his tree.

I'm happy to take this patch if it doesn't depend on the first 4. Alternately Greg, you could merge commit c9e358dfc "driver-core:
remove conditionals around devicetree pointers" from my devicetree/test branch on git://git.secretlab.ca/git/linux-2.6. I won't be rebasing that commit and it is the first commit on top of 2.6.38-rc1.

Signature · 2 lines

Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Tobias Klauser

author maintainer

2011-02-18 08:11 UTC #16 lore raw

Quoted 38 lines · Grant Likely

Quoted 31 lines · Tobias Klauser
Quoted 21 lines · Thomas Chou
Quoted 20 lines · Tobias Klauser
Quoted 18 lines · Greg KH
Quoted 5 lines · Tobias Klauser
This patchset adds updates taken from the Nios2 Linux port (currently out-of-tree) repository to the altera_jtaguart driver.
And this time with the correct cover letter right away :-)
Quoted 8 lines
Tobias Klauser (5):
tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer
tty: serial: altera_jtaguart: Remove unused function
early_altera_jtaguart_setup
tty: serial: altera_jtaguart: Support getting mapbase and IRQ from
resources
tty: serial: altera_jtaguart: Fixup type usage of port flags
tty: serial: altera_jtaguart: Add device tree support
After this series, I get the following build error:
CC [M] drivers/tty/serial/altera_jtaguart.o
drivers/tty/serial/altera_jtaguart.c:485:3: error: unknown field ???of_match_table??? specified in initializer
Quoted 8 lines
Quoted 4 lines
Strange, I didn't get that one when compile testing against linux-next on x86_64. Though it seems I didn't correctly test it on nios2 and I got a compile error about a missing semicolon in the definition of altera_jtaguart_match there.
It might be that the of_match_table patch is available in Grant's branch only, which is for v3.6.39. Maybe you can ask Grant to take this patch 5/5.
Quoted 5 lines
That explains it, thanks Thomas.
Greg, care to take only patches 1/5 to 4/5 for now? I'll resubmit 5/5 for the 2.6.39 merge window, unless Grant already wants to take this to his tree.

Quoted 6 lines

I'm happy to take this patch if it doesn't depend on the first 4. Alternately Greg, you could merge commit c9e358dfc "driver-core:
remove conditionals around devicetree pointers" from my devicetree/test branch on git://git.secretlab.ca/git/linux-2.6. I won't be rebasing that commit and it is the first commit on top of 2.6.38-rc1.

The patch doesn't depend on the first 4, so you could take it if Greg doesn't oppose.

Thanks
Tobias

Grant Likely

2011-02-18 17:21 UTC #17 lore raw

Quoted 46 lines · Tobias Klauser

Quoted 38 lines · Grant Likely
Quoted 31 lines · Tobias Klauser
Quoted 21 lines · Thomas Chou
Quoted 20 lines · Tobias Klauser
Quoted 18 lines · Greg KH
Quoted 5 lines · Tobias Klauser
This patchset adds updates taken from the Nios2 Linux port (currently out-of-tree) repository to the altera_jtaguart driver.
And this time with the correct cover letter right away :-)
Quoted 8 lines
Tobias Klauser (5):
tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer
tty: serial: altera_jtaguart: Remove unused function
early_altera_jtaguart_setup
tty: serial: altera_jtaguart: Support getting mapbase and IRQ from
resources
tty: serial: altera_jtaguart: Fixup type usage of port flags
tty: serial: altera_jtaguart: Add device tree support
After this series, I get the following build error:
CC [M] drivers/tty/serial/altera_jtaguart.o
drivers/tty/serial/altera_jtaguart.c:485:3: error: unknown field ???of_match_table??? specified in initializer
Quoted 8 lines
Quoted 4 lines
Strange, I didn't get that one when compile testing against linux-next on x86_64. Though it seems I didn't correctly test it on nios2 and I got a compile error about a missing semicolon in the definition of altera_jtaguart_match there.
It might be that the of_match_table patch is available in Grant's branch only, which is for v3.6.39. Maybe you can ask Grant to take this patch 5/5.
Quoted 5 lines
That explains it, thanks Thomas.
Greg, care to take only patches 1/5 to 4/5 for now? I'll resubmit 5/5 for the 2.6.39 merge window, unless Grant already wants to take this to his tree.
Quoted 6 lines
I'm happy to take this patch if it doesn't depend on the first 4. Alternately Greg, you could merge commit c9e358dfc "driver-core:
remove conditionals around devicetree pointers" from my devicetree/test branch on git://git.secretlab.ca/git/linux-2.6. I won't be rebasing that commit and it is the first commit on top of 2.6.38-rc1.

Quoted 2 lines

The patch doesn't depend on the first 4, so you could take it if Greg doesn't oppose.

Okay, I'll merge the ones that depend on my tree and that Greg acks.

Greg KH

2011-02-18 15:26 UTC #18 lore raw

In reply to Tobias Klauser

Quoted 31 lines · Tobias Klauser

Quoted 21 lines · Thomas Chou
Quoted 20 lines · Tobias Klauser
Quoted 18 lines · Greg KH
Quoted 5 lines · Tobias Klauser
This patchset adds updates taken from the Nios2 Linux port (currently out-of-tree) repository to the altera_jtaguart driver.
And this time with the correct cover letter right away :-)
Quoted 8 lines
Tobias Klauser (5):
tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer
tty: serial: altera_jtaguart: Remove unused function
early_altera_jtaguart_setup
tty: serial: altera_jtaguart: Support getting mapbase and IRQ from
resources
tty: serial: altera_jtaguart: Fixup type usage of port flags
tty: serial: altera_jtaguart: Add device tree support
After this series, I get the following build error:
CC [M] drivers/tty/serial/altera_jtaguart.o
drivers/tty/serial/altera_jtaguart.c:485:3: error: unknown field ???of_match_table??? specified in initializer
Quoted 8 lines
Quoted 4 lines
Strange, I didn't get that one when compile testing against linux-next on x86_64. Though it seems I didn't correctly test it on nios2 and I got a compile error about a missing semicolon in the definition of altera_jtaguart_match there.
It might be that the of_match_table patch is available in Grant's branch only, which is for v3.6.39. Maybe you can ask Grant to take this patch 5/5.

Quoted 5 lines

That explains it, thanks Thomas.
Greg, care to take only patches 1/5 to 4/5 for now? I'll resubmit 5/5 for the 2.6.39 merge window, unless Grant already wants to take this to his tree.

Please resend the 1-4 patches to me and I will be glad to apply them.

thanks,

greg k-h