From patchwork Thu Dec 15 21:13:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 5789 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A29F123E18 for ; Thu, 15 Dec 2011 21:13:37 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8C76BA18914 for ; Thu, 15 Dec 2011 21:13:37 +0000 (UTC) Received: by eaak10 with SMTP id k10so2842957eaa.11 for ; Thu, 15 Dec 2011 13:13:37 -0800 (PST) Received: by 10.204.133.213 with SMTP id g21mr2397543bkt.126.1323983615470; Thu, 15 Dec 2011 13:13:35 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs53479bkc; Thu, 15 Dec 2011 13:13:34 -0800 (PST) Received: by 10.224.116.144 with SMTP id m16mr8202402qaq.19.1323983612169; Thu, 15 Dec 2011 13:13:32 -0800 (PST) Received: from mho-02-ewr.mailhop.org (mho-02-ewr.mailhop.org. [204.13.248.72]) by mx.google.com with ESMTPS id k1si5201544qap.111.2011.12.15.13.13.31 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Dec 2011 13:13:32 -0800 (PST) Received-SPF: neutral (google.com: 204.13.248.72 is neither permitted nor denied by best guess record for domain of tony@atomide.com) client-ip=204.13.248.72; Authentication-Results: mx.google.com; spf=neutral (google.com: 204.13.248.72 is neither permitted nor denied by best guess record for domain of tony@atomide.com) smtp.mail=tony@atomide.com Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1RbIcI-000Kcn-0X; Thu, 15 Dec 2011 21:13:26 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18jpaRRd1itklxkQeKJMya7 Date: Thu, 15 Dec 2011 13:13:21 -0800 From: Tony Lindgren To: "Cousson, Benoit" Cc: Rajendra Nayak , linux-serial@vger.kernel.org, linux-omap@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, khilman@ti.com, govindraj.raja@ti.com, linux-arm-kernel@lists.infradead.org, linaro-dev@lists.linaro.org, patches@linaro.org, robherring2@gmail.com Subject: Re: [PATCH v3 4/4] ARM: omap: pass minimal SoC/board data for UART from dt Message-ID: <20111215211320.GU32251@atomide.com> References: <1323863746-18145-1-git-send-email-rnayak@ti.com> <1323863746-18145-5-git-send-email-rnayak@ti.com> <20111214192509.GH32251@atomide.com> <4EE99923.4030902@ti.com> <4EE9C697.4010604@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4EE9C697.4010604@ti.com> User-Agent: Mutt/1.5.20 (2009-06-14) * Cousson, Benoit [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 [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 > >>>Signed-off-by: Rajendra Nayak > >> > >>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 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 --- /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@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@1 { + compatible = "ti,omap2-intc"; + interrupt-controller; + #interrupt-cells = <1>; + }; + + uart1: serial@0x4806a000 { + compatible = "ti,omap2-uart"; + ti,hwmods = "uart1"; + clock-frequency = <48000000>; + }; + + uart2: serial@0x4806c000 { + compatible = "ti,omap2-uart"; + ti,hwmods = "uart2"; + clock-frequency = <48000000>; + }; + + uart3: serial@0x4806e000 { + compatible = "ti,omap2-uart"; + ti,hwmods = "uart3"; + clock-frequency = <48000000>; + }; + }; +};