OMAP serial device tree support

Adapt the driver to device tree and pass minimal platform data from device tree needed for console boot. No power management features will be suppported for now since it requires more tweaks around OCP settings to toggle forceidle/noidle/smaridle bits and handling

remote wakeup and dynamic muxing.

Signed-off-by Rajendra Nayak <[email protected]>

---
 .../devicetree/bindings/serial/omap_serial.txt     |   10 ++++
 drivers/tty/serial/omap-serial.c                   |   45 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/serial/omap_serial.txt

Documentation/devicetree/bindings/serial/omap_serial.txt new file +10 -0

new file mode 100644
index 0000000..342eedd
@@ -0,0 +1,10 @@
+OMAP UART controller
+
+Required properties:
+- compatible : should be "ti,omap2-uart" for OMAP2 controllers
+- compatible : should be "ti,omap3-uart" for OMAP3 controllers
+- compatible : should be "ti,omap4-uart" for OMAP4 controllers
+- ti,hwmods : Must be "uart<n>", n being the instance number (1-based)
+
+Optional properties:
+- clock-frequency : frequency of the clock input to the UART

drivers/tty/serial/omap-serial.c +42 -3

index f14b9c5..5aa524e 100644
@@ -38,6 +38,7 @@
 #include <linux/serial_core.h>
 #include <linux/irq.h>
 #include <linux/pm_runtime.h>
+#include <linux/of.h>
 
 #include <plat/dma.h>
 #include <plat/dmtimer.h>

@@ -1324,6 +1325,19 @@ static void uart_tx_dma_callback(int lch, u16 ch_status, void *data)
 	return;
 }
 
+static struct omap_uart_port_info *of_get_uart_port_info(struct device *dev)
+{
+	struct omap_uart_port_info *omap_up_info;
+
+	omap_up_info = devm_kzalloc(dev, sizeof(*omap_up_info), GFP_KERNEL);
+	if (!omap_up_info)
+		return NULL; /* out of memory */
+
+	of_property_read_u32(dev->of_node, "clock-frequency",
+					 &omap_up_info->uartclk);
+	return omap_up_info;
+}
+
 static int serial_omap_probe(struct platform_device *pdev)
 {
 	struct uart_omap_port	*up;

@@ -1331,6 +1345,9 @@ static int serial_omap_probe(struct platform_device *pdev)
 	struct omap_uart_port_info *omap_up_info = pdev->dev.platform_data;
 	int ret = -ENOSPC;
 
+	if (pdev->dev.of_node)
+		omap_up_info = of_get_uart_port_info(&pdev->dev);
+
 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!mem) {
 		dev_err(&pdev->dev, "no mem resource?\n");

@@ -1375,9 +1392,20 @@ static int serial_omap_probe(struct platform_device *pdev)
 	up->port.regshift = 2;
 	up->port.fifosize = 64;
 	up->port.ops = &serial_omap_pops;
-	up->port.line = pdev->id;
-	sprintf(up->name, "OMAP UART%d", up->port.line);
 
+	if (pdev->dev.of_node)
+		up->port.line = of_alias_get_id(pdev->dev.of_node, "serial");
+	else
+		up->port.line = pdev->id;
+
+	if (up->port.line < 0) {
+		dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n",
+								up->port.line);
+		ret = -ENODEV;
+		goto err;
+	}
+
+	sprintf(up->name, "OMAP UART%d", up->port.line);
 	up->port.mapbase = mem->start;
 	up->port.membase = ioremap(mem->start, resource_size(mem));
 	if (!up->port.membase) {

@@ -1530,7 +1558,7 @@ static int serial_omap_runtime_suspend(struct device *dev)
 	if (!up)
 		return -EINVAL;
 
-	if (!pdata->enable_wakeup)
+	if (!pdata || !pdata->enable_wakeup)
 		return 0;
 
 	if (pdata->get_context_loss_count)

@@ -1591,12 +1619,23 @@ static const struct dev_pm_ops serial_omap_dev_pm_ops = {
 				serial_omap_runtime_resume, NULL)
 };
 
+#if defined(CONFIG_OF)
+static const struct of_device_id omap_serial_of_match[] = {
+	{ .compatible = "ti,omap2-uart" },
+	{ .compatible = "ti,omap3-uart" },
+	{ .compatible = "ti,omap4-uart" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, omap_serial_of_match);
+#endif
+
 static struct platform_driver serial_omap_driver = {
 	.probe          = serial_omap_probe,
 	.remove         = serial_omap_remove,
 	.driver		= {
 		.name	= DRIVER_NAME,
 		.pm	= &serial_omap_dev_pm_ops,
+		.of_match_table = of_match_ptr(omap_serial_of_match),
 	},
 };
 

Quoted 5 lines · Rajendra Nayak

Adapt the driver to device tree and pass minimal platform data from device tree needed for console boot. No power management features will be suppported for now since it requires more tweaks around OCP settings to toggle forceidle/noidle/smaridle bits and handling

typo: smartidle

Quoted 3 lines

remote wakeup and dynamic muxing.

Signed-off-by Rajendra Nayak<[email protected]>

Acked-by Rob Herring<[email protected]>

Rob

Quoted 120 lines

---
  .../devicetree/bindings/serial/omap_serial.txt     |   10 ++++
  drivers/tty/serial/omap-serial.c                   |   45 ++++++++++++++++++-
  2 files changed, 52 insertions(+), 3 deletions(-)

create mode 100644 Documentation/devicetree/bindings/serial/omap_serial.txt

Documentation/devicetree/bindings/serial/omap_serial.txt new file +10 -0

new file mode 100644
index 0000000..342eedd
@@ -0,0 +1,10 @@
+OMAP UART controller
+
+Required properties:
+- compatible : should be "ti,omap2-uart" for OMAP2 controllers
+- compatible : should be "ti,omap3-uart" for OMAP3 controllers
+- compatible : should be "ti,omap4-uart" for OMAP4 controllers
+- ti,hwmods : Must be "uart<n>", n being the instance number (1-based)
+
+Optional properties:
+- clock-frequency : frequency of the clock input to the UART

drivers/tty/serial/omap-serial.c +42 -3

index f14b9c5..5aa524e 100644
@@ -38,6 +38,7 @@
  #include<linux/serial_core.h>
  #include<linux/irq.h>
  #include<linux/pm_runtime.h>
+#include<linux/of.h>
 
  #include<plat/dma.h>
  #include<plat/dmtimer.h>

@@ -1324,6 +1325,19 @@ static void uart_tx_dma_callback(int lch, u16 ch_status, void *data)
  	return;
  }
 
+static struct omap_uart_port_info *of_get_uart_port_info(struct device *dev)
+{
+	struct omap_uart_port_info *omap_up_info;
+
+	omap_up_info = devm_kzalloc(dev, sizeof(*omap_up_info), GFP_KERNEL);
+	if (!omap_up_info)
+		return NULL; /* out of memory */
+
+	of_property_read_u32(dev->of_node, "clock-frequency",
+					&omap_up_info->uartclk);
+	return omap_up_info;
+}
+
  static int serial_omap_probe(struct platform_device *pdev)
  {
  	struct uart_omap_port	*up;

@@ -1331,6 +1345,9 @@ static int serial_omap_probe(struct platform_device *pdev)
  	struct omap_uart_port_info *omap_up_info = pdev->dev.platform_data;
  	int ret = -ENOSPC;
 
+	if (pdev->dev.of_node)
+		omap_up_info = of_get_uart_port_info(&pdev->dev);
+
  	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	if (!mem) {
  		dev_err(&pdev->dev, "no mem resource?\n");

@@ -1375,9 +1392,20 @@ static int serial_omap_probe(struct platform_device *pdev)
  	up->port.regshift = 2;
  	up->port.fifosize = 64;
  	up->port.ops =&serial_omap_pops;
-	up->port.line = pdev->id;
-	sprintf(up->name, "OMAP UART%d", up->port.line);
 
+	if (pdev->dev.of_node)
+		up->port.line = of_alias_get_id(pdev->dev.of_node, "serial");
+	else
+		up->port.line = pdev->id;
+
+	if (up->port.line<  0) {
+		dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n",
+								up->port.line);
+		ret = -ENODEV;
+		goto err;
+	}
+
+	sprintf(up->name, "OMAP UART%d", up->port.line);
  	up->port.mapbase = mem->start;
  	up->port.membase = ioremap(mem->start, resource_size(mem));
  	if (!up->port.membase) {

@@ -1530,7 +1558,7 @@ static int serial_omap_runtime_suspend(struct device *dev)
  	if (!up)
  		return -EINVAL;
 
-	if (!pdata->enable_wakeup)
+	if (!pdata || !pdata->enable_wakeup)
  		return 0;
 
  	if (pdata->get_context_loss_count)

@@ -1591,12 +1619,23 @@ static const struct dev_pm_ops serial_omap_dev_pm_ops = {
  				serial_omap_runtime_resume, NULL)
  };
 
+#if defined(CONFIG_OF)
+static const struct of_device_id omap_serial_of_match[] = {
+	{ .compatible = "ti,omap2-uart" },
+	{ .compatible = "ti,omap3-uart" },
+	{ .compatible = "ti,omap4-uart" },
+	{},
+};
+MODULE_DEVICE_TABLE(of, omap_serial_of_match);
+#endif
+
  static struct platform_driver serial_omap_driver = {
  	.probe          = serial_omap_probe,
  	.remove         = serial_omap_remove,
  	.driver		= {
  		.name	= DRIVER_NAME,
  		.pm	=&serial_omap_dev_pm_ops,
+		.of_match_table = of_match_ptr(omap_serial_of_match),
  	},
  };
 

Pass minimal data needed for console boot, from dt, for OMAP4 panda/sdp and OMAP3 beagle boards, and get rid of the static initialization from generic board file.

Signed-off-by Rajendra Nayak <[email protected]>

---
 arch/arm/boot/dts/omap3.dtsi        |   31 +++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap4.dtsi        |   28 ++++++++++++++++++++++++++++
 arch/arm/mach-omap2/board-generic.c |    1 -
 3 files changed, 59 insertions(+), 1 deletions(-)

arch/arm/boot/dts/omap3.dtsi +31 -0

index d202bb5..216c331 100644
@@ -13,6 +13,13 @@
 / {
 	compatible = "ti,omap3430", "ti,omap3";
 
+	aliases {
+		serial0 = &uart1;
+		serial1 = &uart2;
+		serial2 = &uart3;
+		serial3 = &uart4;
+	};
+
 	cpus {
 		cpu at 0 {
 			compatible = "arm,cortex-a8";

@@ -59,5 +66,29 @@
 			interrupt-controller;
 			#interrupt-cells = <1>;
 		};
+
+		uart1: serial at 0x4806a000 {
+			compatible = "ti,omap3-uart";
+			ti,hwmods = "uart1";
+			clock-frequency = <48000000>;
+		};
+
+		uart2: serial at 0x4806c000 {
+			compatible = "ti,omap3-uart";
+			ti,hwmods = "uart2";
+			clock-frequency = <48000000>;
+		};
+
+		uart3: serial at 0x49020000 {
+			compatible = "ti,omap3-uart";
+			ti,hwmods = "uart3";
+			clock-frequency = <48000000>;
+		};
+
+		uart4: serial at 0x49042000 {
+			compatible = "ti,omap3-uart";
+			ti,hwmods = "uart4";
+			clock-frequency = <48000000>;
+		};
 	};
 };

arch/arm/boot/dts/omap4.dtsi +28 -0

index 4c61c82..e8fe75f 100644
@@ -21,6 +21,10 @@
 	interrupt-parent = <&gic>;
 
 	aliases {
+		serial0 = &uart1;
+		serial1 = &uart2;
+		serial2 = &uart3;
+		serial3 = &uart4;
 	};
 
 	cpus {

@@ -99,5 +103,29 @@
 			reg = <0x48241000 0x1000>,
 			      <0x48240100 0x0100>;
 		};
+
+		uart1: serial at 0x4806a000 {
+			compatible = "ti,omap4-uart";
+			ti,hwmods = "uart1";
+			clock-frequency = <48000000>;
+		};
+
+		uart2: serial at 0x4806c000 {
+			compatible = "ti,omap4-uart";
+			ti,hwmods = "uart2";
+			clock-frequency = <48000000>;
+		};
+
+		uart3: serial at 0x48020000 {
+			compatible = "ti,omap4-uart";
+			ti,hwmods = "uart3";
+			clock-frequency = <48000000>;
+		};
+
+		uart4: serial at 0x4806e000 {
+			compatible = "ti,omap4-uart";
+			ti,hwmods = "uart4";
+			clock-frequency = <48000000>;
+		};
 	};
 };

arch/arm/mach-omap2/board-generic.c +0 -1

index fb55fa3..bb72809 100644
@@ -70,7 +70,6 @@ static void __init omap_generic_init(void)
 	if (node)
 		irq_domain_add_simple(node, 0);
 
-	omap_serial_init();
 	omap_sdrc_init(NULL, NULL);
 
 	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);

v2 is based on the latest omap-serial runtime patches, which can be found here[1]

The series passes minimal data that allows serial console boot, with UART's initialised from device tree. However some of low power support for UART and remote wakeup needs more work.
Boot tested on OMAP4 panda and OMAP4 sdp boards.

Patches can be found here..
git://gitorious.org/omap-pm/linux.git for-dt/serial

Quoted 9 lines · Rajendra Nayak

v2 is based on the latest omap-serial runtime patches, which can be found here[1]

The series passes minimal data that allows serial console boot, with UART's initialised from device tree. However some of low power support for UART and remote wakeup needs more work.
Boot tested on OMAP4 panda and OMAP4 sdp boards.

Quoted 2 lines

Patches can be found here..
git://gitorious.org/omap-pm/linux.git for-dt/serial

What tree are these going to go through, some device tree one, or do you want me to take the serial driver patches?

thanks,

greg k-h

Quoted 10 lines · Greg KH

Quoted 9 lines · Rajendra Nayak

v2 is based on the latest omap-serial runtime patches, which can be found here[1]

The series passes minimal data that allows serial console boot, with UART's initialised from device tree. However some of low power support for UART and remote wakeup needs more work.
Boot tested on OMAP4 panda and OMAP4 sdp boards.

Quoted 5 lines

Quoted 2 lines

Patches can be found here..
git://gitorious.org/omap-pm/linux.git for-dt/serial

What tree are these going to go through, some device tree one, or do you want me to take the serial driver patches?

Hi Greg,

These patches have a dependency on the omap-serial runtime series. So once that makes it in, through the serial driver tree, and once we have the necessary Acks from the Device Tree maintainers on the relevant patches from this series, these could go through the serial driver tree as well.

Quoted 19 lines · Rajendra Nayak

Quoted 10 lines · Greg KH

Quoted 9 lines · Rajendra Nayak

v2 is based on the latest omap-serial runtime patches, which can be found here[1]

The series passes minimal data that allows serial console boot, with UART's initialised from device tree. However some of low power support for UART and remote wakeup needs more work.
Boot tested on OMAP4 panda and OMAP4 sdp boards.

Quoted 5 lines

Quoted 2 lines

Patches can be found here..
git://gitorious.org/omap-pm/linux.git for-dt/serial

What tree are these going to go through, some device tree one, or do you want me to take the serial driver patches?

Hi Greg,

Quoted 5 lines

These patches have a dependency on the omap-serial runtime series. So once that makes it in, through the serial driver tree, and once we have the necessary Acks from the Device Tree maintainers on the relevant patches from this series, these could go through the serial driver tree as well.

Then all of these should probably go through the device tree tree.