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 31A59C19F2A for ; Mon, 8 Aug 2022 01:54:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243499AbiHHBx6 (ORCPT ); Sun, 7 Aug 2022 21:53:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243504AbiHHBvH (ORCPT ); Sun, 7 Aug 2022 21:51:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C196D10F; Sun, 7 Aug 2022 18:38:07 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 4CD9760DF3; Mon, 8 Aug 2022 01:38:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CED95C433D6; Mon, 8 Aug 2022 01:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922686; bh=chmQ/QxK3qmOWMj+owMuXHL1OP1NT36bYWpNDyJ2YCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OSak4nV6KNA3GfCCrz7sdE5kqtTB7XNTYbC9wkINofGgcnvPK4XbyZJsUe1zMHUM4 N2ZnadIpntg8Yk14Mwt5zSvSnkPqGnMfzGWUvEmGkydRoIuCtFrZzD/I8AvkI9tG/l Bcz2814QEQbeehQUjOb5DZaXN6THC6fv9n+Ot0aADzEBeNDTi3MuguURl24u00698G c6hEdsq0a/DTVjrcghX0zvCP6DWJB4I6R1wN8kCQ/ktEd2tlLt6lTjqCkkjFvsVvhP mf8++ChAsLmgbFbFyzityLFe7TKDtZz1psLYlvoMY+0rfVNYA58gYm9efiL5zZShII G1DGST0ucS1jQ== 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 5.10 15/29] ARM: dts: imx6ul: fix qspi node compatible Date: Sun, 7 Aug 2022 21:37:25 -0400 Message-Id: <20220808013741.316026-15-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013741.316026-1-sashal@kernel.org> References: <20220808013741.316026-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: 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 51de36b4125a..c40684ad11b8 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -1025,7 +1025,7 @@ pxp: pxp@21cc000 { qspi: spi@21e0000 { #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 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 4A58FC19F2A for ; Mon, 8 Aug 2022 02:31:13 +0000 (UTC) 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=ImwKqWNTGS9GD7xtd4zyPqRTJu/vWT97eMnay98W3vg=; b=dJ2eKbJiCvtN/g YsekIM0on7Jt45gBcaFDhOnLWEAemTRjPALi7+8GB/RkC/7OHHmb2JgZPDHUmwXiwpqooFknTc/Wn qnVsAXuqFpcbXQJsuXEKP9+kwGbwgsj7DLuamuiIPfn/0IXT61Q6hOZuPxYej+c5Zj+aKmyaMR8f8 UkUMuepTTQbcrKBoNX4746a4E9zG+MiLROaqvVmdhtZxWkiFDBAaIC6oFavg29z4UNrkHHB5WAtjd d4VZkhxutk8VsqAQ8OPJDgXwDeQbPeVh1dt1APVdP3x5wsBl3jgJK3x/7CGIq+rzizWNZYylXl6If uXz/S5O2gQQl8Ddk9hSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oKsWw-0081QH-1I; Mon, 08 Aug 2022 02:30:10 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oKrib-007eip-Hb for linux-arm-kernel@lists.infradead.org; Mon, 08 Aug 2022 01:38:11 +0000 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 0E564B80DCF; Mon, 8 Aug 2022 01:38:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CED95C433D6; Mon, 8 Aug 2022 01:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922686; bh=chmQ/QxK3qmOWMj+owMuXHL1OP1NT36bYWpNDyJ2YCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OSak4nV6KNA3GfCCrz7sdE5kqtTB7XNTYbC9wkINofGgcnvPK4XbyZJsUe1zMHUM4 N2ZnadIpntg8Yk14Mwt5zSvSnkPqGnMfzGWUvEmGkydRoIuCtFrZzD/I8AvkI9tG/l Bcz2814QEQbeehQUjOb5DZaXN6THC6fv9n+Ot0aADzEBeNDTi3MuguURl24u00698G c6hEdsq0a/DTVjrcghX0zvCP6DWJB4I6R1wN8kCQ/ktEd2tlLt6lTjqCkkjFvsVvhP mf8++ChAsLmgbFbFyzityLFe7TKDtZz1psLYlvoMY+0rfVNYA58gYm9efiL5zZShII G1DGST0ucS1jQ== 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 5.10 15/29] ARM: dts: imx6ul: fix qspi node compatible Date: Sun, 7 Aug 2022 21:37:25 -0400 Message-Id: <20220808013741.316026-15-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013741.316026-1-sashal@kernel.org> References: <20220808013741.316026-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-20220807_183809_753110_9437F77E X-CRM114-Status: GOOD ( 12.27 ) 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: 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 51de36b4125a..c40684ad11b8 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -1025,7 +1025,7 @@ pxp: pxp@21cc000 { qspi: spi@21e0000 { #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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel