Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3022963rwb; Mon, 15 Aug 2022 16:20:28 -0700 (PDT) X-Google-Smtp-Source: AA6agR55OQhv8kH6jsAliIF7SNmgUIPOWTyCn1KzR2dWL/qRiFBhxM7IQwTWB4tOV9CeBL7JxdbK X-Received: by 2002:a05:6402:280f:b0:43d:f946:a895 with SMTP id h15-20020a056402280f00b0043df946a895mr16715057ede.229.1660605628307; Mon, 15 Aug 2022 16:20:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660605628; cv=none; d=google.com; s=arc-20160816; b=JJViKGr3We2yMXoh8hg0mpGf2O736/Jtye8UcLswUwxFSzS6I2j9dtuf4u/erZYrGP KvVGs1VejbfGqGsZeSU1fiGd/r+1yt+6Or6zpMeYfcmdQUNt5keAHcFrb/JF64kAsPjW VKxKi2RofrGFtqanoguWiLmxFUIRnM075OZ8Ih3vj85TJ07z/OtNqIPDj4TC2ZiSNdF5 PeHSu16EkZ67R8Ha0B4ZaoL3aVaxmOWMCUejR/jefoBQAZ40UwNYZtHfiLtqQpbdNXx/ iaPBCe9npzLHX3IM3vrENG8AjjO/KVBiI4ME7MgkE4B9C4DanQk+07xIvutWG9FU9QrN pSAA== 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=c7/d4mh8o9r2FTUD57twRnEli5vHwCRoarzja76sw209zNiuW7EGZN/5WKDAzAVg7K h5VJXVaZsSj68IR6j9TBs1UvVdJT+QBcNgUj+q8iyomcJ+JlTSiv9iewybzORlEgEbS6 7+WMo1YSHCsOYexfldFTzi27gOc8nrsVcFy4mRPMIZpxaHfQ3BqNb70qv0IXVtyWXx1v pE6okuLC2C9yyd/ApE4Msqd9EIF0ryB0oghrlBpyB8QUEjtwuvm9Vjyrs9g58D8/bM6P 2WVvXClyh3BEI3bmX6wMJ7WBSlqQPUDBAQMLW7dlHsRoZ5uxsvI834bW+1g0Uwsgcb/k XrfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cymIhDya; 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 v13-20020a056402348d00b0043e85391923si10034483edc.55.2022.08.15.16.20.03; Mon, 15 Aug 2022 16:20:28 -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=cymIhDya; 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 S1349878AbiHOWeO (ORCPT + 99 others); Mon, 15 Aug 2022 18:34:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351051AbiHOW1b (ORCPT ); Mon, 15 Aug 2022 18:27:31 -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 4E41341D0F; Mon, 15 Aug 2022 12:46:32 -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 C58F46122B; Mon, 15 Aug 2022 19:46:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7253C433B5; Mon, 15 Aug 2022 19:46:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660592791; bh=H9BOwCrBvhJ2D/pmVP5DNxKN0ES8c7NcKffve4+d2QI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cymIhDyaGbKjVBRgmDvNYb4O3hJ2LtTmjT00lmfLPWWcP9AHWZ2Gfschra6VJ1YtB 2Y/6R5zI+j9p1M+DAf6/IecN3HnJLnzO1OHFxlFEIwBI9FZ8F5Sjs5KyVn3ozQ0hFB DJKyGIFHrWEYSlqd92zFx27ZHXHL0bMRZ8x1SZE8= 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.19 0165/1157] ARM: dts: imx6ul: fix keypad compatible Date: Mon, 15 Aug 2022 19:52:01 +0200 Message-Id: <20220815180446.290781551@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@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