From patchwork Mon Jul 15 16:46:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11044519 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1709E1800 for ; Mon, 15 Jul 2019 16:47:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0370326B39 for ; Mon, 15 Jul 2019 16:47:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA49C26E3D; Mon, 15 Jul 2019 16:47:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9462026B39 for ; Mon, 15 Jul 2019 16:47:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=6tcJkOfHwnHBVSyNmnJHr2f8RUcMNafUE40WcUj+cBA=; b=tep3o/xWe+2BZ9 dDUY0+oUWpXF/JgNeHELcpWl2SDlrxuRWX+RjETmILp0vyNAYBq7jQAldV2lKoVW0ZYhjuPXvqZ5c ET0pc4uXj5EmNsTZy3J0/jd9q8cMZpjRKAOwzgR+ALte4HW+eXmxOmBRUPVofmfD1zCYyuNFMYjqH NvPCC09XsKXAPVEf2SwI766TRc5AVsipJJqyEF6d52iAFXFrB8zRjstJDLkDJK+9eWXRyU29aQ+l4 HmzYOAvEh2O/89JQJTG7+fO6pRBFmGHtJowX7YbnhrZagL6DOIgZ1L4unVATW5vvA5J9/yMd0Dcw8 j07Zwq5Yk7IJdP/K7VAA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hn47x-0008Sz-PJ; Mon, 15 Jul 2019 16:47:01 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hn47u-0008Qh-EG for linux-arm-kernel@lists.infradead.org; Mon, 15 Jul 2019 16:46:59 +0000 Received: by mail-lj1-x243.google.com with SMTP id t28so16949158lje.9 for ; Mon, 15 Jul 2019 09:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s01qK3uxx7mnUo5yTLfmogyNz5i6I9WLEPs8T+BH3IY=; b=DbhUu9uOoUXeWcINAdNW82uFlZSjjuoqo+bNaAllLINGwKFYGexLs8II3qAw1dKMK+ xyX/Y201I9J391osgqyWs/NMFDYVC5S2T7EVWuHfWadUF4a8ymAWZkIbJUPyaOe1X0yL RYkaDlAk1yS1kCH/CgIcNSq37OBS26zLhe7kJUvcI7+xGsLiTBcVziXLUcAj8PbYyFuS ljo7KWGztLEXPGYufW0V6HNQYpj1WrLTrVEeyOQBZ4GT6BaqnMWD3dh2u3Vmw8Ql7p0p pABxV8osiA2OipTjuJnkqLJaThsdh2l3X7zm0t3JmT0w29F0Vb72bjYamF7ch5ajuk17 v/3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s01qK3uxx7mnUo5yTLfmogyNz5i6I9WLEPs8T+BH3IY=; b=VnP9r5IU0UIj2rVflVR6AlGazmnKf0A6/762vzIK+jsOySzrh5MwZID/Wpq6wPggZY ibkA3vASLTFdwQB4zjk4K1QbjpO0RT08uvxohIYbMw7jf3IucIROffQ8N3SueOTUdalQ 4cZsVx6hYtKbW5TIumTSxMf9e2RQwTvnv+Na6DmojIkcJOUCukzcgeAmBZSbl1Vyouk4 p8ZZ/wgRlywWfQrM40d7Pfz3BoJIOvWHYRq7/dEL2FBCmv9F7JjWXXzKwAKDU+Zkw3S/ Z+pLmKryI2wD6D0DIdMflQ9Q5GP5nXk/ugiMbH11wqS+kSEdahdqAyMdzJWYwWf5x9/+ 6TJw== X-Gm-Message-State: APjAAAUcBZziZsAeNb9F1XC3EgdVkG9cohxZsWCt147M4GBdRHQTCY0b uioednsWGBw+efTCPs6gjB+lA1W6J8o= X-Google-Smtp-Source: APXvYqxN2EiRgDcHeNBBeImwb4enBRCl4pW/DzO31aUvfNg6C/CwfoGFxUZ5+Qo+zdYhRQpgXtpTYA== X-Received: by 2002:a05:651c:95:: with SMTP id 21mr14708819ljq.128.1563209215595; Mon, 15 Jul 2019 09:46:55 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id e87sm3628329ljf.54.2019.07.15.09.46.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 09:46:54 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll Subject: [PATCH 1/3] ARM: dts: gemini: Fix up confused pin settings Date: Mon, 15 Jul 2019 18:46:48 +0200 Message-Id: <20190715164650.2883-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190715_094658_548613_FCE7B110 X-CRM114-Status: GOOD ( 12.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , Florian Fainelli Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The SL93512r board has its pin muxing set up for the wrong ASIC: SL3516 instead of SL3512 that it is using. Fix it up and reference the right GPIO for the WPS button. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini-sl93512r.dts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini-sl93512r.dts index 2bb953440793..afe655593b28 100644 --- a/arch/arm/boot/dts/gemini-sl93512r.dts +++ b/arch/arm/boot/dts/gemini-sl93512r.dts @@ -36,8 +36,8 @@ wakeup-source; linux,code = ; label = "WPS"; - /* Conflict with NAND flash */ - gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + /* Conflicts with TVC and extended flash */ + gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; button-setup { @@ -180,17 +180,20 @@ syscon: syscon@40000000 { pinctrl { /* - * gpio0egrp cover line 16 used by HD LED - * gpio0fgrp cover line 17, 18 used by wireless LED and reset button - * gpio0hgrp cover line 21, 22 used by MDIO for Marvell PHY - * gpio0kgrp cover line 31 used by USB LED + * gpio0agrp cover line 0, used by WPS button + * gpio0fgrp cover line 16 used by HD LED + * gpio0ggrp cover line 17, 18 used by wireless LAN LED and + * reset button OR USB ID select on 17 and USB VBUS select + * on 18. (Confusing.) + * gpio0igrp cover line 21, 22 used by MDIO for Marvell PHY */ gpio0_default_pins: pinctrl-gpio0 { mux { function = "gpio0"; - groups = "gpio0egrp", + groups = "gpio0agrp", "gpio0fgrp", - "gpio0hgrp"; + "gpio0ggrp", + "gpio0igrp"; }; }; /* From patchwork Mon Jul 15 16:46:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11044523 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 87E9813B1 for ; Mon, 15 Jul 2019 16:47:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75B5026B39 for ; Mon, 15 Jul 2019 16:47:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A1D326E3D; Mon, 15 Jul 2019 16:47:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 12C4F26B39 for ; Mon, 15 Jul 2019 16:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1oJJKJLp+MUN6n0rEYOZAn30kiVZtH1Vn4Rs35XV9gs=; b=K+oINf9n8b/g6g yxnlOebf6GZVola+mxH+lohT6sWr4GHrZcy4RXEkdJWPwFa8+Jd5YphFHcnM28z5tZoR++m2mya68 8W2+kKhbS+6zP5YLkQ/2nVTNuWUgSlLeiVU/1PnbhSRTnAP12m6BBv3UXZohz9pBByokkisZXL2Q6 67jh5pp0uIQfJ6RYBuzxUmhPsw0yFxB9DFClWbs1Rl9IRabW9e2aL3Rf4KuueY9/i+lW4piy7TbVf 4PEu0LPtHNEPcYJ2lByVkAQ7CaghY/6nPm4ImsTQRd1YBCZ5w+3Gb6suYOoYLtUC/gUxD99hIDOkf QO66jIuT32x8NWSphmOw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hn48C-0000DN-Od; Mon, 15 Jul 2019 16:47:17 +0000 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hn47v-0008RO-Rx for linux-arm-kernel@lists.infradead.org; Mon, 15 Jul 2019 16:47:01 +0000 Received: by mail-lj1-x242.google.com with SMTP id m23so16913269lje.12 for ; Mon, 15 Jul 2019 09:46:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7CHNk9a97/g0strtJzi9ujSVJqpro4Yo0WFZ1HD72o0=; b=NXEGef0dtWOzaM5nMhpoHGC7Q2vnRM/mEtMU8wJASUVu+sHtCWOnmLcxrNB38PccVl T3aFHDgy/FSFKGPuqivaQsaHijJ/RHkPzJFKqUd8Ztz/8nr1ZWt5p0Aox3dhOGKHt2yq YMA9NyZnSKzdPwYKyG8Pfo/21erZULWzIwaOynDskN5CCm1Ww5hngMrz86qja9px7EAm S9qk94n6oiUIbtHowqBYZ6nxtuEVZKLoc17HhFoYGZc22QMQl8we9idBTzfCLO46Fphs iMd8dlQ7GN8wBOjxcR1niX5jtqT8c/9RMjLlfviXBVTt+sjoZRwOBoGSuRcZ1dH4dQtH aizA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7CHNk9a97/g0strtJzi9ujSVJqpro4Yo0WFZ1HD72o0=; b=k60enKC9jUjISmZlNJm4x3NcPDaxMUHwrxoRa59ZyZDt3Z+T2otoOCn5B/y13JkzBo exs72DhAqMF9NWY+eW7wVd9P0wxNhM2L17/bdiliW9ZGu6BXo9SZrmtEOb5JoTnW4qSO RvgOVwO4vdeg+pp5zB+NOjapj+cJuOxOFYriEnx5uBZ7ENaAi9gb7S2X0bv2oBaRimHs FWtut6HLC/4uGUyuwJnInPcucrXx/IEfMCklzEMmmIQnTq37RrS47Wt9UAwuDLAKvvJm f88/8sLuaXRY7MrfSr/FAgBUuqCLfs91F/+WcCri2IQtkxIsrvFRTLuUHIYNGEwl+lB0 uGYw== X-Gm-Message-State: APjAAAWDYhk5Nr1ML7G7PathFVxyVD4+VUkaf6SXE7QjoRZKgHtr3EkR tRKyLCnYGwTvVjFEV2tKKL/DOpiTahI= X-Google-Smtp-Source: APXvYqyr94NBVoIEm1VDH3DEWSeDxHLv0s3iJwCWQXAvHeE/SwW5Jfrxqj6faEeMgsopMoR33X3FAw== X-Received: by 2002:a2e:5d92:: with SMTP id v18mr14722248lje.9.1563209217795; Mon, 15 Jul 2019 09:46:57 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id e87sm3628329ljf.54.2019.07.15.09.46.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 09:46:56 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll Subject: [PATCH 2/3] ARM: dts: gemini: Switch to redboot partition parsing Date: Mon, 15 Jul 2019 18:46:49 +0200 Message-Id: <20190715164650.2883-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190715164650.2883-1-linus.walleij@linaro.org> References: <20190715164650.2883-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190715_094659_914440_FE3E00FB X-CRM114-Status: GOOD ( 11.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , Florian Fainelli Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This switches the kernel to parse the Redboot partitions in the SL93512r and the NAS4220B properly using the right compatible string instead of using hard-coded partitions. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini-nas4220b.dts | 35 +++------------------------ arch/arm/boot/dts/gemini-sl93512r.dts | 35 +++------------------------ 2 files changed, 8 insertions(+), 62 deletions(-) diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts index f4535d635f3b..254ecbc3d79f 100644 --- a/arch/arm/boot/dts/gemini-nas4220b.dts +++ b/arch/arm/boot/dts/gemini-nas4220b.dts @@ -81,37 +81,10 @@ /* 16MB of flash */ reg = <0x30000000 0x01000000>; - partition@0 { - label = "RedBoot"; - reg = <0x00000000 0x00020000>; - read-only; - }; - partition@20000 { - label = "Kernel"; - reg = <0x00020000 0x00300000>; - }; - partition@320000 { - label = "Ramdisk"; - reg = <0x00320000 0x00600000>; - }; - partition@920000 { - label = "Application"; - reg = <0x00920000 0x00600000>; - }; - partition@f20000 { - label = "VCTL"; - reg = <0x00f20000 0x00020000>; - read-only; - }; - partition@f40000 { - label = "CurConf"; - reg = <0x00f40000 0x000a0000>; - read-only; - }; - partition@fe0000 { - label = "FIS directory"; - reg = <0x00fe0000 0x00020000>; - read-only; + partitions { + compatible = "redboot-fis"; + /* Eraseblock at 0xfe0000 */ + fis-index-block = <0x1fc>; }; }; diff --git a/arch/arm/boot/dts/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini-sl93512r.dts index afe655593b28..5f70e01af7ec 100644 --- a/arch/arm/boot/dts/gemini-sl93512r.dts +++ b/arch/arm/boot/dts/gemini-sl93512r.dts @@ -143,37 +143,10 @@ /* 16MB of flash */ reg = <0x30000000 0x01000000>; - partition@0 { - label = "BOOT"; - reg = <0x00000000 0x00020000>; - read-only; - }; - partition@120000 { - label = "Kern"; - reg = <0x00020000 0x00300000>; - }; - partition@320000 { - label = "Ramdisk"; - reg = <0x00320000 0x00600000>; - }; - partition@920000 { - label = "Application"; - reg = <0x00920000 0x00600000>; - }; - partition@f20000 { - label = "VCTL"; - reg = <0x00f20000 0x00020000>; - read-only; - }; - partition@f40000 { - label = "CurConf"; - reg = <0x00f40000 0x000a0000>; - read-only; - }; - partition@fe0000 { - label = "FIS directory"; - reg = <0x00fe0000 0x00020000>; - read-only; + partitions { + compatible = "redboot-fis"; + /* Eraseblock at 0xfe0000 */ + fis-index-block = <0x1fc>; }; }; From patchwork Mon Jul 15 16:46:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11044525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C84CA1823 for ; Mon, 15 Jul 2019 16:47:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B668F26E3D for ; Mon, 15 Jul 2019 16:47:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A885D26E4A; Mon, 15 Jul 2019 16:47:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 55FB826E16 for ; Mon, 15 Jul 2019 16:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9sBFo+V7p38nlAzp2rKl10u7RqOXWsIRCLio8tK5+8E=; b=KZxgN6stC+x3Rl ziZSZf9W0ALLynuvuhWVF+2YGk+2PMHi663xFuK1b7NQINSc1wwHs6t+pbcGXQxNtdDm3Hjx/7p5o Hr14Rk9FeIo0H14koNWFfZ/I9UmnCoDjHRsSDpDXnmsqFOFn83RtOBbHi6+aMHKGISnZPiIpB90gz JUjF/RpE8Otnu6XjQ6uORGWTgIY7gUkOnpNXoctn2RBMUMjQ7aVT+LwI7BI/IB34i7XTdw0d0eiDh sOGkmjg5lN7lVEyLcZBDIni3z0JF+hi2oRA+nMlxO/J+fK4QGKfi/WJ5cZt26YlF1KryFk3S/X9t3 tvHSccqPyW9PF7knOARA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hn48e-0000XS-OB; Mon, 15 Jul 2019 16:47:44 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hn47x-0008S6-C1 for linux-arm-kernel@lists.infradead.org; Mon, 15 Jul 2019 16:47:02 +0000 Received: by mail-lj1-x243.google.com with SMTP id x25so16986427ljh.2 for ; Mon, 15 Jul 2019 09:47:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1GrmpWeN2Qp2z2sO59baZfBDoTLQGcC2m9BfzA567mQ=; b=JsOkgG4xjYwh5p0fpY0DH1lP4CGOV7PLVl0HgSo8pHerG7NPkw9abfIG/Ek7Yk2iFw HEm/QmJl3iqispZ1dY6GQVkIV1R2A2XM+mrep6DiG5xpOWl7lnmSsCwJFJvdBR7IhZdw YRiFNMacUDzRHIHC9VP2BaFMna4Z8IlRXs4PQuEaNi7h0lq66p2ycbAC8KQ9wMpI/a1u QeULCGRAu7DgK8fWx8aei1Leash+XJMX7MudWdGH47gfLXZA8kOplq/fSRfuEWyqifGK ccNqPy26t2qNFNLoBWKzXPeZiswVQXCbRkH3+xoknPDoANimgQcHU2r2mPBHXXW2y5vx fkHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1GrmpWeN2Qp2z2sO59baZfBDoTLQGcC2m9BfzA567mQ=; b=howRpI/3kF/CpMa4wCu79rHQfGylNN6Tc3pKwKDMmmry1Fi0wgELJHNYIj6ZPQNRiX YwuRARbq7XMylLR26gZP40NILFbcIra1l0BTEGqfGe76nATdcCvpD1CpZI5pjIecvHcT Z+BFRH87DzC702OkG8La+LvQZS71Eb+omKWuEYG+xis1XUOhoG3jSv461Y/t/HwdKejO WxfRaKyOhYvITDjMWmWjU1z/LG+Dfv3iIhOURPSHac8EpXTs+HM6CxK+eLF84KsKBy74 xKhh8F7+WMYG5Tqs56GHVgWNXzvPmiDz4i3rcTGPvIBNnG8qp3TEJkfvdIjQEfhTFH4e sqvA== X-Gm-Message-State: APjAAAVHaaud55qjWsTvgtSlm+rTCFD7BHRcDDkdw1dv4bRjP8xIk+ZV eBXRM+QvuMROGmwGM1NqlnIPRaqzjZM= X-Google-Smtp-Source: APXvYqz5rP5e+EezSvq0W2oCdY/rhEuvqzQ63vWU+8JtZhLoCaV+zQucI4Kn2WVoQ3KZAUEECBbP4w== X-Received: by 2002:a2e:9cd4:: with SMTP id g20mr13913221ljj.205.1563209219696; Mon, 15 Jul 2019 09:46:59 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id e87sm3628329ljf.54.2019.07.15.09.46.58 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 09:46:58 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Hans Ulli Kroll Subject: [PATCH 3/3] ARM: dts: gemini: Mount root from mtdblock3 Date: Mon, 15 Jul 2019 18:46:50 +0200 Message-Id: <20190715164650.2883-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190715164650.2883-1-linus.walleij@linaro.org> References: <20190715164650.2883-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190715_094701_421702_47F2B2D6 X-CRM114-Status: GOOD ( 11.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , Florian Fainelli Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The third mtdblock device named "Application" is where we want to mount our root filesystem. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/gemini-nas4220b.dts | 2 +- arch/arm/boot/dts/gemini-sl93512r.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts index 254ecbc3d79f..521714f38eed 100644 --- a/arch/arm/boot/dts/gemini-nas4220b.dts +++ b/arch/arm/boot/dts/gemini-nas4220b.dts @@ -20,7 +20,7 @@ }; chosen { - bootargs = "console=ttyS0,19200n8"; + bootargs = "console=ttyS0,19200n8 root=/dev/mtdblock3 rw rootfstype=squashfs,jffs2 rootwait"; stdout-path = &uart0; }; diff --git a/arch/arm/boot/dts/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini-sl93512r.dts index 5f70e01af7ec..a98af0351906 100644 --- a/arch/arm/boot/dts/gemini-sl93512r.dts +++ b/arch/arm/boot/dts/gemini-sl93512r.dts @@ -24,7 +24,7 @@ }; chosen { - bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait"; + bootargs = "console=ttyS0,19200n8 root=/dev/mtdblock3 rw rootfstype=squashfs,jffs2 rootwait"; stdout-path = &uart0; };