From patchwork Tue May 27 22:00:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 4251861 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EC07C9F336 for ; Tue, 27 May 2014 22:03:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CB72201DE for ; Tue, 27 May 2014 22:03:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2F13420142 for ; Tue, 27 May 2014 22:03:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WpPQF-0001oN-Mv; Tue, 27 May 2014 22:00:39 +0000 Received: from mail-wg0-x22d.google.com ([2a00:1450:400c:c00::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WpPQD-0001l4-OR for linux-arm-kernel@lists.infradead.org; Tue, 27 May 2014 22:00:38 +0000 Received: by mail-wg0-f45.google.com with SMTP id m15so10003687wgh.4 for ; Tue, 27 May 2014 15:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YEOzeiXU1apEYITVqVYI18SYdVjfKlNMnLrQhx9GQKI=; b=GUTGd0hUj0e1eD2bW5qSC8n7cPFSAhczxm0vV05Ff48qv0OdMd93naTwzXGiRj2dRA numItJ8RLmo352AqYxbO6SIZXqMSAMgfmgea9t8WEb+BpLQsdsSA5Ah75hfbAI56itF6 I8zVqb0QFdcHt07+Mo/1PqrsUtdNQ8PHa3eNnnl+Ey6lRuNxlzXtB+CKYrfdblPi5PMK 96OZUsTJLXjmlz/Ux3eAI9qKNxf1ihuu5+Cp9CWkkwQkC+uit8dTUOsvtg3kMRNS1bMF KBTMtaw7BnjYc7VvAzBey3dCZDwOWBAP6e/ZE3y++i34t745sNQQvvWqCjgB3G0SNIgu adrQ== X-Received: by 10.194.24.36 with SMTP id r4mr14611861wjf.39.1401228014412; Tue, 27 May 2014 15:00:14 -0700 (PDT) Received: from topkick.lan (dslc-082-083-214-160.pools.arcor-ip.net. [82.83.214.160]) by mx.google.com with ESMTPSA id b16sm38062302wjx.45.2014.05.27.15.00.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 May 2014 15:00:13 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH v2 2/2] ARM: dts: mvebu: split SolidRun CuBox into variants Date: Wed, 28 May 2014 00:00:06 +0200 Message-Id: <1401228006-3212-1-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1401140009-31505-2-git-send-email-sebastian.hesselbarth@gmail.com> References: <1401140009-31505-2-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140527_150037_951795_4E69260E X-CRM114-Status: GOOD ( 16.41 ) X-Spam-Score: -0.1 (/) Cc: Mark Rutland , Andrew Lunn , Russell King , Jason Cooper , Pawel Moll , Ian Campbell , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Rob Herring , Kumar Gala , Gregory Clement , linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 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, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 As Mainlining effort for SolidRun CuBox has been carried out on the Engineering Sample, the board DTS was reflecting this. Actually, SolidRun CuBox comes in three different variants: Engineering Sample (ES), production with 1GB RAM (1G), and production with 2GB RAM (2G). Therefore, we base current dove-cubox.dts on to the 1G production variant and add a ES dts to add required quirk for misrouted SDHCI card detect on top of dove-cubox.dts. For the 2G variant we rely on the bootloader to setup correct RAM size. Signed-off-by: Sebastian Hesselbarth --- Changelog: v1->v2: - drop 2G board dts and rely on bootloader (Suggested by Jason Cooper) - rework board files to allow to include 1G into ES and add quirks only Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala Cc: Russell King Cc: Jason Cooper Cc: Andrew Lunn Cc: Gregory Clement Cc: devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/dove-cubox-es.dts | 12 ++++++++++++ arch/arm/boot/dts/dove-cubox.dts | 3 --- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 arch/arm/boot/dts/dove-cubox-es.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 35c146f31e46..e7fec04e659d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -405,6 +405,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \ armada-xp-openblocks-ax3-4.dtb dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ dove-cubox.dtb \ + dove-cubox-es.dtb \ dove-d2plug.dtb \ dove-d3plug.dtb \ dove-dove-db.dtb diff --git a/arch/arm/boot/dts/dove-cubox-es.dts b/arch/arm/boot/dts/dove-cubox-es.dts new file mode 100644 index 000000000000..e28ef056dd17 --- /dev/null +++ b/arch/arm/boot/dts/dove-cubox-es.dts @@ -0,0 +1,12 @@ +#include "dove-cubox.dts" + +/ { + model = "SolidRun CuBox (Engineering Sample)"; + compatible = "solidrun,cubox-es", "solidrun,cubox", "marvell,dove"; +}; + +&sdio0 { + /* sdio0 card detect is connected to wrong pin on CuBox ES */ + cd-gpios = <&gpio0 12 1>; + pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>; +}; diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index 7a70f4ca502a..aae7efc09b0b 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts @@ -111,9 +111,6 @@ &sdio0 { status = "okay"; - /* sdio0 card detect is connected to wrong pin on CuBox */ - cd-gpios = <&gpio0 12 1>; - pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>; }; &spi0 {