Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2895611rwb; Mon, 15 Aug 2022 13:31:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR75GFgjHEGM6B65rXVDhH5hOEuWtAS+1fP6IM1eCyatcWnZ6+N1JAdEZ5Jn6Hrow/FMYaA4 X-Received: by 2002:a05:6402:50cb:b0:440:87d4:3ad2 with SMTP id h11-20020a05640250cb00b0044087d43ad2mr15924757edb.219.1660595481354; Mon, 15 Aug 2022 13:31:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660595481; cv=none; d=google.com; s=arc-20160816; b=F+j+mJtwiXab7obdICQmTqqbB8KCw+sGfs2Hdmtc8PhpkHOLL1TXHLvo+9hanHtrNB Kes0QcVQ5DEnJ7DO//pnggFTv6ALtGvGobA+ohu3Zys3e4yQVua0XRDqa7sb2eGRHXbn FkyaH4Nc692koSOkA10ePtFN0I5njJsvSSvDjhgaXXh/SU7BWxr98CqNdmxtcwC7vEzZ q9dvlCu2tUaPmDssRus23X46c29K8Uj11OdUmugfuI66GIju+csqrw5nFmlElTZiZPP4 nutqmin+qcclcCxn2cmFH5wMImVZtWFiCkmk4kyJ8znL0Kfx8vG5nHXQflwbobQD39pQ 9Kbw== 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=Hdsqmww0XybAPX+8rZBNCF0ubxf0tf3jwT+JMzcXE615N5G3+vQluFh/aOkGCSdfBo 1t+vxbyLnWf8rR0z/FshUs8msPTQw5C84QW5u/TjWUIt6tLX7h6pHI/fYpKFhCx/SJcx K1JweTtawDrdN/Ojx5MjTFDhdd7lmnoSPEGf0/2OlsID/NDTEO/WcQ5dGGwpfV10WVZ2 enwQVuBpRp+8UPzYwER/ga0Nbf5f4BoY2n4I+UHzLiHeDWsMPEHVKh7hB08khDUykOaa 1wo+KV2fSTmZ7nw0I9z2zTQuRngrauKxU0wdJUmpqlGeLo0S+oodFwqSHYADCPN9bDyS 1T9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ixSfGsj0; 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 dd15-20020a1709069b8f00b007306645a7absi7636526ejc.849.2022.08.15.13.30.53; Mon, 15 Aug 2022 13:31:21 -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=ixSfGsj0; 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 S232349AbiHOU2X (ORCPT + 99 others); Mon, 15 Aug 2022 16:28:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347257AbiHOUWI (ORCPT ); Mon, 15 Aug 2022 16:22:08 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CC024B0FD; Mon, 15 Aug 2022 12:01:46 -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 ams.source.kernel.org (Postfix) with ESMTPS id 4AF0EB810A1; Mon, 15 Aug 2022 19:01:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A68CC433C1; Mon, 15 Aug 2022 19:01:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660590104; bh=H9BOwCrBvhJ2D/pmVP5DNxKN0ES8c7NcKffve4+d2QI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ixSfGsj0HRGeNoj65W6aeMM6mcUmYDQJ2CTZHgPIILMVS158YQXuRd4g3PcO5nikJ pQ+S30Yym5LgJWeet7NBxOJtPuR0m5gzS+7tMXw0brjW53xEIUgebOAVs/VPBmEvdM qnLCYZ/Kfn8i09qpz14xeySM4zXBkRfHt4wk/jkQ= 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.18 0152/1095] ARM: dts: imx6ul: fix keypad compatible Date: Mon, 15 Aug 2022 19:52:31 +0200 Message-Id: <20220815180435.871283446@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@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