Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2811384rwb; Mon, 15 Aug 2022 11:49:32 -0700 (PDT) X-Google-Smtp-Source: AA6agR7g9x4rUSP8UrFfHxJ7cJn/+phlmoC5f9nDLmv/2nTjKhjOKhGsQYPKFm6eEk4bNJV07R36 X-Received: by 2002:a17:907:28c8:b0:730:9ccc:331f with SMTP id en8-20020a17090728c800b007309ccc331fmr10884632ejc.608.1660589372220; Mon, 15 Aug 2022 11:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660589372; cv=none; d=google.com; s=arc-20160816; b=tZ21B18Vsdu984PP0d+267l/7OcJfwwVjIvBrC+E+5zRJFktnknOB0XLpsV4mBKH0J S4WglrAiZUVCsAkl8p3G+3Aldtcy9wsAf1nz5c9Jd2Hrwc+0UQvQ4tG4u11BFff3VXvz uxEnpaz68/ndDqIfJLQoqw2O4WYM37qFcuXMcgU7efHXYIExohUu55wg+sLSdtWUYJJU akb/mamXays3Iq+z2plxuV9OIVRvlA3Lt1Tc+bVBEnsIjsABeHKHMljYs6j3ZFQJTsSo M5/7n2PMkVsQBtTLwvmTepv7JlkVDCG+RRuUATAMt2VvXxRoh8t6VEBni1eIBVK5DZmJ Nzyg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9uEsC6dYUDfg8e+VBIyL3fVikUUI3XVQZVPT7wmx5JA=; b=rhyLANtE0fkFYTNa8ZDCBJfiBjcb6QV8v+vBwSRe+kxzRLDsZC6XGnqEDvgPJBtoxi 4K0JORaMWWgMXwmhUGuXRfR8IQuD9I1ok9cGsXlPU5Gb3EOndgQzYXmTcRHMUfPKQzst nZlZp518KRSuAc4nT2alWWysqRZjcCqjNH1LaNRWPgzdD7fnTMeePWHbu/DfkHrZIOzd Rz8jgI78agNqk7i2uzWYKVU6FoTBdFn8D0TT6R7cXR64n9sEo+kwiw+5xf+ZaPDFKeFD EZJgIWCebhgeyH4m5bDxvQsJqzrXs+NZ+7EGpjuSw3sJGMlReYqvnNHWrFCcveerz8/j sEBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dZcv8hqf; 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=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lm24-20020a170906981800b0072b8cd99df7si6266464ejb.104.2022.08.15.11.49.05; Mon, 15 Aug 2022 11:49:32 -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=@linuxfoundation.org header.s=korg header.b=dZcv8hqf; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243266AbiHOScN (ORCPT + 99 others); Mon, 15 Aug 2022 14:32:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39362 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243545AbiHOSbU (ORCPT ); Mon, 15 Aug 2022 14:31:20 -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 66E0A32EC2; Mon, 15 Aug 2022 11:21:14 -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 0CDFE60F18; Mon, 15 Aug 2022 18:21:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17830C433B5; Mon, 15 Aug 2022 18:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660587669; bh=H9BOwCrBvhJ2D/pmVP5DNxKN0ES8c7NcKffve4+d2QI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dZcv8hqfgDmaewGrfF2tGih9nVzgPttP15iILozV9yiP6IzFfpasR5x60naWz5Qy0 KUp+nFgKVxGkLKlmvtvCGMpz3Sz8mlZDwNvVtaQ/BsChUeHmUPb9FpK25MnDKzed79 o34dyJprl3ZFRw/m8xaDJa0PYdnciEIcn866H+wU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Stein , Shawn Guo , Sasha Levin Subject: [PATCH 5.15 126/779] ARM: dts: imx6ul: fix keypad compatible Date: Mon, 15 Aug 2022 19:56:10 +0200 Message-Id: <20220815180342.675018411@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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