From patchwork Mon May 26 21:33:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 4245131 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 D34269F333 for ; Mon, 26 May 2014 21:37:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0D3E2013A for ; Mon, 26 May 2014 21:37:06 +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 BB67B20131 for ; Mon, 26 May 2014 21:37:05 +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 1Wp2X5-0000y7-Mh; Mon, 26 May 2014 21:34:11 +0000 Received: from mail-wg0-x22a.google.com ([2a00:1450:400c:c00::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wp2Ww-0000sb-D9 for linux-arm-kernel@lists.infradead.org; Mon, 26 May 2014 21:34:03 +0000 Received: by mail-wg0-f42.google.com with SMTP id y10so8380855wgg.25 for ; Mon, 26 May 2014 14:33:39 -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=RTwFdtc+0inenDEOIm4OS5AXCUQZLd5WrHrcWDaVZXs=; b=Nvp/3PagTEYEkUlSCJ+XDy00arj7Kh7ISuEqut4y0rw3fO889GM5/qrGaZ0FR8jkDp vhNMWdfwEGgUaqHHlmzKxZai9GlpF1ol6QeUI7g42WWpltPr1vQwAYNfa4kihWGVnkPC 02H74GdNnRY81GzFHcKrSFig2Yqem9FdaLBTivMZjANyOvt9H4YM97RCaXNKhU2GFiqP 0cfEMFTvw1Dkpy4Ct+PbHnL2Uu1AtpuylsNHevembN5zLN/Z7EAX0BuGa1lfDMkh+IFO KGxTao6+0RrgeFKWL3EUfuv+gcrbavyF5v8sXgH5pgESp0CW729tezyAmyrZ4l3QsmBa bxug== X-Received: by 10.194.82.9 with SMTP id e9mr33475236wjy.45.1401140018892; Mon, 26 May 2014 14:33:38 -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 lq14sm2911860wic.7.2014.05.26.14.33.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 May 2014 14:33:37 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 2/2] ARM: dts: mvebu: split SolidRun CuBox into variants Date: Mon, 26 May 2014 23:33:29 +0200 Message-Id: <1401140009-31505-2-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1401140009-31505-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1401140009-31505-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140526_143402_641655_E91BF409 X-CRM114-Status: GOOD ( 15.32 ) 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 split the current dove-cubox.dts into a common board include and one board dts for each of the above variants. Signed-off-by: Sebastian Hesselbarth --- 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 | 4 +++- arch/arm/boot/dts/dove-cubox-1g.dts | 17 ++++++++++++++++ arch/arm/boot/dts/dove-cubox-2g.dts | 17 ++++++++++++++++ arch/arm/boot/dts/dove-cubox-es.dts | 23 ++++++++++++++++++++++ .../boot/dts/{dove-cubox.dts => dove-cubox.dtsi} | 17 ---------------- 5 files changed, 60 insertions(+), 18 deletions(-) create mode 100644 arch/arm/boot/dts/dove-cubox-1g.dts create mode 100644 arch/arm/boot/dts/dove-cubox-2g.dts create mode 100644 arch/arm/boot/dts/dove-cubox-es.dts rename arch/arm/boot/dts/{dove-cubox.dts => dove-cubox.dtsi} (86%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 35c146f31e46..40a008539c0c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -404,7 +404,9 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \ armada-xp-matrix.dtb \ armada-xp-openblocks-ax3-4.dtb dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ - dove-cubox.dtb \ + dove-cubox-1g.dtb \ + dove-cubox-2g.dtb \ + dove-cubox-es.dtb \ dove-d2plug.dtb \ dove-d3plug.dtb \ dove-dove-db.dtb diff --git a/arch/arm/boot/dts/dove-cubox-1g.dts b/arch/arm/boot/dts/dove-cubox-1g.dts new file mode 100644 index 000000000000..eebd3f7ca7e6 --- /dev/null +++ b/arch/arm/boot/dts/dove-cubox-1g.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +#include "dove-cubox.dtsi" + +/ { + model = "SolidRun CuBox (1G)"; + compatible = "solidrun,cubox-1g", "solidrun,cubox", "marvell,dove"; + + memory { + device_type = "memory"; + reg = <0x00000000 0x40000000>; + }; + + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + }; +}; diff --git a/arch/arm/boot/dts/dove-cubox-2g.dts b/arch/arm/boot/dts/dove-cubox-2g.dts new file mode 100644 index 000000000000..513b6a68eba3 --- /dev/null +++ b/arch/arm/boot/dts/dove-cubox-2g.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +#include "dove-cubox.dtsi" + +/ { + model = "SolidRun CuBox (2G)"; + compatible = "solidrun,cubox-2g", "solidrun,cubox", "marvell,dove"; + + memory { + device_type = "memory"; + reg = <0x00000000 0x80000000>; + }; + + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + }; +}; 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..5fc17ce34c98 --- /dev/null +++ b/arch/arm/boot/dts/dove-cubox-es.dts @@ -0,0 +1,23 @@ +/dts-v1/; + +#include "dove-cubox.dtsi" + +/ { + model = "SolidRun CuBox (ES)"; + compatible = "solidrun,cubox-es", "solidrun,cubox", "marvell,dove"; + + memory { + device_type = "memory"; + reg = <0x00000000 0x40000000>; + }; + + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + }; +}; + +&sdio0 { + /* sdio0 card detect is connected to wrong pin on CuBox */ + 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.dtsi similarity index 86% rename from arch/arm/boot/dts/dove-cubox.dts rename to arch/arm/boot/dts/dove-cubox.dtsi index 7a70f4ca502a..5752d729cc71 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dtsi @@ -1,20 +1,6 @@ -/dts-v1/; - #include "dove.dtsi" / { - model = "SolidRun CuBox"; - compatible = "solidrun,cubox", "marvell,dove"; - - memory { - device_type = "memory"; - reg = <0x00000000 0x40000000>; - }; - - chosen { - bootargs = "console=ttyS0,115200n8 earlyprintk"; - }; - leds { compatible = "gpio-leds"; pinctrl-0 = <&pmx_gpio_18>; @@ -111,9 +97,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 {