From patchwork Mon May 27 11:16:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 10962615 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 83E4C1398 for ; Mon, 27 May 2019 11:16:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 705D428ADC for ; Mon, 27 May 2019 11:16:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63F6E28AE0; Mon, 27 May 2019 11:16:35 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 0DF2C28ADC for ; Mon, 27 May 2019 11:16:35 +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=mPLaaUTMH/8aBbG69wipsRlH+mhnShHJoWlbP6SQ7hE=; b=pF7Xgn4iHma8nr 8MlUjJFpEOk3YR3J59WkYQ0AEcqEgpbENAGIbnrp+u+xyacd+H69UGnPibdIBQ5FyHfmIX2rs6oZw yE8WJks/kojoTJpaTDIFVP0HooYkzEkhSnZ21Wvl7HBoHA7Zp2DWpY4QlXU+lWq3f92aeYB/SH20k b0DgkwYsg+tq6NHozWYOBLtxmnJ7YoEdloFYgWcpP4X/BR43zRAzBDMJ8xCiDjhi3rv3xnczM/lK1 s+jc5SPfvqFUGciGKM74OdfIunT0s9VJSd2sPAHAv9+IqAuoIccCIS0AlnSPRhaWEyNxxZZIL/76o w+yrtiFqMTP51NiX0pAQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hVDcE-0003WT-FE; Mon, 27 May 2019 11:16:30 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hVDcA-0003W4-Px for linux-arm-kernel@lists.infradead.org; Mon, 27 May 2019 11:16:28 +0000 Received: by mail-wm1-x341.google.com with SMTP id w9so9341869wmi.0 for ; Mon, 27 May 2019 04:16:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=IE0QaynMlWug2qNR46NtnCWHIB0RzkNO84JDp+YXRlk=; b=WWCRBfLXHGOwfH9Bz0XMS3YsDxSjIeSRx8cKi5IRGytXczDcD6hu7oSG1k7q/gaaQ8 c65fxwdjDOgK4LGctIEtQYUo30bZ98akHa2NBiF5wdW/bIY7/yLl05YD6CNrmB0hIJ9l 8seRZoEkcNICPC0HF0d2WajB8LL/EncHNXbmwarakyJyxlZX1CP5AksSw8eO6mqFVpd6 /74D4rntZNZxWh7kUML8nTVtvKPT1G/xsCUPcmNguVGNsXt3uHXOtpOjbad09ZC2ztsq 8jsF/5hM85lY21s2hrbTgvCdlLJDcLxKXHNGvR7rZIHamlv4zDwXc3xNsCTnLxWp5XzE hfXg== 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=IE0QaynMlWug2qNR46NtnCWHIB0RzkNO84JDp+YXRlk=; b=qClBrGrZNfE+JobNAkzeVpDDxipZxs860s4G4Vh9bEWxmgx1HQUm2kLpi5wdOkrMcC B0zP0nSF2OYgpOIvPRcn+fgHDGY2sHSiT/XjYzWWV/aMSJvp7lfz8pMiOJEj07RlRZyh VpWL7ssxeL0YqiDf4veNJMhdmwJ4icfQYlrNCQNFGyF4Ak6X+dgx5lQp0CeDhMLF5Nt+ SUOGGlbvfwlYHZnO71TMasq5Pd6Cp4s2WIY5WXAltEkt9hQa77Ky1UmBX74hRZu0frRf DJ6rcYVsymRcmtDqComtdC2bav43De20QTSG4boPoTV9Mp3LTh1i67NoxDNxHqxiF1eW HoVg== X-Gm-Message-State: APjAAAVZli8gI2ipydlDy6aMHIgYXfyp59FLhSVNYl+nQWT48n82WZ53 Uuwz8hU8p0KkaviKRR7OOfQ= X-Google-Smtp-Source: APXvYqxWKajkKGi9hI6uCHALtxhUkAygj/1iJ3HJHI0+7l2OGrYh96kHaJME/r120zdqbRJxGHl71w== X-Received: by 2002:a05:600c:22cb:: with SMTP id 11mr9361238wmg.159.1558955785132; Mon, 27 May 2019 04:16:25 -0700 (PDT) Received: from localhost.localdomain (131.ip-164-132-48.eu. [164.132.48.131]) by smtp.googlemail.com with ESMTPSA id b8sm3781578wrr.88.2019.05.27.04.16.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 May 2019 04:16:24 -0700 (PDT) From: Tomasz Maciej Nowak To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Mark Rutland Subject: [PATCH] arm64: dts: armada-3720-espressobin: correct spi node Date: Mon, 27 May 2019 13:16:14 +0200 Message-Id: <20190527111614.3694-1-tmn505@gmail.com> 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-20190527_041626_845867_B1C7E348 X-CRM114-Status: GOOD ( 13.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Ellie Reeves , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= 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 manufacturer of this board, ships it with various SPI NOR chips and increments U-Boot bootloader version along the time. There is no way to tell which is placed on the board since no revision bump takes place. This creates two issues. The first, cosmetic. Since the NOR chip may differ, there's message on boot stating that kernel expected w25q32dw and found different one. To correct this, remove optional device-specific compatible string. Being here lets replace bogus "spi-flash" compatible string with proper one. The second is linked to partitions layout, it changed after commit: 81e7251252 ("arm64: mvebu: config: move env to the end of the 4MB boot device") in Marvells downstream U-Boot fork [1], shifting environment location to the end of boot device. Since the new boards will have U-Boot with this change, it'll lead to improper results writing or reading from these partitions. We can't tell if users will update bootloader to recent version provided on manufacturer website, so lets drop partitons layout. 1. https://github.com/MarvellEmbeddedProcessors/u-boot-marvell.git Signed-off-by: Tomasz Maciej Nowak --- .../dts/marvell/armada-3720-espressobin.dts | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts index 6be019e1888e..fbcf03f86c96 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts @@ -95,25 +95,9 @@ flash@0 { reg = <0>; - compatible = "winbond,w25q32dw", "jedec,spi-flash"; + compatible = "jedec,spi-nor"; spi-max-frequency = <104000000>; m25p,fast-read; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "uboot"; - reg = <0 0x180000>; - }; - - partition@180000 { - label = "ubootenv"; - reg = <0x180000 0x10000>; - }; - }; }; };