From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33CC6C433F5 for ; Tue, 9 Nov 2021 22:40: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 019D661054 for ; Tue, 9 Nov 2021 22:40:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 019D661054 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=//u43Icf2YggvONy/I3xSXclVJMuZWmBtOdJIvaoLrE=; b=oRX7557ktYxSCN tLrcnOS43JQhiKMH9EjrU7/Y0GUogh53VxpmsPBpdhsu6wBX//EhKq7YbCTh/eUzCObIZ2fUn1lMC Jf/ywuNIKcnlgtrwuw5UaVUKftO/6G2N9AKdvN6LXC+edLgbMmscuHcZ9F3BTjhHESw0bWzJ/FcYO 6ztydo8ZQkMRjeX5uUJy0w4maPai4EExgWu08d/r3TiNsRJcT7hTFxGkdN3QwqGCDuL/KSFNW46rs 5abpZUNRe7ILnngWO8jkaHa1THj74Sek1b1zTGcJQVF3BCbkekT7dTO/QYx6U+0/tmP76PDOKlW8K fPl59/BHv4ubIoK8BqPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkZlt-003Wfn-G0; Tue, 09 Nov 2021 22:39:18 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkZRh-003LzY-4V for linux-arm-kernel@lists.infradead.org; Tue, 09 Nov 2021 22:18:26 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8BBCB61251; Tue, 9 Nov 2021 22:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636496304; bh=U22rbgzymfHX++0ABHjijmAjDVGHM7QIFGG1734d080=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=loQc2yW5IJZfBHSHmlfRIAB5j4yIesM3FOECDhWTknL6701kqLHKLJlQ6JA5oSImU YeMJ8GqBLYQG5a467yvvqz5I5e6Hg/C4uj+sisJRH0d4gEoCXlvqcSfGBiZlxYuPsJ ia0L6vPqmiXYQRMD67Jj5l1zbkqS+QE6BPGDmrLQ5CIKn7GzfuHySdhjImOqnq5q+k xoBlDK/uQosT+cGwUuh340AAEIxev0sMNPqY1EHtt/DYXcz8gSuIZukxN2zlYjVMWP FsNEaKU2Sn5GL4xKx2AGqrPTbuRj+4dl7E90o8vGsI/DFdSkoQKFXBMQ3t2aZY1lAL rTHzzMH8p+/FA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Li Yang , Kuldeep Singh , Shawn Guo , Sasha Levin , robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, linux@arm.linux.org.uk, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 57/82] ARM: dts: ls1021a-tsn: use generic "jedec, spi-nor" compatible for flash Date: Tue, 9 Nov 2021 17:16:15 -0500 Message-Id: <20211109221641.1233217-57-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211109221641.1233217-1-sashal@kernel.org> References: <20211109221641.1233217-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211109_141825_248604_F2CBBAF2 X-CRM114-Status: UNSURE ( 9.95 ) X-CRM114-Notice: Please train this message. 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Li Yang [ Upstream commit 05e63b48b20fa70726be505a7660d1a07bc1cffb ] We cannot list all the possible chips used in different board revisions, just use the generic "jedec,spi-nor" compatible instead. This also fixes dtbs_check error: ['jedec,spi-nor', 's25fl256s1', 's25fl512s'] is too long Signed-off-by: Li Yang Reviewed-by: Kuldeep Singh Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/ls1021a-tsn.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/ls1021a-tsn.dts b/arch/arm/boot/dts/ls1021a-tsn.dts index 9d8f0c2a8aba3..aca78b5eddf20 100644 --- a/arch/arm/boot/dts/ls1021a-tsn.dts +++ b/arch/arm/boot/dts/ls1021a-tsn.dts @@ -251,7 +251,7 @@ flash@0 { /* Rev. A uses 64MB flash, Rev. B & C use 32MB flash */ - compatible = "jedec,spi-nor", "s25fl256s1", "s25fl512s"; + compatible = "jedec,spi-nor"; spi-max-frequency = <20000000>; #address-cells = <1>; #size-cells = <1>; -- 2.33.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel