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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EE24C25B07 for ; Mon, 8 Aug 2022 01:57:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243531AbiHHB5I (ORCPT ); Sun, 7 Aug 2022 21:57:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243908AbiHHB4e (ORCPT ); Sun, 7 Aug 2022 21:56:34 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DC8E1CB02; Sun, 7 Aug 2022 18:39:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C9984B80DCF; Mon, 8 Aug 2022 01:39:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABFDDC433D7; Mon, 8 Aug 2022 01:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922794; bh=Xz5hcmM4qCkmNj4cQMqcWYCdPA3cuKankeknCXY9KUs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U8kVGpLd8q7lWQOP00lSgahtaiP08kWXjSzHp/pUmJOkllAK5JWRiTuF0oUT9Sdrr 3739CpXkPeE0/aeAFdwsZFxN4iRNe4tgaq/1qABniJKrijghfWtDg49GTfaHEsgOLs lVUbz2Ytp4EtW9O/2NwTPo3w9LjxmjkaunqURKqfU127NKRBMDinlAM9Z+9oP+rm+1 Ls3ahD0VB5Ai0IcrzPEolR8l1s/Izph6SPurZ57AtB8qOKjW9AA21+WVyvIJz23NAO B48kuejV7p9HXuMwH7VWPe2SqTKtaEzTc7HrvZMernIRLvEtiRN/3iXmCqtJf/VHaq gOej/ApDyxDhQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Stein , Shawn Guo , Sasha Levin , robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 06/12] ARM: dts: imx6ul: fix qspi node compatible Date: Sun, 7 Aug 2022 21:39:36 -0400 Message-Id: <20220808013943.316907-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013943.316907-1-sashal@kernel.org> References: <20220808013943.316907-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: devicetree@vger.kernel.org From: Alexander Stein [ Upstream commit 0c6cf86e1ab433b2d421880fdd9c6e954f404948 ] imx6ul is not compatible to imx6sx, both have different erratas. Fixes the dt_binding_check warning: spi@21e0000: compatible: 'oneOf' conditional failed, one must be fixed: ['fsl,imx6ul-qspi', 'fsl,imx6sx-qspi'] is too long Additional items are not allowed ('fsl,imx6sx-qspi' was unexpected) 'fsl,imx6ul-qspi' is not one of ['fsl,ls1043a-qspi'] 'fsl,imx6ul-qspi' is not one of ['fsl,imx8mq-qspi'] 'fsl,ls1021a-qspi' was expected 'fsl,imx7d-qspi' was expected Signed-off-by: Alexander Stein Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm/boot/dts/imx6ul.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi index d544015d10e5..e4006bd47440 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -883,7 +883,7 @@ lcdif: lcdif@021c8000 { qspi: qspi@021e0000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx6ul-qspi", "fsl,imx6sx-qspi"; + compatible = "fsl,imx6ul-qspi"; reg = <0x021e0000 0x4000>, <0x60000000 0x10000000>; reg-names = "QuadSPI", "QuadSPI-memory"; interrupts = ; -- 2.35.1