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 D6EFCC19F2A for ; Mon, 8 Aug 2022 01:52:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243257AbiHHBwW (ORCPT ); Sun, 7 Aug 2022 21:52:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243477AbiHHBvD (ORCPT ); Sun, 7 Aug 2022 21:51:03 -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 5604719291; Sun, 7 Aug 2022 18:38:04 -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 62A6A60E06; Mon, 8 Aug 2022 01:38:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6C1EC433D6; Mon, 8 Aug 2022 01:38:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922682; bh=Bb3Dowe88SgXMAAw/tOPGQ0jkgx64iKxbq65M0Yu5y4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ir6XIf49D692KXc/b26AzJhuo4WsEEHfWOIgowFNHyHQBbbCc4fnRh8zaJyy3iYPU M2JVt61btVSgsogS72I1pGNwCQca/2rDmoRukOEfFpnacAwzqI578RweLz7Jeyh6qR 6NMBSq/gmqsVY51OcWXD/Aj2C0oN2u9M1Pe8kOpw1Ej7HIb6ncoObMxQCD/Bh+XpW9 wRLGZzhbmwG0SxadI/KqCTI0ECKziU5Yh6L8xF2mtiaX7s/0EEkGQurrpmgG3SCWLM gY1LYZBzlDfmZwUWJfM4TdkGFYrVcJgiMmOEg+NAiLyX8QEv69ASP10yo0sUR8h1DS NLfvFUXgPuuSw== 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 12/29] ARM: dts: imx6ul: fix keypad compatible Date: Sun, 7 Aug 2022 21:37:22 -0400 Message-Id: <20220808013741.316026-12-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: devicetree@vger.kernel.org From: Alexander Stein [ Upstream commit 7d15e0c9a515494af2e3199741cdac7002928a0e ] According to binding, the compatible shall only contain imx6ul and imx21 compatibles. Fixes the dt_binding_check warning: keypad@20b8000: compatible: 'oneOf' conditional failed, one must be fixed: ['fsl,imx6ul-kpp', 'fsl,imx6q-kpp', 'fsl,imx21-kpp'] is too long Additional items are not allowed ('fsl,imx6q-kpp', 'fsl,imx21-kpp' were unexpected) Additional items are not allowed ('fsl,imx21-kpp' was unexpected) 'fsl,imx21-kpp' 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 02640c19c1ec..1474985b9908 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -541,7 +541,7 @@ fec2: ethernet@20b4000 { }; kpp: keypad@20b8000 { - compatible = "fsl,imx6ul-kpp", "fsl,imx6q-kpp", "fsl,imx21-kpp"; + compatible = "fsl,imx6ul-kpp", "fsl,imx21-kpp"; reg = <0x020b8000 0x4000>; interrupts = ; clocks = <&clks IMX6UL_CLK_KPP>; -- 2.35.1