summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorVal Packett <val@packett.cool>2024-12-25 16:26:20 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-02-08 09:52:21 +0100
commitc7e2f0ee4301d512d73786f815f7f6aea148f19d (patch)
tree379bcc064492200819dd57ea4ebc72ef89609d8e /arch
parent64f51b68e296005567e80098b9abc92df5a5890b (diff)
downloadlinux-c7e2f0ee4301d512d73786f815f7f6aea148f19d.tar.gz
linux-c7e2f0ee4301d512d73786f815f7f6aea148f19d.tar.bz2
linux-c7e2f0ee4301d512d73786f815f7f6aea148f19d.zip
arm64: dts: mediatek: add per-SoC compatibles for keypad nodes
[ 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 <val@packett.cool> Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20241225192631.25017-3-val@packett.cool Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/boot/dts/mediatek/mt8183.dtsi3
-rw-r--r--arch/arm64/boot/dts/mediatek/mt8365.dtsi3
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 8721a5ffca30..d1b635514862 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 = <GIC_SPI 186 IRQ_TYPE_EDGE_FALLING>;
clocks = <&clk26m>;
diff --git a/arch/arm64/boot/dts/mediatek/mt8365.dtsi b/arch/arm64/boot/dts/mediatek/mt8365.dtsi
index 413496c92069..62c5b50d3c5f 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 = <GIC_SPI 124 IRQ_TYPE_EDGE_FALLING>;