Subject: [PATCH v3 4/4] ARM: omap: pass minimal SoC/board data for UART from dt

From: [email-masked] (Tony Lindgren)
Date: Thu, 15 Dec 2011 13:13:21 -0800

* Cousson, Benoit <[email-masked]> [111215 01:34]:
> Hi Tony,
> 
> On 12/15/2011 7:52 AM, Rajendra Nayak wrote:
> >On Thursday 15 December 2011 12:55 AM, Tony Lindgren wrote:
> >>* Rajendra Nayak<[email-masked]> [111214 03:24]:
> >>>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-masked]>
> >>>Signed-off-by: Rajendra Nayak<[email-masked]>
> >>
> >>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.
> 
> 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-masked]>
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-masked]>

--- /dev/null
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -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 0x4806a000 {
+			compatible = "ti,omap2-uart";
+			ti,hwmods = "uart1";
+			clock-frequency = <48000000>;
+		};
+
+		uart2: serial at 0x4806c000 {
+			compatible = "ti,omap2-uart";
+			ti,hwmods = "uart2";
+			clock-frequency = <48000000>;
+		};
+
+		uart3: serial at 0x4806e000 {
+			compatible = "ti,omap2-uart";
+			ti,hwmods = "uart3";
+			clock-frequency = <48000000>;
+		};
+	};
+};