From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80B411459F6; Wed, 5 Feb 2025 14:23:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738765435; cv=none; b=emOuarKHnYgQ/isaUnkASPRwNFw8pDQrskXt4UhiL3J+IVc4zwgkaa9J872VVT2Uqi3ADFMBNX0XfdGg8NEBrkbT9O30NUCnu3oBTxnNtHw4N2SqvjUZlVMcNPtIUVWwMMGnzebHFY2R3o2ZqlXFWV8l+eq1/Tixi/ldehvjcus= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738765435; c=relaxed/simple; bh=udzjODBlDu6sALCW1t1rG5KuCZZ/+jDG6ioQsEmAwPA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CTiG1r6ELUtwJjLRwnNUL4s7UXEdR0oqPMv2VpLpFLkmTflncuYjfPaQzrDAWOZa0GNePKsguNXYnmKXLHYZHQwjwi7+ltDFQOS6+C70RW/Q6/Aja37JL2IWy+675xGYbjs/bvEmxddzLq1e1eZnwy54FnKkjwrwo7Ohsk60vmY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ndyWfExO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ndyWfExO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 750ADC4CED1; Wed, 5 Feb 2025 14:23:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738765435; bh=udzjODBlDu6sALCW1t1rG5KuCZZ/+jDG6ioQsEmAwPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ndyWfExOhv82p9BlrUMHB+pAR+MXkPbFX1Cd0c5zBVxYer1LBpVJYojgrT3GpIAIc PKVryZWkWRNiExFOA9dEzg21JT1WxS5uZRtk7WorUyPMaYUvAY29NoD37bGXAy2B2C xYJA2upzT8QqqjWLOy3YIlamRUeurPqVdUj7Yxjo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Val Packett , Mattijs Korpershoek , AngeloGioacchino Del Regno , Sasha Levin Subject: [PATCH 6.6 267/393] arm64: dts: mediatek: add per-SoC compatibles for keypad nodes Date: Wed, 5 Feb 2025 14:43:06 +0100 Message-ID: <20250205134430.528741925@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134420.279368572@linuxfoundation.org> References: <20250205134420.279368572@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Val Packett [ Upstream commit 6139d9e9e397dc9711cf10f8f548a8f9da3b5323 ] The mt6779-keypad binding specifies using a compatible for the actual SoC before the generic MT6779 one. Fixes: a8013418d35c ("arm64: dts: mediatek: mt8183: add keyboard node") Fixes: 6ff945376556 ("arm64: dts: mediatek: Initial mt8365-evk support") Signed-off-by: Val Packett Reviewed-by: Mattijs Korpershoek Reviewed-by: AngeloGioacchino Del Regno Link: https://lore.kernel.org/r/20241225192631.25017-3-val@packett.cool Signed-off-by: AngeloGioacchino Del Regno Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/mediatek/mt8183.dtsi | 3 ++- arch/arm64/boot/dts/mediatek/mt8365.dtsi | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi index 8721a5ffca30a..d1b6355148620 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi @@ -1026,7 +1026,8 @@ }; keyboard: keyboard@10010000 { - compatible = "mediatek,mt6779-keypad"; + compatible = "mediatek,mt8183-keypad", + "mediatek,mt6779-keypad"; reg = <0 0x10010000 0 0x1000>; interrupts = ; clocks = <&clk26m>; diff --git a/arch/arm64/boot/dts/mediatek/mt8365.dtsi b/arch/arm64/boot/dts/mediatek/mt8365.dtsi index 413496c920695..62c5b50d3c5fb 100644 --- a/arch/arm64/boot/dts/mediatek/mt8365.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8365.dtsi @@ -334,7 +334,8 @@ }; keypad: keypad@10010000 { - compatible = "mediatek,mt6779-keypad"; + compatible = "mediatek,mt8365-keypad", + "mediatek,mt6779-keypad"; reg = <0 0x10010000 0 0x1000>; wakeup-source; interrupts = ; -- 2.39.5