Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp671997pxv; Wed, 14 Jul 2021 12:40:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0foQ6JFpucmORS9zChz0qBIE1vMFu/6pmQ6jog5vOODEiJF4Cplkl7s1pVsyN0loUC1VM X-Received: by 2002:aa7:dd43:: with SMTP id o3mr15849030edw.302.1626291636336; Wed, 14 Jul 2021 12:40:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626291636; cv=none; d=google.com; s=arc-20160816; b=LykxURzeMF/C2I5QmEV6qU3SV+n1XXYo3MKCS7eFs92vNSdrPDW/WKhzIKcMoAXq2r LPCDvPcsmSuwboA6WHYO+ptP2gSkwPczJ5m8Zyq+R0+473HgNEpdoEMkLkqogJsWdxYC sKZafDNzzHYbVf/SgBNdLtvYg3AozxYdwb4AVZ6vB+8IkdUdgN4P6cBA09xQ+6oWMGy4 c/AwldeLgixhTv9Vcmk47bdxypSWJlrQwqa52VuBibC6voN6Px6jaWAsvkLtM9t+9dQL dZb3t+UxRe44Ch3S6XIXy+EPT3s2Uw9QAd4J58RSTvdFbVY140PB7u19fndTcVtHRsRY 3ZKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZD9YKMPvCPAsLJm0mndh2IhXl7n0NhGkPnNKAxnWSdk=; b=q81kMpoVhke6eHFPK079Mavv2C4NRExlzkMBYpxM1bF0B6/mp28xqtZWTDW8LbyooP JenIXI2Q0u46bPrYV1aINJtXPhZHryqhYvkHCXVfUZ+SG3n71Yer4txTFZhcpt3Vxr0C sIIoLF1E346E61lcYuPpbwjQFI6KKKLKAz5FSS25qMpaoYcv0bHCaIM1xSnXPY5fYSbE Ah8kF8nbhtW7ytjwdW0B8IHDKqElkkXFLQ7+ZI5T0cOthACbovnsgqkPOiiZddCHGkbC Y8CSs6CKEbsqgcnyTiDersgVgN7Bky50G62WMF5tzuYo6/LHsNk4IjCEa3MjKztj9AYd ZhFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JE7XIv45; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dg1si3660892edb.139.2021.07.14.12.40.11; Wed, 14 Jul 2021 12:40:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JE7XIv45; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232505AbhGNTlg (ORCPT + 99 others); Wed, 14 Jul 2021 15:41:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:35816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232444AbhGNTlX (ORCPT ); Wed, 14 Jul 2021 15:41:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C696C613CB; Wed, 14 Jul 2021 19:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291511; bh=x+qdZzgSdk3d/ojZFp62G+S3M5I1KK3oAlR4rrJvUFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JE7XIv45yy6bPoYYI2LW1h8nJ0amBF1kYuFOMTrnseTJ1dOhfcePRr+dIg8kBrZ1Y lv3A1vvDsbi/Tv39EdXshsm517+NfGw7VigxXMwQYko6rymFb01zmTtWiSxjCpVJQI kXJ6Qv73hh8bbHaYzgRxHd5kHGyxBa6TK9LsxGzjiad2QpJqarOh6cPwG68MUC1P9I alcTpDf7km2aV9TbbxxZPD+OpUYw5yhX2wDoqajgdlzmsTJDelEH7Jgu5g/HKWI82K DUZl9uP/mPw3vZkbfSWIywE/poM1zj5QbwqdYJldqhzo/LypbV8Ugnng7dJc9qSbI+ y2jTrI7dvNr2w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= , Florian Fainelli , Sasha Levin , devicetree@vger.kernel.org Subject: [PATCH AUTOSEL 5.13 020/108] ARM: dts: BCM63xx: Fix NAND nodes names Date: Wed, 14 Jul 2021 15:36:32 -0400 Message-Id: <20210714193800.52097-20-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714193800.52097-1-sashal@kernel.org> References: <20210714193800.52097-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafał Miłecki [ Upstream commit 75e2f012f6e34b93124d1d86eaa8f27df48e9ea0 ] This matches nand-controller.yaml requirements. Signed-off-by: Rafał Miłecki Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm/boot/dts/bcm63138.dtsi | 2 +- arch/arm/boot/dts/bcm963138dvt.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi index 9c0325cf9e22..cca49a2e2d62 100644 --- a/arch/arm/boot/dts/bcm63138.dtsi +++ b/arch/arm/boot/dts/bcm63138.dtsi @@ -203,7 +203,7 @@ serial1: serial@620 { status = "disabled"; }; - nand: nand@2000 { + nand_controller: nand-controller@2000 { #address-cells = <1>; #size-cells = <0>; compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand"; diff --git a/arch/arm/boot/dts/bcm963138dvt.dts b/arch/arm/boot/dts/bcm963138dvt.dts index 5b177274f182..df5c8ab90627 100644 --- a/arch/arm/boot/dts/bcm963138dvt.dts +++ b/arch/arm/boot/dts/bcm963138dvt.dts @@ -31,10 +31,10 @@ &serial1 { status = "okay"; }; -&nand { +&nand_controller { status = "okay"; - nandcs@0 { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-ecc-strength = <4>; -- 2.30.2