summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZelong Dong <zelong.dong@amlogic.com>2023-08-25 14:53:10 +0300
committerNeil Armstrong <neil.armstrong@linaro.org>2023-09-11 12:42:52 +0300
commitdc8bc779feb5e855421215384f23de90a4fcd622 (patch)
treed40058cf9e51d6701c01f979f8a90fefe27d401a
parent8a63d22183d0d96d742e34730430cc1f286c7092 (diff)
downloadlinux-dc8bc779feb5e855421215384f23de90a4fcd622.tar.xz
arm64: dts: meson: add IR controller for Meson-S4 SoC
Add the IR controller device of Meson-S4 SoC family. Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20230825115310.39993-4-zelong.dong@amlogic.com Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
-rw-r--r--arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts6
-rw-r--r--arch/arm64/boot/dts/amlogic/meson-s4.dtsi15
2 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
index 8ffbcb2b1ac5..c1f322c73982 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts
@@ -28,3 +28,9 @@
&uart_B {
status = "okay";
};
+
+&ir {
+ status = "okay";
+ pinctrl-0 = <&remote_pins>;
+ pinctrl-names = "default";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
index f24460186d3d..5a3abcc08ee5 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
@@ -106,6 +106,14 @@
#gpio-cells = <2>;
gpio-ranges = <&periphs_pinctrl 0 0 82>;
};
+
+ remote_pins: remote-pin {
+ mux {
+ groups = "remote_in";
+ function = "remote_in";
+ bias-disable;
+ };
+ };
};
gpio_intc: interrupt-controller@4080 {
@@ -133,6 +141,13 @@
reg = <0x0 0x2000 0x0 0x98>;
#reset-cells = <1>;
};
+
+ ir: ir@84040 {
+ compatible = "amlogic,meson-s4-ir";
+ reg = <0x0 0x84040 0x0 0x30>;
+ interrupts = <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>;
+ status = "disabled";
+ };
};
};
};