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 B4D6DC433F5 for ; Tue, 9 Nov 2021 22:34:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 96C5061101 for ; Tue, 9 Nov 2021 22:34:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344366AbhKIWhE (ORCPT ); Tue, 9 Nov 2021 17:37:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:55040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345479AbhKIWeI (ORCPT ); Tue, 9 Nov 2021 17:34:08 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D2E3161AE3; Tue, 9 Nov 2021 22:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636496522; bh=U22rbgzymfHX++0ABHjijmAjDVGHM7QIFGG1734d080=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oEjRVKqIiZaAOhLPysB2CMjMCOweo3kwXR5AoOJ/1BGJ7IGD7Qdd3NSS4QbgZHalE 6tpAxB2ycri1oMc6VjmsPa85caJeR8jVPByiNdjmK2iQVa/ud76euzeRCAglh1pZ9X oWuFKlDlvlk067yYW9pbs4x9WG+wXoBIfljJg8JJJ7KVkAajew8qhBIxttanZBvRGU uxeXvM9Ix53HEzSUf3gNUufYpzzKH3DCaDxduZC65NA3rKenDnwSidtZQXAJ3ucDDR GpW29Jdnj+uYeca18ND1rpm6RMYNbNiiWC1DV0OGBu/4aYslsHQL6H8hKlsrmu5w+O 6IOrELRXLBf0w== 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.10 36/50] ARM: dts: ls1021a-tsn: use generic "jedec,spi-nor" compatible for flash Date: Tue, 9 Nov 2021 17:20:49 -0500 Message-Id: <20211109222103.1234885-36-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211109222103.1234885-1-sashal@kernel.org> References: <20211109222103.1234885-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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