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 791CDC19F2A for ; Mon, 8 Aug 2022 02:18:01 +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=23VqdmqDslNBw6FDyfHF+c4aiQEZ0SQngfPEY/qCU/0=; b=a1vs7xzVjSnGYl VQK6fbGg4W72yGCuHiNO51A5wmDqVTfvV6I4/ol3RNiyLIDKuPLqHHgb57CuF8raH4bVX4wx3LkPM +v4ljPJgEoVrpshe/rj6CpslpEGb7PY3NYwrS95h4sBcw3jsPj+gmpQF3jAYjh76oOb0pqWloSuQ6 7E2ehtS68LGEogyLBP61aQ8735zaOAFom0AhAMlj46GuHeIVRIaFm430EiL/bfo/P+kWHq8RVCcd5 z8JZ85PzqMOfN9yy0gcDk3k9FIk1+FxsjyeQ2c5bmzhfw8YtHXiZgeJAClO9ZIGVvtRTgkuHlHLcA j13NtMtKW2IQ+zvXrLrA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oKsK4-007vXb-Fj; Mon, 08 Aug 2022 02:16:52 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oKrhS-007e9F-U6 for linux-arm-kernel@lists.infradead.org; Mon, 08 Aug 2022 01:37:00 +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 dfw.source.kernel.org (Postfix) with ESMTPS id 80D8B60DF5; Mon, 8 Aug 2022 01:36:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEA0DC43140; Mon, 8 Aug 2022 01:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922617; bh=HopU/MPTRkH9+3zqqnsjOGCkMfvViXYpGAFABHbxMj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u0ZZOTHlU+MBVhiWrrlTue0ZsAO91bQPdYI7LlM1JNN/VQs1rtFrl3QPInB9sNKkg PUFFniaZGDf+WWtOr4OU5AQzoLJwKl5iD0WVaM2xjMFhiTQKyrZf6Tp61r1oJ8MAhy 60CgjXG4sWp2KbFoLjHI4xk84FQndFetYKBTJu0Kw8pRydA+8rPyxxRyrqmw4/oKmu KcQ4yXP67Kk5fbqfjl9SsGiPT3ZcARW3TJC8RpvvjCJ6Q0J9y6juP41XxSYkidIzot UdZohF2ryATzqt6mWLejXY2AUgFAdsh3iwqAZH4SOQz7I/R3TqMsjDVAGP5OLMh9ye BydlWmpcYQOLg== 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.15 23/45] ARM: dts: imx6ul: fix qspi node compatible Date: Sun, 7 Aug 2022 21:35:27 -0400 Message-Id: <20220808013551.315446-23-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013551.315446-1-sashal@kernel.org> References: <20220808013551.315446-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_183659_371588_509CAC7E 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 bc6548058d8c..eca8bf89ab88 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -1029,7 +1029,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