demux: modify interrupt no for dmx 2

PD#165368: enable dmux 2 work

Change-Id: Ic21bbc30c8b2cc7eeedd9206c1f355156554646f
Signed-off-by: Chuangcheng Peng <chuangcheng.peng@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
index e8a4aa8..e4f1d96 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
@@ -1273,7 +1273,7 @@
                ts2_invert = <0>;
                interrupts = <0 23 1
                                        0 5 1
-                                       0 21 1
+                                       0 53 1
                                        0 19 1
                                        0 25 1
                                        0 18 1

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
index 53c1e49..62bd84b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts
@@ -1299,7 +1299,7 @@
                ts2_invert = <0>;
                interrupts = <0 23 1
                                        0 5 1
-                                       0 21 1
+                                       0 53 1
                                        0 19 1
                                        0 25 1
                                        0 18 1

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
index 91e8e9a..7e43cd8 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts
@@ -1298,7 +1298,7 @@
                ts2_invert = <0>;
                interrupts = <0 23 1
                                        0 5 1
-                                       0 21 1
+                                       0 53 1
                                        0 19 1
                                        0 25 1
                                        0 18 1

diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
index 0da2197..966e8c7 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
+++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts
@@ -1297,7 +1297,7 @@
                ts2_invert = <0>;
                interrupts = <0 23 1
                                        0 5 1
-                                       0 21 1
+                                       0 53 1
                                        0 19 1
                                        0 25 1
                                        0 18 1

diff --git a/include/linux/amlogic/media/utils/vdec_reg.h b/include/linux/amlogic/media/utils/vdec_reg.h
index c90e453..f258e8a 100644 (file)
--- a/include/linux/amlogic/media/utils/vdec_reg.h
+++ b/include/linux/amlogic/media/utils/vdec_reg.h
@@ -43,7 +43,7 @@
 
 #define INT_DEMUX               AM_IRQ(23)
 #define INT_DEMUX_1             AM_IRQ(5)
-#define INT_DEMUX_2             AM_IRQ(21)//AM_IRQ(53)
+#define INT_DEMUX_2             AM_IRQ(53)
 #define INT_ASYNC_FIFO_FILL     AM_IRQ(18)
 #define INT_ASYNC_FIFO_FLUSH    AM_IRQ(19)
 #define INT_ASYNC_FIFO2_FILL    AM_IRQ(24)