From b6243e7e3d8ed57e35d4dd3949b92c98523cfabd Mon Sep 17 00:00:00 2001
From: Bichao Zheng <bichao.zheng@amlogic.com>
Date: Thu, 18 Jul 2019 14:42:25 +0800
Subject: [PATCH] irblaster: add irblaster support for tm2 t312 [1/1]

PD#SWPL-9909

Problem:
Need add irblaster support for tm2 T312.

Solution:
1. Enable irblaster controller.
2. Mux GPIOAO_4 to IR_REMOTE_OUT.

Verify:
verified on tm2 t96e2

Change-Id: If40c84c0dff0c1d771cd6bccc1c3ac5af8e728fd
Signed-off-by: Bichao Zheng <bichao.zheng@amlogic.com>
---
 arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts   | 5 +++++
 arch/arm64/boot/dts/amlogic/mesontm2.dtsi       | 5 +++--
 arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts
index e9904a1b304c..b3bb67d41bfe 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts
@@ -2142,3 +2142,8 @@
 	status = "okay";
 };
 
+&irblaster {
+	pinctrl-names = "default";
+	pinctrl-0 = <&irblaster_pins>;
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
index 559570c4d29b..e0f0be06489b 100644
--- a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
@@ -957,11 +957,12 @@
 				max_frame_time = <200>;
 			};
 
-			meson_irblaster: irblaster@14c {
+			irblaster: meson-irblaster@14c {
 				compatible = "amlogic, meson_irblaster";
 				reg = <0x0 0x14c 0x0 0x10>,
 					<0x0 0x40 0x0 0x4>;
-				interrupts = <0 198 1>;
+				#irblaster-cells = <2>;
+				interrupts = <GIC_SPI 198 IRQ_TYPE_EDGE_RISING>;
 				status = "disabled";
 			};
 
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts
index 99a3ec30905a..2c150bf97a2b 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts
@@ -2133,3 +2133,8 @@
 	status = "okay";
 };
 
+&irblaster {
+	pinctrl-names = "default";
+	pinctrl-0 = <&irblaster_pins>;
+	status = "okay";
+};