From patchwork Wed Jul 21 14:04:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12391221 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=-18.2 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=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 16868C12002 for ; Wed, 21 Jul 2021 14:53:31 +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 CFE6861221 for ; Wed, 21 Jul 2021 14:53:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CFE6861221 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cerno.tech 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=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=gfvaZyc6ILD3UZ JxItNjj8tUN9Z3eC8Pn2ntQ2g7FRuUpCokEZRpYOhDDVexUzJ3vbrR0U/zZaouCbJMwlhzd1pqN1m 7OVXp4Pmcgv8yIip0YADrgdPVI8DkdjkZPEj7rT+Q77ILkkkdWQhZ+8TzDfJG2BVWcpMCVYn9RAYl PuhiquvcUXW/t8mrQCjxdTwTgmjYPYMKzzUn4XFL+6sguc2t4bu8n50k7aptMqqZW0gcOEt7OJZbv P9MHahueSGTCxfWMSVGVJ0bDsku9zNdqM7xwg6//AKTnHzOu8HxuirE6L4aLToyscvc5S0mm5kkq2 KJixXlgKvSN0Lem3mrYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6DZF-00G5zM-Vq; Wed, 21 Jul 2021 14:51:26 +0000 Received: from out3-smtp.messagingengine.com ([66.111.4.27]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6CrF-00FqSP-GV for linux-arm-kernel@lists.infradead.org; Wed, 21 Jul 2021 14:05:59 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id D16785C0180; Wed, 21 Jul 2021 10:05:56 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Wed, 21 Jul 2021 10:05:56 -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=eETEpZzB1maZCokhhG/Mu4S1X5s05 oNa9VneyFGMlMufXSUsTRqJKmVMUu48AzEqI0nU7d+fPeBnlcKqlfe1yrG0/itsd zDPocd0jmvUud7VYIlZRmnRWX1OgGw+yw4YcgT7Nk/vqfXaxHh5fOxERi/YBixfa Vs7EZlOFenfB2ZCoCZxXUy8rEo8jVjdnoGQU9go9cUB53wh3MJ2n2dVGu+o62vH3 ACHZOSwzXch8kvCYpKzWFL2zGAa1dC4rnKK1nfDzz2f/+sW+bVUJT30JSCWzZPRc X9Sc7/PjwBBNy0ROaFdKHe0cetkhRkez9jV6NWkaFLHTdnPYyAMWtDxZA== 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=qbCOegxo OQ+Z9/L0x1mPpzRpwzZ7+bTpR6kdW4v+8ZUKSilvEVs45c2g/E7x3R3xWM+jO3EX 5ISQ7S3PRSavogtE/HPblBAUbzeIxGA78AhyaKFj3um12h+t3XSRLgbgSW/8Rl0/ ZGAhX95MzN1N/KI1M65sVX2ryPIQZQA5G46DHlCH0n+WKOFq3E4t9EeAbYCh5/LK 5GYjlP02aN04x2VHwArtYOZ4BUrqfKV9T9hvYLX/2v2Y0NE+3iAi0squ5NXbW8Up 1nBO/mayHDWGsUnFX9ovdlZz9l44neWPi/L7WFMJC9C9YLM/A0fQThESYgXEwySS GaBnNlgoAwfi3Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrfeeggdeijecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepofgrgihimhgv ucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrghtth gvrhhnpedvkeelveefffekjefhffeuleetleefudeifeehuddugffghffhffehveevheeh vdenucevlhhushhtvghrufhiiigvpeehnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrg igihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 21 Jul 2021 10:05:56 -0400 (EDT) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard , Jernej Skrabec , devicetree@vger.kernel.org, Rob Herring , Frank Rowand Cc: linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com Subject: [PATCH 43/54] ARM: dts: sunxi: Fix the SPI NOR node names Date: Wed, 21 Jul 2021 16:04:13 +0200 Message-Id: <20210721140424.725744-44-maxime@cerno.tech> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210721140424.725744-1-maxime@cerno.tech> References: <20210721140424.725744-1-maxime@cerno.tech> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210721_070557_694289_7C07EBCB X-CRM114-Status: GOOD ( 12.47 ) 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 --- 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>;