Received: by 2002:a05:6358:e9c4:b0:b2:91dc:71ab with SMTP id hc4csp4260873rwb; Sun, 7 Aug 2022 19:39:24 -0700 (PDT) X-Google-Smtp-Source: AA6agR4CoiPpRU7EnCtN9IA7ds8jRyVGMKaWr0pPShhBYcJBBst99ZVQnElR/kZuUE2HNGW/cy3I X-Received: by 2002:a17:907:6e14:b0:730:a229:f747 with SMTP id sd20-20020a1709076e1400b00730a229f747mr12750670ejc.202.1659926364000; Sun, 07 Aug 2022 19:39:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659926363; cv=none; d=google.com; s=arc-20160816; b=uevbAIq98L4ynxbhnYN0hrUsDAad16lrI28Yu0W99gEw+ZtyTx/oM/bVCbOWcmpSa/ jpzewlcjYxPzi6fL/2n2Soffrqh6BpDdCs15m02rPRfxK6dVhHAK0FOwqCu0T9GWXYNq eR/iDHN71nb4vFP3aVed9i6ggH2Zyuf5c0hsc9qQ0jVFu+fyHfmf/fzM9iOSoNO6qgfV K69/POcKsTq5odPomM61G4KH2ivWMw6NgwMJFkltkwu8WNe2TAfc5dwexiWz8BByo5vc X3LBOxoWtFjMwW5sQAHHB8HjcXD3yw2RKG9Yiy6DWgDeVgKLBv/TbJNVNZw0/uX3JqKt 6ELg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9uEsC6dYUDfg8e+VBIyL3fVikUUI3XVQZVPT7wmx5JA=; b=Sq0Ud2yZvL258tDItQQSJKDnj5kMEYHASlgIJPl601WZMQjnB7gcZkaiNpLkVw1sxp 4MClEoTz4rQaG0Nl1O/d7tPgLqqPH4iLpmrrZfNZjNC274YfIyrE/eiDo7SaibZfjqy7 5nTqOFF/LKMi53SQizgjWgFI828NewR8cs2ZCn58HlLnbdUbvlNSJ7wTlWR+jR1xyQzq m63smk7hy8Ey+6mWen5E769ZPNGUhIznNbSJQxi6s7bhM2V3PdPt9tsXWUZV1tPcWOrz slVdAZVnExETi2EPPlBvFHYs3Qol12dIONpBikhpRG7eIem5XJEEWw7/Udmd8+5lwMD8 qU5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=i21v7z52; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dr7-20020a170907720700b007305b582b36si9534507ejc.469.2022.08.07.19.38.59; Sun, 07 Aug 2022 19:39:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=i21v7z52; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242261AbiHHBeo (ORCPT + 99 others); Sun, 7 Aug 2022 21:34:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241924AbiHHBdc (ORCPT ); Sun, 7 Aug 2022 21:33:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94648BC1F; Sun, 7 Aug 2022 18:32:44 -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 05CCC60DE1; Mon, 8 Aug 2022 01:32:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D7A0C433B5; Mon, 8 Aug 2022 01:32:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922363; bh=H9BOwCrBvhJ2D/pmVP5DNxKN0ES8c7NcKffve4+d2QI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i21v7z52ASlKFBK6g5dB3tvTh89kh2OUl+i/dYGYXuNX6k5fuCZeoBOA1gogUMylZ Epo9WJIA/ietxQX5oppfDqcJTbdrKwLt+DSiSyVB7zyxdEL5ohG94gA73xraJn8BZh rChfrR02hdsQKRmT3MwphwoTZzw62zSD2VOLaEMlfoC37BgXPuyyIazpHSwbwznUDJ ZesQ4vXlfZtuB/9HGSUTNNOkYGsDqMNKRJxqqHBBI9Y7sgdTy1uD6w/J6ITHvbe9Ib 7TLcRZsq9xDY1CX8So1j4xitys02CjMyjchktGdPMW1KOgs4AV0VRDCPNcc9W9kahP 4oKMdz4tBBx8g== 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.19 25/58] ARM: dts: imx6ul: fix keypad compatible Date: Sun, 7 Aug 2022 21:30:43 -0400 Message-Id: <20220808013118.313965-25-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013118.313965-1-sashal@kernel.org> References: <20220808013118.313965-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 2fcbd9d91521..df8b4ad62418 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -544,7 +544,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