dts: add video11 and video12 for screencontrol [2/6]

PD#SWPL-13022

Problem:
mbox needs to support screencontrol

Solution:
add video11 and video12 node

Verify:
SM1-AC202

Change-Id: Idac331731c6c3b7666ba5335a5341b14b13b6f8f
Signed-off-by: huijie.huang <huijie.huang@amlogic.com>
This commit is contained in:
huijie.huang
2019-08-28 13:21:22 +08:00
committed by Luan Yuan
parent 684ee0c109
commit e7c5b28ea3
33 changed files with 442 additions and 17 deletions

View File

@@ -303,6 +303,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -307,6 +307,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -303,6 +303,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -307,6 +307,22 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -318,6 +318,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
/*dvb {
* compatible = "amlogic, dvb";
* dev_name = "dvb";

View File

@@ -316,6 +316,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
/*dvb {
* compatible = "amlogic, dvb";
* dev_name = "dvb";
@@ -353,6 +370,23 @@
* clock-names = "demux", "ahbarb0", "parser_top";
*};
*/
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
unifykey{
compatible = "amlogic, unifykey";
status = "ok";

View File

@@ -317,6 +317,22 @@
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
gpio_keypad {
compatible = "amlogic, gpio_keypad";
status = "okay";

View File

@@ -317,6 +317,22 @@
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
gpio_keypad {
compatible = "amlogic, gpio_keypad";
status = "okay";

View File

@@ -1189,7 +1189,7 @@
compatible = "amlogic, ge2d-g12a";
dev_name = "ge2d";
status = "okay";
interrupts = <0 146 1>;
interrupts = <0 150 1>;
interrupt-names = "ge2d";
clocks = <&clkc CLKID_VAPB_MUX>,
<&clkc CLKID_G2D>,

View File

@@ -1256,7 +1256,7 @@
compatible = "amlogic, ge2d-g12a";
dev_name = "ge2d";
status = "okay";
interrupts = <0 146 1>;
interrupts = <0 150 1>;
interrupt-names = "ge2d";
clocks = <&clkc CLKID_VAPB_MUX>,
<&clkc CLKID_G2D>,

View File

@@ -1251,7 +1251,7 @@
compatible = "amlogic, ge2d-g12a";
dev_name = "ge2d";
status = "okay";
interrupts = <0 146 1>;
interrupts = <0 150 1>;
interrupt-names = "ge2d";
clocks = <&clkc CLKID_VAPB_MUX>,
<&clkc CLKID_G2D>,

View File

@@ -1215,7 +1215,7 @@
compatible = "amlogic, ge2d-sm1";
dev_name = "ge2d";
status = "okay";
interrupts = <0 146 1>;
interrupts = <0 150 1>;
interrupt-names = "ge2d";
clocks = <&clkc CLKID_VAPB_MUX>,
<&clkc CLKID_G2D>,

View File

@@ -306,6 +306,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -306,6 +306,21 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -306,6 +306,21 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -332,6 +332,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
dvb {
compatible = "amlogic, dvb";
dev_name = "dvb";

View File

@@ -302,6 +302,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -301,6 +301,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -302,6 +302,21 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -301,6 +301,21 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -318,6 +318,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
/*dvb {
* compatible = "amlogic, dvb";
* dev_name = "dvb";

View File

@@ -312,6 +312,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
/*dvb {
* compatible = "amlogic, dvb";
* dev_name = "dvb";
@@ -349,6 +366,23 @@
* clock-names = "demux", "ahbarb0", "parser_top";
*};
*/
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
unifykey{
compatible = "amlogic, unifykey";
status = "ok";

View File

@@ -318,6 +318,22 @@
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
gpio_keypad {
compatible = "amlogic, gpio_keypad";
status = "okay";

View File

@@ -318,6 +318,22 @@
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
gpio_keypad {
compatible = "amlogic, gpio_keypad";
status = "okay";

View File

@@ -1188,7 +1188,7 @@
compatible = "amlogic, ge2d-g12a";
dev_name = "ge2d";
status = "okay";
interrupts = <0 146 1>;
interrupts = <0 150 1>;
interrupt-names = "ge2d";
clocks = <&clkc CLKID_VAPB_MUX>,
<&clkc CLKID_G2D>,

View File

@@ -1256,7 +1256,7 @@
compatible = "amlogic, ge2d-g12a";
dev_name = "ge2d";
status = "okay";
interrupts = <0 146 1>;
interrupts = <0 150 1>;
interrupt-names = "ge2d";
clocks = <&clkc CLKID_VAPB_MUX>,
<&clkc CLKID_G2D>,

View File

@@ -1251,7 +1251,7 @@
compatible = "amlogic, ge2d-g12a";
dev_name = "ge2d";
status = "okay";
interrupts = <0 146 1>;
interrupts = <0 150 1>;
interrupt-names = "ge2d";
clocks = <&clkc CLKID_VAPB_MUX>,
<&clkc CLKID_G2D>,

View File

@@ -1214,7 +1214,7 @@
compatible = "amlogic, ge2d-sm1";
dev_name = "ge2d";
status = "okay";
interrupts = <0 146 1>;
interrupts = <0 150 1>;
interrupt-names = "ge2d";
clocks = <&clkc CLKID_VAPB_MUX>,
<&clkc CLKID_G2D>,

View File

@@ -304,6 +304,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -304,6 +304,21 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -304,6 +304,21 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -366,6 +366,23 @@
dev_name = "ionvideo";
status = "okay";
};
amlvideo2_0 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <0>;
cma_mode = <1>;
};
amlvideo2_1 {
compatible = "amlogic, amlvideo2";
dev_name = "amlvideo2";
status = "okay";
amlvideo2_id = <1>;
cma_mode = <1>;
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;

View File

@@ -77,7 +77,8 @@
/* #define USE_SEMA_QBUF */
/* #define USE_VDIN_PTS */
/* #define MULTI_NODE */
#define MULTI_NODE
#ifdef MULTI_NODE
#define MAX_SUB_DEV_NODE 2
#else
@@ -4647,8 +4648,8 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
#ifdef PREVIOUS_VOUT_MODE
static enum tvin_scan_mode_e vmode2scan_mode(enum vmode_e mode)
{
enum tvin_scan_mode_e scan_mode =
TVIN_SCAN_MODE_NULL;/* 1: progressive 2:interlaced */
enum tvin_scan_mode_e scan_mode = TVIN_SCAN_MODE_PROGRESSIVE;
//TVIN_SCAN_MODE_NULL;/* 1: progressive 2:interlaced */
switch (mode) {
case VMODE_480I:
@@ -4719,7 +4720,6 @@ static int amlvideo2_stop_tvin_service(struct amlvideo2_node *node)
vops->stop_tvin_service(node->vdin_device_num);
}
node->start_vdin_flag = 0;
return ret;
}
@@ -4733,7 +4733,7 @@ static int amlvideo2_start_tvin_service(struct amlvideo2_node *node)
vinfo = get_current_vinfo();
if ((!node->start_vdin_flag) || (node->r_type != AML_RECEIVER_NONE))
if (node->r_type != AML_RECEIVER_NONE)
goto start;
if (amlvideo2_dbg_en)
@@ -4882,7 +4882,7 @@ int amlvideo2_notify_callback(struct notifier_block *block, unsigned long cmd,
/* if local queue have vf , should give back to provider */
if (vfq_empty(&node->q_ready)) {
if (amlvideo2_dbg_en)
if (amlvideo2_dbg_en & 4)
pr_info("q_ready is empty .\n");
} else {
recycle_vf = vfq_pop(&node->q_ready);
@@ -4890,12 +4890,12 @@ int amlvideo2_notify_callback(struct notifier_block *block, unsigned long cmd,
vf_put(recycle_vf, node->recv.name);
recycle_vf = vfq_pop(&node->q_ready);
}
if (amlvideo2_dbg_en)
if (amlvideo2_dbg_en & 4)
pr_info("already flush local vf .\n");
}
/*debug provider vf state*/
if (amlvideo2_dbg_en) {
if (amlvideo2_dbg_en & 4) {
ret = vf_get_states(vfp, &states);
if (ret == 0) {
pr_info("vf_pool_size = %d, buf_free_num = %d .\n",
@@ -4913,7 +4913,7 @@ int amlvideo2_notify_callback(struct notifier_block *block, unsigned long cmd,
if (node->r_type == AML_RECEIVER_NONE)
amlvideo2_start_thread(node->fh);
msleep(500);
ret = amlvideo2_start_tvin_service(node);
if (ret < 0) {