From patchwork Fri Apr 16 13:37:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 422793 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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 4E389C433B4 for ; Fri, 16 Apr 2021 13:38:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 19EAF611AB for ; Fri, 16 Apr 2021 13:38:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244071AbhDPNie (ORCPT ); Fri, 16 Apr 2021 09:38:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240255AbhDPNie (ORCPT ); Fri, 16 Apr 2021 09:38:34 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6855EC061574 for ; Fri, 16 Apr 2021 06:38:09 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id x20so14526565lfu.6 for ; Fri, 16 Apr 2021 06:38:09 -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=GWSOjlZXxwUSOU910bqL41nHp+qOEswR2OpnvakbvcY=; b=jNv2sQj+VJOaJRskvRBUEPXthNx/oI49HsHGJdpfUq6xHHfnj3uV9cna37tsb+RvLt kv0jkIBJdH2WPVtRs1A4wxNDAxqd+P+/1GB1EWI71fY9ddND6/Bt/kakcjfsiga2A4Vm bEHewC/ih6NG5gzBci10TSfgrnhlKB0ysJLbnQRFsVd5jE+R9xH4GbHLIYA1qDx81hTV 6TuCWzXLUe5WPUhJnkPTduXUCLeAFLCzQgeNCD/iocE3k1s2dqgfNGDIpBgkVflFL18J YBqGN/4H7uG+ySU0XcASYODRw398iFWRmgjnF9w9CTZVISJegdrPLozGxibQzh77TUNH Erjw== 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=GWSOjlZXxwUSOU910bqL41nHp+qOEswR2OpnvakbvcY=; b=lI39sbNF4iip/aIHfVqIoSlKyOwgHkQlp6dqOq4N3YzxPOaoC7UT1j0qNbyRvQMBSn JFRkTcSu1/iRsfiTHEioalh8LQcDtLAn6Oyz/CpdX01ZHCcI0ZNd4wWjEh6leiki8Q71 XQ3GVAEn+PKZ+u/mmG4MPCI7L+AF8/doPb7hY7xrLwVRBubh2I7JOZhT3AvqyEoAkQ8d 9iw1bc5xs7SFTJ/dpnHenySNEUpCrvxap7dZ7qfUHFGu41WgI12vqsJdIn/uzdTsjl2h wPFoMKAkuDKtqn1dS7OdTUVuB8untx5t0c2nDy7Bh6YSSvIvgvWjvnATORcc8MJQYVct JXnQ== X-Gm-Message-State: AOAM530vzFv4EAnvkM9FQt6s04TbYINGFezTFPQrx/2gfOOo4LXwn11a 9JpfFTpMeRPrV2mg5thjesY= X-Google-Smtp-Source: ABdhPJwDpFTOasWglgAMKOcLyBZoZn6Zn+AdLaqjJXM6BXI12XZV7j21Zz4Lb7ijTToRTGUfU04veQ== X-Received: by 2002:a19:e309:: with SMTP id a9mr2982831lfh.222.1618580287294; Fri, 16 Apr 2021 06:38:07 -0700 (PDT) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id y14sm948405ljy.18.2021.04.16.06.38.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Apr 2021 06:38:06 -0700 (PDT) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: Florian Fainelli , Rob Herring Cc: Ray Jui , Scott Branden , Hauke Mehrtens , devicetree@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH stblinux 1/6] ARM: dts: BCM5301X: Fix NAND nodes names Date: Fri, 16 Apr 2021 15:37:48 +0200 Message-Id: <20210416133753.32756-1-zajec5@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Rafał Miłecki This matches nand-controller.yaml requirements. Signed-off-by: Rafał Miłecki --- arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 ++-- arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 ++-- arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 4 ++-- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- arch/arm/boot/dts/bcm953012k.dts | 4 ++-- arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts index 8636600385fd..c81944cd6d0b 100644 --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts @@ -24,8 +24,8 @@ memory@0 { reg = <0x00000000 0x08000000>; }; - nand: nand@18028000 { - nandcs@0 { + nand_controller: nand-controller@18028000 { + nand@0 { partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts index e635a15041dd..a6e2aeb28675 100644 --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts @@ -25,8 +25,8 @@ memory@0 { <0x88000000 0x08000000>; }; - nand: nand@18028000 { - nandcs@0 { + nand_controller: nand-controller@18028000 { + nand@0 { partitions { compatible = "fixed-partitions"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi index 925a7c9ce5b7..be9a00ff752d 100644 --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi @@ -6,8 +6,8 @@ */ / { - nand@18028000 { - nandcs: nandcs@0 { + nand-controller@18028000 { + nandcs: nand@0 { compatible = "brcm,nandcs"; reg = <0>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi index 7db72a2f1020..092ec525c01c 100644 --- a/arch/arm/boot/dts/bcm5301x.dtsi +++ b/arch/arm/boot/dts/bcm5301x.dtsi @@ -501,7 +501,7 @@ rng: rng@18004000 { reg = <0x18004000 0x14>; }; - nand: nand@18028000 { + nand_controller: nand-controller@18028000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand"; reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>; reg-names = "nand", "iproc-idm", "iproc-ext"; diff --git a/arch/arm/boot/dts/bcm953012k.dts b/arch/arm/boot/dts/bcm953012k.dts index 046c59fb4846..de40bd59a5fa 100644 --- a/arch/arm/boot/dts/bcm953012k.dts +++ b/arch/arm/boot/dts/bcm953012k.dts @@ -49,8 +49,8 @@ memory@80000000 { }; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt; diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi index 9354077f74cd..b69c87d7d9a2 100644 --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi @@ -269,7 +269,7 @@ nand@1800 { interrupt-names = "nand"; status = "okay"; - nandcs: nandcs@0 { + nandcs: nand@0 { compatible = "brcm,nandcs"; reg = <0>; };