diff --git a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
index caa1bec43750..3cc6a7aa4698 100644
--- a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
@@ -235,7 +235,7 @@
 		#size-cells=<1>;
 		ranges;
 		io_cbus_base {
-			reg = <0xffd00000 0x26000>;
+			reg = <0xffd00000 0x26fff>;
 		};
 		io_apb_base {
 			reg = <0xffe01000 0x7f000>;
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 432798ae9860..20a2067a7459 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -719,6 +719,48 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
+	dvb {
+		compatible = "amlogic, dvb";
+		dev_name = "dvb";
+		status = "okay";
+//		fe0_mode = "internal";
+//		fe0_tuner = <&tuner>;
+		/*"parallel","serial","disable"*/
+//		ts2 = "parallel";
+//		ts2_control = <0>;
+//		ts2_invert = <0>;
+		interrupts = <0 23 1
+					0 5 1
+					0 53 1
+					0 19 1
+					0 25 1
+					0 18 1
+					0 24 1>;
+		interrupt-names = "demux0_irq",
+						"demux1_irq",
+						"demux2_irq",
+						"dvr0_irq",
+						"dvr1_irq",
+						"dvrfill0_fill",
+						"dvrfill1_flush";
+		clocks = <&clkc CLKID_DEMUX
+			&clkc CLKID_AHB_ARB0
+			&clkc CLKID_DOS_PARSER>;
+		clock-names = "demux", "ahbarb0", "uparsertop";
+	};
+	tuner: tuner {
+		compatible = "amlogic, tuner";
+		status = "okay";
+		tuner_name = "mxl661_tuner";
+		tuner_i2c_adap = <&i2c1>;
+		tuner_i2c_addr = <0x60>;
+		tuner_xtal = <0>; /* 0: 16MHz, 1: 24MHz */
+		tuner_xtal_mode = <0>;
+					/* NO_SHARE_XTAL(0)
+					 * SLAVE_XTAL_SHARE(1)
+					 */
+		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
+	};
 
 	p_tsensor: p_tsensor@ff634800 {
 		compatible = "amlogic, r1p1-tsensor";
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
index c058c5169265..fc0ea05c4eee 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -719,6 +719,48 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
+	dvb {
+		compatible = "amlogic, dvb";
+		dev_name = "dvb";
+		status = "okay";
+//		fe0_mode = "internal";
+//		fe0_tuner = <&tuner>;
+		/*"parallel","serial","disable"*/
+//		ts2 = "parallel";
+//		ts2_control = <0>;
+//		ts2_invert = <0>;
+		interrupts = <0 23 1
+					0 5 1
+					0 53 1
+					0 19 1
+					0 25 1
+					0 18 1
+					0 24 1>;
+		interrupt-names = "demux0_irq",
+						"demux1_irq",
+						"demux2_irq",
+						"dvr0_irq",
+						"dvr1_irq",
+						"dvrfill0_fill",
+						"dvrfill1_flush";
+		clocks = <&clkc CLKID_DEMUX
+			&clkc CLKID_AHB_ARB0
+			&clkc CLKID_DOS_PARSER>;
+		clock-names = "demux", "ahbarb0", "uparsertop";
+	};
+	tuner: tuner {
+		compatible = "amlogic, tuner";
+		status = "okay";
+		tuner_name = "mxl661_tuner";
+		tuner_i2c_adap = <&i2c1>;
+		tuner_i2c_addr = <0x60>;
+		tuner_xtal = <0>; /* 0: 16MHz, 1: 24MHz */
+		tuner_xtal_mode = <0>;
+					/* NO_SHARE_XTAL(0)
+					 * SLAVE_XTAL_SHARE(1)
+					 */
+		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
+	};
 
 	p_tsensor: p_tsensor@ff634800 {
 		compatible = "amlogic, r1p1-tsensor";
diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
index 445697e486e9..24f1a9f0ee7d 100644
--- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
@@ -235,7 +235,7 @@
 		#size-cells=<2>;
 		ranges;
 		io_cbus_base {
-			reg = <0x0 0xffd00000 0x0 0x26000>;
+			reg = <0x0 0xffd00000 0x0 0x26fff>;
 		};
 		io_apb_base {
 			reg = <0x0 0xffe01000 0x0 0x7f000>;
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
index ec9e69452f14..d162d6508e17 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -717,6 +717,48 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
+	dvb {
+		compatible = "amlogic, dvb";
+		dev_name = "dvb";
+		status = "okay";
+//		fe0_mode = "internal";
+//		fe0_tuner = <&tuner>;
+		/*"parallel","serial","disable"*/
+//		ts2 = "parallel";
+//		ts2_control = <0>;
+//		ts2_invert = <0>;
+		interrupts = <0 23 1
+					0 5 1
+					0 53 1
+					0 19 1
+					0 25 1
+					0 18 1
+					0 24 1>;
+		interrupt-names = "demux0_irq",
+						"demux1_irq",
+						"demux2_irq",
+						"dvr0_irq",
+						"dvr1_irq",
+						"dvrfill0_fill",
+						"dvrfill1_flush";
+		clocks = <&clkc CLKID_DEMUX
+			&clkc CLKID_AHB_ARB0
+			&clkc CLKID_DOS_PARSER>;
+		clock-names = "demux", "ahbarb0", "uparsertop";
+	};
+	tuner: tuner {
+		compatible = "amlogic, tuner";
+		status = "okay";
+		tuner_name = "mxl661_tuner";
+		tuner_i2c_adap = <&i2c1>;
+		tuner_i2c_addr = <0x60>;
+		tuner_xtal = <0>; /* 0: 16MHz, 1: 24MHz */
+		tuner_xtal_mode = <0>;
+					/* NO_SHARE_XTAL(0)
+					 * SLAVE_XTAL_SHARE(1)
+					 */
+		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
+	};
 
 
 	p_tsensor: p_tsensor@ff634800 {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
index a35344ade063..5bb7ab69d74f 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -717,6 +717,48 @@
 		status = "disabled";
 	};
 	/* Audio Related end */
+	dvb {
+		compatible = "amlogic, dvb";
+		dev_name = "dvb";
+		status = "okay";
+//		fe0_mode = "internal";
+//		fe0_tuner = <&tuner>;
+		/*"parallel","serial","disable"*/
+//		ts2 = "parallel";
+//		ts2_control = <0>;
+//		ts2_invert = <0>;
+		interrupts = <0 23 1
+					0 5 1
+					0 53 1
+					0 19 1
+					0 25 1
+					0 18 1
+					0 24 1>;
+		interrupt-names = "demux0_irq",
+						"demux1_irq",
+						"demux2_irq",
+						"dvr0_irq",
+						"dvr1_irq",
+						"dvrfill0_fill",
+						"dvrfill1_flush";
+		clocks = <&clkc CLKID_DEMUX
+			&clkc CLKID_AHB_ARB0
+			&clkc CLKID_DOS_PARSER>;
+		clock-names = "demux", "ahbarb0", "uparsertop";
+	};
+	tuner: tuner {
+		compatible = "amlogic, tuner";
+		status = "okay";
+		tuner_name = "mxl661_tuner";
+		tuner_i2c_adap = <&i2c1>;
+		tuner_i2c_addr = <0x60>;
+		tuner_xtal = <0>; /* 0: 16MHz, 1: 24MHz */
+		tuner_xtal_mode = <0>;
+					/* NO_SHARE_XTAL(0)
+					 * SLAVE_XTAL_SHARE(1)
+					 */
+		tuner_xtal_cap = <30>; /* when tuner_xtal_mode = 1, set 25 */
+	};
 
 	p_tsensor: p_tsensor@ff634800 {
 		compatible = "amlogic, r1p1-tsensor";
diff --git a/include/uapi/linux/dvb/ca.h b/include/uapi/linux/dvb/ca.h
index e7902227ece9..69ef406f730e 100644
--- a/include/uapi/linux/dvb/ca.h
+++ b/include/uapi/linux/dvb/ca.h
@@ -82,12 +82,26 @@ enum ca_cw_type {
 	CA_CW_AES_EVEN,
 	CA_CW_AES_ODD,
 	CA_CW_AES_EVEN_IV,
-	CA_CW_AES_ODD_IV
+	CA_CW_AES_ODD_IV,
+	CA_CW_DES_EVEN,
+	CA_CW_DES_ODD,
+	CA_CW_SM4_EVEN,
+	CA_CW_SM4_ODD,
+	CA_CW_SM4_EVEN_IV,
+	CA_CW_SM4_ODD_IV,
+	CA_CW_TYPE_MAX
+};
+
+enum ca_dsc_mode {
+	CA_DSC_CBC = 1,
+	CA_DSC_ECB,
+	CA_DSC_IDSA
 };
 
 struct ca_descr_ex {
 	unsigned int index;
 	enum ca_cw_type type;
+	enum ca_dsc_mode mode;
 	int          flags;
 #define CA_CW_FROM_KL 1
 	unsigned char cw[16];