OMAP serial device tree support

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.

Acked-by Rob Herring <[email protected]>

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

Quoted 6 lines · Rajendra Nayak

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.

Acked-by Rob Herring<[email protected]>

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

This we can't merge because this breaks serial console for omap2 because you're not adding the omap2 specific dtsi entries for omap2..

arch/arm/mach-omap2/board-generic.c static void __init omap_generic_init(void) · line 74

Quoted 11 lines

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

@@ -69,7 +69,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);

..and you're removing the call for omap_serial_init.

Please just update this patch with the omap2 entries as well. Other than that looks good to me.

Tony

Quoted 11 lines · Tony Lindgren

Quoted 6 lines · Rajendra Nayak

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.

Acked-by Rob Herring<[email protected]>

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

This we can't merge because this breaks serial console for omap2 because you're not adding the omap2 specific dtsi entries for omap2..

But we never had omap2 working with DT, because we never added a .dtsi file for omap2 or a .dts file for any omap2 board variants.

Until now the DT support on OMAP has been limited to OMAP3 and OMAP4 with boards limited to omap3beagle/omap4Panda and omap4sdp.

So when we do add base support for omap2, we could update those with the serial entries.

Hi Tony,

Quoted 13 lines · Rajendra Nayak

Quoted 11 lines · Tony Lindgren

Quoted 6 lines · Rajendra Nayak

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.

Acked-by Rob Herring<[email protected]>

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

This we can't merge because this breaks serial console for omap2 because you're not adding the omap2 specific dtsi entries for omap2..

Quoted 8 lines

But we never had omap2 working with DT, because we never added a .dtsi file for omap2 or a .dts file for any omap2 board variants.

Until now the DT support on OMAP has been limited to OMAP3 and OMAP4 with boards limited to omap3beagle/omap4Panda and omap4sdp.

So when we do add base support for omap2, we could update those with the serial entries.

I'm quite confused as well... Have you tried the current 3.2 kernel on an OMAP2 board?

So far I've been taking care of keeping the OMAP2 support into the board-generic.c file, but I've never added any omap2.dtsi or omap2-board.dts file to support it.

Quoted 25 lines · Cousson, Benoit

Hi Tony,

Quoted 21 lines · Rajendra Nayak

Quoted 11 lines · Tony Lindgren

Quoted 6 lines · Rajendra Nayak

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.

Acked-by Rob Herring<[email protected]>

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

This we can't merge because this breaks serial console for omap2 because you're not adding the omap2 specific dtsi entries for omap2..

But we never had omap2 working with DT, because we never added a .dtsi file for omap2 or a .dts file for any omap2 board variants.

Until now the DT support on OMAP has been limited to OMAP3 and OMAP4 with boards limited to omap3beagle/omap4Panda and omap4sdp.

So when we do add base support for omap2, we could update those with the serial entries.

Quoted 6 lines

I'm quite confused as well... Have you tried the current 3.2 kernel on an OMAP2 board?

So far I've been taking care of keeping the OMAP2 support into the board-generic.c file, but I've never added any omap2.dtsi or omap2-board.dts file to support it.

Yeah adding it is trivial, so let's just add it :)

How about we just add the following patch before the last patch in this series?

I don't have iva there as that's different between 2420 and 2430. But omap2.dtsi can be included later on into omap2420.dtsi and omap2430.dtsi.

Regards,

Tony

From: Tony Lindgren<[email protected]>
Date: Thu, 15 Dec 2011 12:48:43 -0800
Subject: [PATCH] arm/dts: Add minimal device tree support for omap2420 and omap2430

Add minimal device tree support for omap2420 and omap2430

Signed-off-by Tony Lindgren<[email protected]>

arch/arm/boot/dts/omap2.dtsi new file +39 -0

@@ -0,0 +1,67 @@
+/*
+ * Device Tree Source for OMAP2 SoC
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+	compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";
+
+	aliases {
+		serial0 =&uart1;
+		serial1 =&uart2;
+		serial2 =&uart3;
+	};
+
+	cpus {
+		cpu at 0 {
+			compatible = "arm,arm1136jf-s";
+		};
+	};
+
+	soc {
+		compatible = "ti,omap-infra";
+		mpu {
+			compatible = "ti,omap2-mpu";
+			ti,hwmods = "mpu";
+		};
+	};
+
+	ocp {
+		compatible = "simple-bus";
+		#address-cells =<1>;
+		#size-cells =<1>;

Nit: The convention is without the 0x prefix.

Beside that, that looks good top me. But I'll not be able to try it :-)

Add minimal device tree support for omap2420 and omap2430

Signed-off-by Tony Lindgren<[email protected]>

arch/arm/boot/dts/omap2.dtsi new file +67 -0

@@ -0,0 +1,67 @@
+/*
+ * Device Tree Source for OMAP2 SoC
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+	compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";
+
+	aliases {
+		serial0 =&uart1;
+		serial1 =&uart2;
+		serial2 =&uart3;
+	};
+
+	cpus {
+		cpu at 0 {
+			compatible = "arm,arm1136jf-s";
+		};
+	};
+
+	soc {
+		compatible = "ti,omap-infra";
+		mpu {
+			compatible = "ti,omap2-mpu";
+			ti,hwmods = "mpu";
+		};
+	};
+
+	ocp {
+		compatible = "simple-bus";
+		#address-cells =<1>;
+		#size-cells =<1>;
+		ranges;
+		ti,hwmods = "l3_main";
+
+		intc: interrupt-controller at 1 {
+			compatible = "ti,omap2-intc";
+			interrupt-controller;
+			#interrupt-cells =<1>;
+		};
+
+		uart1: serial at 4806a000 {
+			compatible = "ti,omap2-uart";
+			ti,hwmods = "uart1";
+			clock-frequency =<48000000>;
+		};
+
+		uart2: serial at 4806c000 {
+			compatible = "ti,omap2-uart";
+			ti,hwmods = "uart2";
+			clock-frequency =<48000000>;
+		};
+
+		uart3: serial at 4806e000 {
+			compatible = "ti,omap2-uart";
+			ti,hwmods = "uart3";
+			clock-frequency =<48000000>;
+		};
+	};
+};

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.

Acked-by Rob Herring<[email protected]>

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 +7 -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";

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.

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

index 63b5416..a508ed5 100644
@@ -69,7 +69,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);
--

1.7.1

Hi,

Quoted 3 lines · Rajendra Nayak

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.

...

Quoted 13 lines

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

index 63b5416..a508ed5 100644
@@ -69,7 +69,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);
--

Quoted 1 line

1.7.1

I'm fairly new to DT and I'm trying to boot it with pandaboard and k3.3, however above hunk deletes omap serial initialization, which causes a panic on boot, because pdata is NULL:

static void serial_omap_start_tx(struct uart_port *port) {
...

                 if (pdata->set_noidle)

Perhaps because this change skips the following path:

omap_serial_init->omap_serial_board_init->omap_serial_init_port

Where pdata is built in omap_device_build.

I'm just trying to confirm that I'm not alone or doing some silly thing before getting in depth with the code.

Yes, it is a known issue and the fix was unfortunately was not merged during -rc phases but is fixed in 3.4 and should be fixed in 3.3 stable branch as well. I received the notification from Greg KH 2 weeks ago about the stable:
Patch "tty: serial: OMAP: Fix oops due to NULL pdata in DT boot" has been added to the 3.3-stable tree

You should just switch to 3.4-rc2 or get the patch if you are stuck to 3.3.

v3 is rebased on top of the latest serial runtime patches[1] and boot tested with/without DT on OMAP4 SDP and OMAP4 Panda boards.

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

I also had to pull in a fix[2] for DT testing (already in linux-omap master) which was missing as the serial runtime branch[1] was based on an older master commit.

Changes in v3:
-1- Rebased on latest serial runtime patches
-2- Minor typr fixes

Changes in v2:
-1- Got rid of binding to define which uart is console -2- Added checks to default clock speed to 48Mhz -3- Added compatible for each OMAP family
-4- Used of_alias_get_id to populate port.line

[1] git://gitorious.org/runtime_3-0/runtime_3-0.git for_3_3/lo_rc4_uartruntime
[2] http://www.spinics.net/lists/arm-kernel/msg150751.html

Rajendra Nayak (4):
omap-serial: Get rid of all pdev->id usage
omap-serial: Use default clock speed (48Mhz) if not specified
omap-serial: Add minimal device tree support
ARM: omap: pass minimal SoC/board data for UART from dt

 .../devicetree/bindings/serial/omap_serial.txt     |   10 +++
 arch/arm/boot/dts/omap3.dtsi                       |   31 ++++++++
 arch/arm/boot/dts/omap4.dtsi                       |   28 +++++++
 arch/arm/mach-omap2/board-generic.c                |    1 -
 drivers/tty/serial/omap-serial.c                   |   80 +++++++++++++++----
 5 files changed, 132 insertions(+), 18 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/serial/omap_serial.txt

Quoted 30 lines · Rajendra Nayak

v3 is rebased on top of the latest serial runtime patches[1] and boot tested with/without DT on OMAP4 SDP and OMAP4 Panda boards.

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

I also had to pull in a fix[2] for DT testing (already in linux-omap master) which was missing as the serial runtime branch[1] was based on an older master commit.

Changes in v3:
-1- Rebased on latest serial runtime patches
-2- Minor typr fixes

Changes in v2:
-1- Got rid of binding to define which uart is console -2- Added checks to default clock speed to 48Mhz -3- Added compatible for each OMAP family
-4- Used of_alias_get_id to populate port.line

[1] git://gitorious.org/runtime_3-0/runtime_3-0.git for_3_3/lo_rc4_uartruntime
[2] http://www.spinics.net/lists/arm-kernel/msg150751.html

Rajendra Nayak (4):
omap-serial: Get rid of all pdev->id usage
omap-serial: Use default clock speed (48Mhz) if not specified
omap-serial: Add minimal device tree support
ARM: omap: pass minimal SoC/board data for UART from dt

Quoted 7 lines

 .../devicetree/bindings/serial/omap_serial.txt     |   10 +++
 arch/arm/boot/dts/omap3.dtsi                       |   31 ++++++++
 arch/arm/boot/dts/omap4.dtsi                       |   28 +++++++
 arch/arm/mach-omap2/board-generic.c                |    1 -
 drivers/tty/serial/omap-serial.c                   |   80 +++++++++++++++----
 5 files changed, 132 insertions(+), 18 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/serial/omap_serial.txt

Looks good. For the series:

Reviewed-by Rob Herring <[email protected]>

Rob,

Quoted 39 lines · Rob Herring

Quoted 37 lines · Rajendra Nayak

v3 is rebased on top of the latest serial runtime patches[1] and boot tested with/without DT on OMAP4 SDP and OMAP4 Panda boards.

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

I also had to pull in a fix[2] for DT testing (already in linux-omap master) which was missing as the serial runtime branch[1] was based on an older master commit.

Changes in v3:
-1- Rebased on latest serial runtime patches
-2- Minor typr fixes

Changes in v2:
-1- Got rid of binding to define which uart is console -2- Added checks to default clock speed to 48Mhz -3- Added compatible for each OMAP family
-4- Used of_alias_get_id to populate port.line

[1] git://gitorious.org/runtime_3-0/runtime_3-0.git for_3_3/lo_rc4_uartruntime
[2] http://www.spinics.net/lists/arm-kernel/msg150751.html

Rajendra Nayak (4):
omap-serial: Get rid of all pdev->id usage
omap-serial: Use default clock speed (48Mhz) if not specified
omap-serial: Add minimal device tree support
ARM: omap: pass minimal SoC/board data for UART from dt

 .../devicetree/bindings/serial/omap_serial.txt     |   10 +++
 arch/arm/boot/dts/omap3.dtsi                       |   31 ++++++++
 arch/arm/boot/dts/omap4.dtsi                       |   28 +++++++
 arch/arm/mach-omap2/board-generic.c                |    1 -
 drivers/tty/serial/omap-serial.c                   |   80 +++++++++++++++----
 5 files changed, 132 insertions(+), 18 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/serial/omap_serial.txt

Quoted 3 lines

Looks good. For the series:

Reviewed-by Rob Herring <[email protected]>

Care to check if your Reviewed-by can also be applied to the additional patch "[PATCH] arm/dts: Add minimal device tree support for omap2420 and omap2430" that's needed to keep serial port working for omap2 with this series?

Tony,

Quoted 44 lines · Tony Lindgren

Rob,

Quoted 41 lines · Rob Herring

Quoted 30 lines · Rajendra Nayak

v3 is rebased on top of the latest serial runtime patches[1] and boot tested with/without DT on OMAP4 SDP and OMAP4 Panda boards.

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

I also had to pull in a fix[2] for DT testing (already in linux-omap master) which was missing as the serial runtime branch[1] was based on an older master commit.

Changes in v3:
-1- Rebased on latest serial runtime patches
-2- Minor typr fixes

Changes in v2:
-1- Got rid of binding to define which uart is console -2- Added checks to default clock speed to 48Mhz -3- Added compatible for each OMAP family
-4- Used of_alias_get_id to populate port.line

[1] git://gitorious.org/runtime_3-0/runtime_3-0.git for_3_3/lo_rc4_uartruntime
[2] http://www.spinics.net/lists/arm-kernel/msg150751.html

Rajendra Nayak (4):
omap-serial: Get rid of all pdev->id usage
omap-serial: Use default clock speed (48Mhz) if not specified
omap-serial: Add minimal device tree support
ARM: omap: pass minimal SoC/board data for UART from dt

Quoted 7 lines

 .../devicetree/bindings/serial/omap_serial.txt     |   10 +++
 arch/arm/boot/dts/omap3.dtsi                       |   31 ++++++++
 arch/arm/boot/dts/omap4.dtsi                       |   28 +++++++
 arch/arm/mach-omap2/board-generic.c                |    1 -
 drivers/tty/serial/omap-serial.c                   |   80 +++++++++++++++----
 5 files changed, 132 insertions(+), 18 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/serial/omap_serial.txt

Looks good. For the series:

Quoted 6 lines

Quoted 1 line

Reviewed-by Rob Herring <[email protected]>

Care to check if your Reviewed-by can also be applied to the additional patch "[PATCH] arm/dts: Add minimal device tree support for omap2420 and omap2430" that's needed to keep serial port working for omap2 with this series?

It looks fine.

v3 is rebased on top of the latest serial runtime patches[1] and boot tested with/without DT on OMAP4 SDP and OMAP4 Panda boards.

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

I also had to pull in a fix[2] for DT testing (already in linux-omap master) which was missing as the serial runtime branch[1] was based on an older master commit.

Changes in v3:
-1- Rebased on latest serial runtime patches
-2- Minor typr fixes

Changes in v2:
-1- Got rid of binding to define which uart is console -2- Added checks to default clock speed to 48Mhz -3- Added compatible for each OMAP family
-4- Used of_alias_get_id to populate port.line

[1] git://gitorious.org/runtime_3-0/runtime_3-0.git for_3_3/lo_rc4_uartruntime
[2] http://www.spinics.net/lists/arm-kernel/msg150751.html

v3 is rebased on top of the latest serial runtime patches[1] and boot tested with/without DT on OMAP4 SDP and OMAP4 Panda boards.

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

I also had to pull in a fix[2] for DT testing (already in linux-omap master) which was missing as the serial runtime branch[1] was based on an older master commit.

Changes in v3:
-1- Rebased on latest serial runtime patches
-2- Minor typr fixes

Changes in v2:
-1- Got rid of binding to define which uart is console -2- Added checks to default clock speed to 48Mhz -3- Added compatible for each OMAP family
-4- Used of_alias_get_id to populate port.line

[1] git://gitorious.org/runtime_3-0/runtime_3-0.git for_3_3/lo_rc4_uartruntime
[2] http://www.spinics.net/lists/arm-kernel/msg150751.html

Rajendra Nayak (4):
omap-serial: Get rid of all pdev->id usage
omap-serial: Use default clock speed (48Mhz) if not specified
omap-serial: Add minimal device tree support
ARM: omap: pass minimal SoC/board data for UART from dt

 .../devicetree/bindings/serial/omap_serial.txt     |   10 +++
 arch/arm/boot/dts/omap3.dtsi                       |   31 ++++++++
 arch/arm/boot/dts/omap4.dtsi                       |   28 +++++++
 arch/arm/mach-omap2/board-generic.c                |    1 -
 drivers/tty/serial/omap-serial.c                   |   80 +++++++++++++++----
 5 files changed, 132 insertions(+), 18 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/serial/omap_serial.txt

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Greg, Alan,

Quoted 3 lines · Rajendra Nayak

v3 is rebased on top of the latest serial runtime patches[1] and boot tested with/without DT on OMAP4 SDP and OMAP4 Panda boards.

With your ack on the drivers/tty/* stuff, I can queue this via the OMAP tree on top of the runtime PM conversion that it depends on.

Quoted 4 lines · On Wed, 14 Dec 2011 07:20:13 -0800 Kevin Hilman <[email protected]> wrote:

Greg, Alan,

Rajendra Nayak <[email protected]> writes:

Quoted 6 lines

Quoted 3 lines

v3 is rebased on top of the latest serial runtime patches[1] and boot tested with/without DT on OMAP4 SDP and OMAP4 Panda boards.

With your ack on the drivers/tty/* stuff, I can queue this via the OMAP tree on top of the runtime PM conversion that it depends on.

Go for it

Quoted 11 lines · Alan Cox

Quoted 8 lines · On Wed, 14 Dec 2011 07:20:13 -0800 Kevin Hilman <[email protected]> wrote:

Greg, Alan,

Quoted 3 lines · Rajendra Nayak

v3 is rebased on top of the latest serial runtime patches[1] and boot tested with/without DT on OMAP4 SDP and OMAP4 Panda boards.

Quoted 4 lines

Quoted 2 lines

With your ack on the drivers/tty/* stuff, I can queue this via the OMAP tree on top of the runtime PM conversion that it depends on.

Go for it

Fine with me as well.