From 1e9ab046a201d91b5c337fbe4f873cd8d8a2c318 Mon Sep 17 00:00:00 2001 From: Chuangcheng Peng Date: Tue, 22 May 2018 15:53:22 +0800 Subject: [PATCH] demux: modify interrupt no for dmx 2 PD#165368: enable dmux 2 work Change-Id: Ic21bbc30c8b2cc7eeedd9206c1f355156554646f Signed-off-by: Chuangcheng Peng --- arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts | 2 +- arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts | 2 +- arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts | 2 +- arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts | 2 +- include/linux/amlogic/media/utils/vdec_reg.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts index e8a4aa869bb2..e4f1d96830e4 100644 --- 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 53c1e49c215c..62bd84be45a2 100644 --- 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 91e8e9acc39e..7e43cd8ac705 100644 --- 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 0da2197f157f..966e8c792272 100644 --- 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 c90e453eabc7..f258e8a561c8 100644 --- 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)