From patchwork Wed Sep 1 09:18:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12469091 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.1 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,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 EDDA3C432BE for ; Wed, 1 Sep 2021 10:47:54 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 AFD0461054 for ; Wed, 1 Sep 2021 10:47:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AFD0461054 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=DkdxibNXH19oJ8O3Ner9Y56Wp2F2cCJsfLVvmGTTcuU=; b=Ftp4EgrUzGK0i+ Gvkh+cP5p0kNRQSF0J2BszPVSvP7j0NVuz2L+6nnD05dXJXSzhFkuvqj/XqoB1ELAR+CeTuaDS3VU yPNDVNh49V0fWarNxgHsDxiamiHrdV1x9IqAeEP5ZK4WxMmZeF0PKmZ/8ypCdG0QCugxWZmf9XPnA 9Ex8E4tHXTJhX1sKba/vj8qGxEElH73zYcd1vxYHvppJwygyGZznpir+XVvuCTo2qTKRsubT+lmH3 sjEc6hL472Gt8YJ7AK6XFsr0UHTZQXQ5SDSZtJhX4m9cKLP+JG0KsoDOibxZ9P8s3ahTH+dcEpWv9 QA+VAaQXFHH9cbAXVg5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLNjT-005JUf-5S; Wed, 01 Sep 2021 10:44:40 +0000 Received: from out5-smtp.messagingengine.com ([66.111.4.29]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLMPk-004qL4-Gw for linux-arm-kernel@lists.infradead.org; Wed, 01 Sep 2021 09:20:18 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id CD42B5C023E; Wed, 1 Sep 2021 05:20:11 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 01 Sep 2021 05:20:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=NBo7N2VNZZ0WD AqU6HUEAWRGAaaX8ieAM+2OeiktVZc=; b=JPPlleF6RVwvuE8HIZeJ2DqOlHyuf yhMosCssTP3CuYPHQUOVMN41GtR+glUBA9/bHf7IJOxEFMRsj7nrjt12QlQVeZ0a eyQX+/2VrEAMtCHtKbfU3Fb56BNKUEt/+sGDYDog6EBMKZLqfexZYSxbUjXj0efE BKi95SfGyeM7aVR9F2Pip5PpZ8SiPeheBWGmIAdMe//wqWLixu43if/N50RHGqwh cv/mt9kK+nJGhgEHROsvAm+vAWV9l5EyEzFACGpW6+j90l9l7eZq5ebQX0nhiAwH 8v/ejQ2/l056dzXxFw7Z8Q8Ai0X4bFeJLxfdm472FsWVD/Exfb9BP3KLA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=NBo7N2VNZZ0WDAqU6HUEAWRGAaaX8ieAM+2OeiktVZc=; b=QD9yYF9/ wr2FVHpbzwIUlv9+5EfKt3R1eUbqFiY82nLIuGAbCnGhhGd8XRuU11z0o5uxSUAV uRcGCa9DVzHuWVjd2PQWEFURoPizqJ8ir6yj/uOCGSut8w6TFkClif+x/5OReMZp uOXvSa+XznBq7L4eZdaMIif7dsOSVjYkks6IWchDrtudoK9QfMt9AWnPcULzaeY3 QS9BOMfIedZkrSwXPVG31yGejXSZ9iEy687VYwmn4TLeN+lOnWcptmQlmXwUEq+I cjcK7cYr7uxc7FtKEVpq9EktWXyZFE/hz39tp2fE1XXGPube/QlUGOzY4Ht4+XSi w+m2dXjP4WWM+A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddruddvfedgudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeforgigihhm vgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrfgrth htvghrnhepvdekleevfeffkeejhfffueelteelfeduieefheduudfggffhhfffheevveeh hedvnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehmrghilhhfrhhomhepmh grgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 1 Sep 2021 05:20:11 -0400 (EDT) From: Maxime Ripard To: devicetree@vger.kernel.org, Rob Herring , Frank Rowand , Chen-Yu Tsai , Maxime Ripard , =?utf-8?q?Jernej_=C5=A0krabec?= Cc: linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com Subject: [PATCH v2 43/52] ARM: dts: sunxi: Fix the SPI NOR node names Date: Wed, 1 Sep 2021 11:18:43 +0200 Message-Id: <20210901091852.479202-44-maxime@cerno.tech> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210901091852.479202-1-maxime@cerno.tech> References: <20210901091852.479202-1-maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210901_022012_733659_C8F9DFA0 X-CRM114-Status: GOOD ( 12.59 ) 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 According to the SPI NOR bindings, the flash node names are supposed to be flash@
. Let's fix our users to use that new scheme. Signed-off-by: Maxime Ripard Acked-by: Jernej Skrabec --- arch/arm/boot/dts/sun8i-v3-sl631.dtsi | 2 +- arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-v3-sl631.dtsi b/arch/arm/boot/dts/sun8i-v3-sl631.dtsi index e0d2a31efc7f..6f93f8c49f84 100644 --- a/arch/arm/boot/dts/sun8i-v3-sl631.dtsi +++ b/arch/arm/boot/dts/sun8i-v3-sl631.dtsi @@ -115,7 +115,7 @@ ®_ldo2 { &spi0 { status = "okay"; - spi-flash@0 { + flash@0 { reg = <0>; compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; diff --git a/arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi b/arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi index 204fba3614f9..50d328c2a84d 100644 --- a/arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi +++ b/arch/arm/boot/dts/sunxi-libretech-all-h3-it.dtsi @@ -156,7 +156,7 @@ &r_pio { &spi0 { status = "okay"; - spiflash@0 { + flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index 097a5511523a..c519d9fa6967 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts @@ -343,7 +343,7 @@ &sound { &spi0 { status = "okay"; - spi-flash@0 { + flash@0 { compatible = "mxicy,mx25l1606e", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <80000000>;