lcd: tcon: add p2p usit support [1/2]

PD#SWPL-17888

Problem:
don't support p2p usit before for tl1

Solution:
add add p2p usit support

Verify:
x301, ab301

Change-Id: Ifb0f7d5779cb201c9156fb4b89c05d6625e6815b
Signed-off-by: Evoke Zhang <evoke.zhang@amlogic.com>

9 files changed, 36 insertions, 1 deletions

diff --git a/board/amlogic/tl1_skt_v1/lcd.c b/board/amlogic/tl1_skt_v1/lcd.c
index b59b5d8..e4cd7b5 100644
--- a/board/amlogic/tl1_skt_v1/lcd.c
+++ b/board/amlogic/tl1_skt_v1/lcd.c
@@ -244,6 +244,11 @@ static struct lcd_pinmux_ctrl_s lcd_pinmux_ctrl[LCD_PINMX_MAX] = {
 		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
 	},
 	{
+		.name = "lcd_p2p_usit_pin", //GPIOH_0~19
+		.pinmux_set = {{7, 0x11111111}, {8, 0x11111111}, {9, 0x2}, {LCD_PINMUX_END, 0x0}},
+		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
+	},
+	{
 		.name = "invalid",
 	},
 };
diff --git a/board/amlogic/tl1_t309_v1/lcd.c b/board/amlogic/tl1_t309_v1/lcd.c
index fa002c4..db14842 100644
--- a/board/amlogic/tl1_t309_v1/lcd.c
+++ b/board/amlogic/tl1_t309_v1/lcd.c
@@ -264,6 +264,11 @@ static struct lcd_pinmux_ctrl_s lcd_pinmux_ctrl[LCD_PINMX_MAX] = {
 		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
 	},
 	{
+		.name = "lcd_p2p_usit_pin", //GPIOH_0~19
+		.pinmux_set = {{7, 0x11111111}, {8, 0x11111111}, {9, 0x2}, {LCD_PINMUX_END, 0x0}},
+		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
+	},
+	{
 		.name = "invalid",
 	},
 };
diff --git a/board/amlogic/tl1_x301_v1/lcd.c b/board/amlogic/tl1_x301_v1/lcd.c
index 67e63d5..6577fa8 100644
--- a/board/amlogic/tl1_x301_v1/lcd.c
+++ b/board/amlogic/tl1_x301_v1/lcd.c
@@ -264,6 +264,11 @@ static struct lcd_pinmux_ctrl_s lcd_pinmux_ctrl[LCD_PINMX_MAX] = {
 		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
 	},
 	{
+		.name = "lcd_p2p_usit_pin", //GPIOH_0~19
+		.pinmux_set = {{7, 0x11111111}, {8, 0x11111111}, {9, 0x2}, {LCD_PINMUX_END, 0x0}},
+		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
+	},
+	{
 		.name = "invalid",
 	},
 };
diff --git a/board/amlogic/tm2_t962x3_ab301_v1/lcd.c b/board/amlogic/tm2_t962x3_ab301_v1/lcd.c
index 67e63d5..6577fa8 100644
--- a/board/amlogic/tm2_t962x3_ab301_v1/lcd.c
+++ b/board/amlogic/tm2_t962x3_ab301_v1/lcd.c
@@ -264,6 +264,11 @@ static struct lcd_pinmux_ctrl_s lcd_pinmux_ctrl[LCD_PINMX_MAX] = {
 		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
 	},
 	{
+		.name = "lcd_p2p_usit_pin", //GPIOH_0~19
+		.pinmux_set = {{7, 0x11111111}, {8, 0x11111111}, {9, 0x2}, {LCD_PINMUX_END, 0x0}},
+		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
+	},
+	{
 		.name = "invalid",
 	},
 };
diff --git a/board/amlogic/tm2_t962x3_ab309_v1/lcd.c b/board/amlogic/tm2_t962x3_ab309_v1/lcd.c
index b59b5d8..e4cd7b5 100644
--- a/board/amlogic/tm2_t962x3_ab309_v1/lcd.c
+++ b/board/amlogic/tm2_t962x3_ab309_v1/lcd.c
@@ -244,6 +244,11 @@ static struct lcd_pinmux_ctrl_s lcd_pinmux_ctrl[LCD_PINMX_MAX] = {
 		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
 	},
 	{
+		.name = "lcd_p2p_usit_pin", //GPIOH_0~19
+		.pinmux_set = {{7, 0x11111111}, {8, 0x11111111}, {9, 0x2}, {LCD_PINMUX_END, 0x0}},
+		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
+	},
+	{
 		.name = "invalid",
 	},
 };
diff --git a/board/amlogic/tm2_t962x3_t312_v1/lcd.c b/board/amlogic/tm2_t962x3_t312_v1/lcd.c
index 67e63d5..6577fa8 100644
--- a/board/amlogic/tm2_t962x3_t312_v1/lcd.c
+++ b/board/amlogic/tm2_t962x3_t312_v1/lcd.c
@@ -264,6 +264,11 @@ static struct lcd_pinmux_ctrl_s lcd_pinmux_ctrl[LCD_PINMX_MAX] = {
 		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
 	},
 	{
+		.name = "lcd_p2p_usit_pin", //GPIOH_0~19
+		.pinmux_set = {{7, 0x11111111}, {8, 0x11111111}, {9, 0x2}, {LCD_PINMUX_END, 0x0}},
+		.pinmux_clr = {{7, 0xffffffff}, {8, 0xffffffff}, {9, 0xfffff}, {LCD_PINMUX_END, 0x0}},
+	},
+	{
 		.name = "invalid",
 	},
 };
diff --git a/drivers/display/lcd/aml_lcd_common.c b/drivers/display/lcd/aml_lcd_common.c
index c192bd4..0d5c0bc 100644
--- a/drivers/display/lcd/aml_lcd_common.c
+++ b/drivers/display/lcd/aml_lcd_common.c
@@ -670,7 +670,10 @@ static int lcd_pinmux_load_from_bsp(struct lcd_config_s *pconf)
 		}
 		break;
 	case LCD_P2P:
-		sprintf(propname, "lcd_p2p_pin");
+		if (pconf->lcd_control.p2p_config->p2p_type == P2P_USIT)
+			sprintf(propname, "lcd_p2p_usit_pin");
+		else
+			sprintf(propname, "lcd_p2p_pin");
 		pinmux = pconf->lcd_pinmux;
 		for (i = 0; i < LCD_PINMX_MAX; i++) {
 			if (pinmux == NULL)
diff --git a/drivers/display/lcd/aml_lcd_tcon.c b/drivers/display/lcd/aml_lcd_tcon.c
index dd9a817..a633bae 100644
--- a/drivers/display/lcd/aml_lcd_tcon.c
+++ b/drivers/display/lcd/aml_lcd_tcon.c
@@ -482,6 +482,7 @@ static int lcd_tcon_top_set_tl1(struct lcd_config_s *pconf)
 	if (pconf->lcd_basic.lcd_type == LCD_P2P) {
 		switch (pconf->lcd_control.p2p_config->p2p_type) {
 		case P2P_CHPI:
+		case P2P_USIT:
 			lcd_tcon_write(TCON_TOP_CTRL, 0x8199);
 			break;
 		default:
diff --git a/drivers/display/lcd/lcd_tv/lcd_drv.c b/drivers/display/lcd/lcd_tv/lcd_drv.c
index 5904d6e..74fe498 100644
--- a/drivers/display/lcd/lcd_tv/lcd_drv.c
+++ b/drivers/display/lcd/lcd_tv/lcd_drv.c
@@ -930,6 +930,7 @@ static void lcd_p2p_control_set(struct lcd_config_s *pconf)
 	/* phy_div: 0=div6, 1=div 7, 2=div8, 3=div10 */
 	switch (pconf->lcd_control.p2p_config->p2p_type) {
 	case P2P_CHPI: /* 8/10 coding */
+	case P2P_USIT:
 		phy_div = 3;
 		break;
 	default: