From patchwork Sat Aug 10 11:09:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 2842405 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 99506BF546 for ; Sat, 10 Aug 2013 11:10:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5F9C820181 for ; Sat, 10 Aug 2013 11:10:37 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2E0A82017E for ; Sat, 10 Aug 2013 11:10:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8745-0006CV-GG; Sat, 10 Aug 2013 11:10:33 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V8743-0003zp-9Y; Sat, 10 Aug 2013 11:10:31 +0000 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V873z-0003zU-Qa for linux-arm-kernel@lists.infradead.org; Sat, 10 Aug 2013 11:10:29 +0000 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 4648C8153F; Sat, 10 Aug 2013 13:10:04 +0200 (CEST) Date: Sat, 10 Aug 2013 13:09:56 +0200 From: Pavel Machek To: Aaro Koskinen , olof@lixom.net, arnd@arndb.de, Andrew Morton Subject: Re: [PATCH v2] N900: add device tree Message-ID: <20130810110955.GA11437@amd.pavel.ucw.cz> References: <20130614212816.GA31768@atrey.karlin.mff.cuni.cz> <20130617111031.GQ20992@atomide.com> <20130701211753.GC15318@amd.pavel.ucw.cz> <20130704171939.GA27374@blackmetal.musicnaut.iki.fi> <20130704202145.GB10752@amd.pavel.ucw.cz> <20130704203256.GB27374@blackmetal.musicnaut.iki.fi> <20130713121709.GC16473@amd.pavel.ucw.cz> <20130714222819.GB3296@blackmetal.musicnaut.iki.fi> <20130728134409.GB5382@amd.pavel.ucw.cz> <20130801234355.GA15611@amd.pavel.ucw.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130801234355.GA15611@amd.pavel.ucw.cz> User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130810_071028_096365_F9F0382B X-CRM114-Status: GOOD ( 24.83 ) X-Spam-Score: -0.1 (/) Cc: trivial@kernel.org, b-cousson@ti.com, Tony Lindgren , kernel list , pali.rohar@gmail.com, linux-omap@vger.kernel.org, linux-arm-kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri 2013-08-02 01:43:55, Pavel Machek wrote: > On Sun 2013-07-28 15:44:09, Pavel Machek wrote: > > On Mon 2013-07-15 01:28:19, Aaro Koskinen wrote: > > > Hi, > > > > > > On Sat, Jul 13, 2013 at 02:17:09PM +0200, Pavel Machek wrote: > > > > > > > > This adds device tree with neccessary support to boot with functional > > > > video (on both emulator and real N900 device). > > > > > > > > Signed-off-by: Pavel Machek > > > > > > You can also add: > > > > > > Signed-off-by: Aaro Koskinen > > > > Benoit, could you apply this? Tony said you are doing dts changes, and > > the patch seems to be ready. > > Tony, Benoit was apparently abducted by aliens or something. Is there > chance you could take the patch? Hello, is there anybody out there? There's nice and simple patch enabling device tree on n900, it is even reviewed by Aaro, and it is neither applied nor are negative comments coming? ...for a month...? Tony also seen the patch and comment was "Benoit takes these", so I assume it looks basically ok. Benoit, you are supposed to maintain device tree for omap2. [I wonder if this is clean-enough cause for "trivial in resubmit mode?] Pavel --- This adds device tree with neccessary support to boot with functional video (on both emulator and real N900 device). Signed-off-by: Pavel Machek Signed-off-by: Aaro Koskinen --- From v1: Aaro wants just GPLv2, so I did that. I re-enabled parts that can be enabled on 3.10, and tested it on that kernel. diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f0895c5..1950aed 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -141,6 +141,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap3-devkit8000.dtb \ omap3-beagle-xm.dtb \ omap3-evm.dtb \ + omap3-n900.dtb \ omap3-tobi.dtb \ omap3-igep0020.dtb \ omap3-igep0030.dtb \ diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts new file mode 100644 index 0000000..fb461bf --- /dev/null +++ b/arch/arm/boot/dts/omap3-n900.dts @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2013 Pavel Machek + * Copyright 2013 Aaro Koskinen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/dts-v1/; + +/include/ "omap34xx.dtsi" + +/ { + model = "Nokia N900"; + compatible = "nokia,omap3-n900", "ti,omap3"; + + cpus { + cpu@0 { + cpu0-supply = <&vcc>; + }; + }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x10000000>; /* 256 MB */ + }; + +}; + +&i2c1 { + clock-frequency = <2200000>; + + twl: twl@48 { + reg = <0x48>; + interrupts = <7>; /* SYS_NIRQ cascaded to intc */ + interrupt-parent = <&intc>; + }; +}; + +/include/ "twl4030.dtsi" + +&twl_gpio { + ti,pullups = <0x0>; + ti,pulldowns = <0x03ff3f>; /* BIT(0..5) | BIT(8..17) */ +}; + +&i2c2 { + clock-frequency = <400000>; +}; + +&i2c3 { + clock-frequency = <100000>; +}; + +&mmc1 { + status = "disabled"; +}; + +&mmc2 { + status = "disabled"; +}; + +&mmc3 { + status = "disabled"; +}; + +&mcspi1 { + // For some reason, touchscreen is neccessary for screen to work at + // all on real hw. It works well without it on emulator. + // + // Also... order in the device tree actually matters here. + tsc2005@0 { + compatible = "tsc2005"; + spi-max-frequency = <6000000>; + reg = <0>; + }; + mipid@2 { + compatible = "acx565akm"; + spi-max-frequency = <6000000>; + reg = <2>; + // turbo_mode = 0, + // cs_per_word = 0 + }; +}; + +&usb_otg_hs { + interface-type = <0>; + usb-phy = <&usb2_phy>; + mode = <2>; + power = <50>; +};