From patchwork Wed Apr 28 17:55:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin LABBE X-Patchwork-Id: 12229889 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D21FC433ED for ; Wed, 28 Apr 2021 17:57:41 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5175761289 for ; Wed, 28 Apr 2021 17:57:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5175761289 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc: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=H3q0L+9ZNPkRTsQAlVQ5O7D2Ss4t/5g6YwiW2M297+8=; b=QRCUW5RQpulPGYq/XFhCqD0u/z LR73S3XATWKKYQZC3otBvvfYZ0RCTUPiNN56RCxWujAdKNUQP5tQNi122rSq0Jc9DW94yM5vOvVgG iy8TRSlSZzj9iKBxcfqmX9/lOhrvpWBMtqtR/Bw8NuIH7PA6LKA+8f9svcQbBx+1XeDlwdOH4Sbp6 ue3APMtG/P3aR8Myi4Gi0pjNd8GbIg3nWouMSf9eCgBmzorWKjvH73rMcSMwP5N3ScjA4muztSpjQ NNv8K9gZhTMj9mVQjul3FKD4/tq9x/4XAQkFOpaLJNv59wrOw5gFRvVqGeu4ErmXBisqPftxunrwT XjXpMgIQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lboP8-0041rq-0x; Wed, 28 Apr 2021 17:55:18 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lboP4-0041rR-E2 for linux-arm-kernel@desiato.infradead.org; Wed, 28 Apr 2021 17:55:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=ccJ5CKh5Fm2jcqyeUGgDKmg/mfobdGyfWxQa0j/XJgY=; b=KfP8ibs1aQyWJv0OM3HGTjIAz4 8nH/VEH5LsjvvNmnY4rejq+/mFayduaWIFZE85uE8lbGREoTyE43Y0/mSphffK26dUt304YekoMrY GFjyJ3/U0XG7+9kRodogdIfSF5JCajb3NBxA8IBRaCyUdLrBWKFzlM6l5qagGlnwGJg1CdYY7TMql 1N3u4uI6433GKpi3+t5quVbO5JVkcec7zu2MEltlLVl+p7/rfPOMBPhsg7fhWuY3sMXiWw8X8o93y zh0dqr7my3gJB9WLTkJnQ/+FV3rFOKhXP+7LjKGzGkV07AHiIIma/AoEBtFsKlq21EFh1VRzbfFVz t1eSA18Q==; Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lboP1-0005fq-7l for linux-arm-kernel@lists.infradead.org; Wed, 28 Apr 2021 17:55:13 +0000 Received: by mail-wr1-x432.google.com with SMTP id l2so11674697wrm.9 for ; Wed, 28 Apr 2021 10:55:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ccJ5CKh5Fm2jcqyeUGgDKmg/mfobdGyfWxQa0j/XJgY=; b=jo3w+WThsU+itLe68rxjwmCfIa0oZ5elmUOfF/KpYZ8pmbrIsshEpkCEaShcIa0B+L pTwkM08whlEM5I4QLNGvdjx6szEhmWKInp6WjfTDyD2eNQSVh74u1SiPjLotpvgkJJKy /l7a7uFlKzdKW1mTxXnHcF5o0gHh+B8oQ/hNrQCOybtxgvTFDxT50IUrMZDZjmXsO6PB eaPhbfliU5QNlcmnLPLmFWm4KDOp3fjiw/o0VlyzStrKbs4BWdY9UNrC9rBPf9nuObPO pM/J1iolzYdHrJpkUY4wn/6kJM99tRSVWOOGpihvgtEDFckEwVdS04/jHjMPGuQzo8ac z6+Q== 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=ccJ5CKh5Fm2jcqyeUGgDKmg/mfobdGyfWxQa0j/XJgY=; b=cRGi9hDRiT9CLPLcdWSWbZ1GQcpagCteOKNb9YxfuAhhmuH1Bo05Ium/oImepb8VIt ZHX1+Jt453eZ4Cro/lZ00r+dPZwS3JMCAKfyJgf8qSUI53mMA/nrI5rh3Hh1/i2bY7h+ AJ1aRVKkv9sUD2DUwIDTtAranKXNO5Y6np9fDKWQQvi/FK+X46jcvMILnshVOMrdBfCe 0rZNlk+AAkqXPy1bM1I0Qk/93033BlhCx8gY2CeQheE3lzDqbkbUQMz1P3xgkF+4XuJ3 FQ1QNjToOCPa88bAv+1Px0AAJ86HPdQ5CW7HhnsE/eUsh2Li+aucU3jD5pS3hnaoXExC q2pg== X-Gm-Message-State: AOAM531a941krCPAyyxllOVeH23LfCb7QY+n7KjNDBAlfDWqDGJ5wz7a pYPw76c3cq+cFdJ1/QVWjn25myafs0Ac3LRI X-Google-Smtp-Source: ABdhPJyStKAHRYiMqqdwTQdM6FHQZW5EDJ82J7Avnp9VngvDTL9jiKJU0CHc4/9XO8r0jjBx6v1s2Q== X-Received: by 2002:a5d:590b:: with SMTP id v11mr28163078wrd.415.1619632509812; Wed, 28 Apr 2021 10:55:09 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id o10sm616526wrx.35.2021.04.28.10.55.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 10:55:09 -0700 (PDT) From: Corentin Labbe To: linus.walleij@linaro.org, robh+dt@kernel.org, ulli.kroll@googlemail.com Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH] ARM: dts: gemini: rename to nand-controller Date: Wed, 28 Apr 2021 17:55:03 +0000 Message-Id: <20210428175503.3692090-1-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210428_105511_303989_E37B6807 X-CRM114-Status: GOOD ( 14.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We must use nand-controller instead of flash. Signed-off-by: Corentin Labbe --- arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 +- arch/arm/boot/dts/gemini-nas4220b.dts | 2 +- arch/arm/boot/dts/gemini-rut1xx.dts | 3 +-- arch/arm/boot/dts/gemini-sl93512r.dts | 2 +- arch/arm/boot/dts/gemini-sq201.dts | 2 +- arch/arm/boot/dts/gemini-wbd111.dts | 2 +- arch/arm/boot/dts/gemini-wbd222.dts | 2 +- arch/arm/boot/dts/gemini.dtsi | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/gemini-dlink-dir-685.dts b/arch/arm/boot/dts/gemini-dlink-dir-685.dts index cc39289e99dd..5e205bb53e5a 100644 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts @@ -281,7 +281,7 @@ phy4: phy@4 { }; soc { - flash@30000000 { + nand-controller@30000000 { /* * Flash access collides with the Chip Enable signal for * the display panel, that reuse the parallel flash Chip diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts index 43c45f7e1e0a..1e2d3162d9c1 100644 --- a/arch/arm/boot/dts/gemini-nas4220b.dts +++ b/arch/arm/boot/dts/gemini-nas4220b.dts @@ -76,7 +76,7 @@ phy0: ethernet-phy@1 { }; soc { - flash@30000000 { + nand-controller@30000000 { status = "okay"; /* 16MB of flash */ reg = <0x30000000 0x01000000>; diff --git a/arch/arm/boot/dts/gemini-rut1xx.dts b/arch/arm/boot/dts/gemini-rut1xx.dts index 08091d2a64e1..f8826a3b774f 100644 --- a/arch/arm/boot/dts/gemini-rut1xx.dts +++ b/arch/arm/boot/dts/gemini-rut1xx.dts @@ -70,7 +70,7 @@ phy0: ethernet-phy@1 { }; soc { - flash@30000000 { + nand-controller@30000000 { status = "okay"; /* 8MB of flash */ reg = <0x30000000 0x00800000>; @@ -124,7 +124,6 @@ ethernet-port@1 { /* Not used in this platform */ }; }; - usb@68000000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/gemini-sl93512r.dts b/arch/arm/boot/dts/gemini-sl93512r.dts index a0916d3c1059..995be04425b7 100644 --- a/arch/arm/boot/dts/gemini-sl93512r.dts +++ b/arch/arm/boot/dts/gemini-sl93512r.dts @@ -138,7 +138,7 @@ fixed-link { soc { - flash@30000000 { + nand-controller@30000000 { status = "okay"; /* 16MB of flash */ reg = <0x30000000 0x01000000>; diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts index 0c6e6d35bfaa..df6146aaff4b 100644 --- a/arch/arm/boot/dts/gemini-sq201.dts +++ b/arch/arm/boot/dts/gemini-sq201.dts @@ -123,7 +123,7 @@ fixed-link { soc { - flash@30000000 { + nand-controller@30000000 { status = "okay"; pinctrl-names = "enabled", "disabled"; pinctrl-0 = <&pflash_default_pins>; diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts index 0c47b2b9811c..f253743b1c55 100644 --- a/arch/arm/boot/dts/gemini-wbd111.dts +++ b/arch/arm/boot/dts/gemini-wbd111.dts @@ -82,7 +82,7 @@ phy0: ethernet-phy@1 { }; soc { - flash@30000000 { + nand-controller@30000000 { status = "okay"; /* 8MB of flash */ reg = <0x30000000 0x00800000>; diff --git a/arch/arm/boot/dts/gemini-wbd222.dts b/arch/arm/boot/dts/gemini-wbd222.dts index 52b4dbc0c072..76b6faaf806e 100644 --- a/arch/arm/boot/dts/gemini-wbd222.dts +++ b/arch/arm/boot/dts/gemini-wbd222.dts @@ -86,7 +86,7 @@ phy1: ethernet-phy@3 { }; soc { - flash@30000000 { + nand-controller@30000000 { status = "okay"; /* 8MB of flash */ reg = <0x30000000 0x00800000>; diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi index 38671523dec5..5c8c5179c944 100644 --- a/arch/arm/boot/dts/gemini.dtsi +++ b/arch/arm/boot/dts/gemini.dtsi @@ -16,7 +16,7 @@ soc { compatible = "simple-bus"; interrupt-parent = <&intcon>; - flash@30000000 { + nand: nand-controller@30000000 { compatible = "cortina,gemini-flash", "cfi-flash"; syscon = <&syscon>; pinctrl-names = "default";