shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

cec: cec bringup for tm2 [1/1]

Browse Source 
PD#SWPL-6945

Problem:
bringup for tm2

Solution:
add chip support and modify dts

Verify:
tm2

Change-Id: I718c3b81912a3555e19866f96d392bfb09d27384
Signed-off-by: Yong Qin <yong.qin@amlogic.com>
This commit is contained in:
Yong Qin
2019-04-10 16:37:54 +08:00
committed by Dongjin Kim
parent 43cc425ff6
commit cfd8ed74ce
12 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/boot/dts/amlogic/tm2_pxp.dts
View File

@@ -548,7 +548,7 @@
};
aocec: aocec {
compatible = "amlogic, aocec-tl1";
compatible = "amlogic, aocec-tm2";
/*device_name = "aocec";*/
status = "okay";
vendor_name = "Amlogic"; /* Max Chars: 8 */
@@ -556,10 +556,12 @@
* http://standards.ieee.org/develop/regauth/oui/oui.txt
*/
vendor_id = <0x000000>;
product_desc = "TL1"; /* Max Chars: 16 */
product_desc = "TM2"; /* Max Chars: 16 */
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <3>;
ee_cec;
/*cec_sel = <2>;*/
output = <1>; /*output port number*/
arc_port_mask = <0x2>;
interrupts = <0 205 1
0 199 1>;

6
arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
View File

@@ -872,7 +872,7 @@
};
aocec: aocec {
compatible = "amlogic, aocec-tl1";
compatible = "amlogic, aocec-tm2";
/*device_name = "aocec";*/
status = "okay";
vendor_name = "Amlogic"; /* Max Chars: 8 */
@@ -880,10 +880,12 @@
* http://standards.ieee.org/develop/regauth/oui/oui.txt
*/
vendor_id = <0x000000>;
product_desc = "TL1"; /* Max Chars: 16 */
product_desc = "TM2"; /* Max Chars: 16 */
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <3>;
ee_cec;
/*cec_sel = <2>;*/
output = <1>; /*output port number*/
arc_port_mask = <0x2>;
interrupts = <0 205 1
0 199 1>;

6
arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts
View File

@@ -851,7 +851,7 @@
};
aocec: aocec {
compatible = "amlogic, aocec-tl1";
compatible = "amlogic, aocec-tm2";
/*device_name = "aocec";*/
status = "okay";
vendor_name = "Amlogic"; /* Max Chars: 8 */
@@ -859,10 +859,12 @@
* http://standards.ieee.org/develop/regauth/oui/oui.txt
*/
vendor_id = <0x000000>;
product_desc = "TL1"; /* Max Chars: 16 */
product_desc = "TM2"; /* Max Chars: 16 */
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <3>;
ee_cec;
/*cec_sel = <2>;*/
output = <1>; /*output port number*/
arc_port_mask = <0x2>;
interrupts = <0 205 1
0 199 1>;

6
arch/arm/boot/dts/amlogic/tm2_t962x3_ab301.dts
View File

@@ -872,7 +872,7 @@
};
aocec: aocec {
compatible = "amlogic, aocec-tl1";
compatible = "amlogic, aocec-tm2";
/*device_name = "aocec";*/
status = "okay";
vendor_name = "Amlogic"; /* Max Chars: 8 */
@@ -880,11 +880,13 @@
* http://standards.ieee.org/develop/regauth/oui/oui.txt
*/
vendor_id = <0x000000>;
product_desc = "TL1"; /* Max Chars: 16 */
product_desc = "TM2"; /* Max Chars: 16 */
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <3>;
ee_cec;
/*cec_sel = <2>;*/
arc_port_mask = <0x2>;
output = <1>; /*output port number*/
interrupts = <0 205 1
0 199 1>;
interrupt-names = "hdmi_aocecb","hdmi_aocec";

6
arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts
View File

@@ -851,7 +851,7 @@
};
aocec: aocec {
compatible = "amlogic, aocec-tl1";
compatible = "amlogic, aocec-tm2";
/*device_name = "aocec";*/
status = "okay";
vendor_name = "Amlogic"; /* Max Chars: 8 */
@@ -859,11 +859,13 @@
* http://standards.ieee.org/develop/regauth/oui/oui.txt
*/
vendor_id = <0x000000>;
product_desc = "TL1"; /* Max Chars: 16 */
product_desc = "TM2"; /* Max Chars: 16 */
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <3>;
ee_cec;
/*cec_sel = <2>;*/
arc_port_mask = <0x2>;
output = <1>; /*output port number*/
interrupts = <0 205 1
0 199 1>;
interrupt-names = "hdmi_aocecb","hdmi_aocec";

6
arch/arm64/boot/dts/amlogic/tm2_pxp.dts
View File

@@ -547,7 +547,7 @@
};
aocec: aocec {
compatible = "amlogic, aocec-tl1";
compatible = "amlogic, aocec-tm2";
/*device_name = "aocec";*/
status = "okay";
vendor_name = "Amlogic"; /* Max Chars: 8 */
@@ -555,10 +555,12 @@
* http://standards.ieee.org/develop/regauth/oui/oui.txt
*/
vendor_id = <0x000000>;
product_desc = "TL1"; /* Max Chars: 16 */
product_desc = "TM2"; /* Max Chars: 16 */
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <3>;
ee_cec;
/*cec_sel = <2>;*/
output = <1>; /*output port number*/
arc_port_mask = <0x2>;
interrupts = <0 205 1
0 199 1>;

6
arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
View File

@@ -867,7 +867,7 @@
};
aocec: aocec {
compatible = "amlogic, aocec-tl1";
compatible = "amlogic, aocec-tm2";
/*device_name = "aocec";*/
status = "okay";
vendor_name = "Amlogic"; /* Max Chars: 8 */
@@ -875,10 +875,12 @@
* http://standards.ieee.org/develop/regauth/oui/oui.txt
*/
vendor_id = <0x000000>;
product_desc = "TL1"; /* Max Chars: 16 */
product_desc = "TM2"; /* Max Chars: 16 */
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <3>;
ee_cec;
/*cec_sel = <2>;*/
output = <1>; /*output port number*/
arc_port_mask = <0x2>;
interrupts = <0 205 1
0 199 1>;

6
arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts
View File

@@ -850,7 +850,7 @@
};
aocec: aocec {
compatible = "amlogic, aocec-tl1";
compatible = "amlogic, aocec-tm2";
/*device_name = "aocec";*/
status = "okay";
vendor_name = "Amlogic"; /* Max Chars: 8 */
@@ -858,10 +858,12 @@
* http://standards.ieee.org/develop/regauth/oui/oui.txt
*/
vendor_id = <0x000000>;
product_desc = "TL1"; /* Max Chars: 16 */
product_desc = "TM2"; /* Max Chars: 16 */
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <3>;
ee_cec;
/*cec_sel = <2>;*/
output = <1>; /*output port number*/
arc_port_mask = <0x2>;
interrupts = <0 205 1
0 199 1>;

6
arch/arm64/boot/dts/amlogic/tm2_t962x3_ab301.dts
View File

@@ -867,7 +867,7 @@
};
aocec: aocec {
compatible = "amlogic, aocec-tl1";
compatible = "amlogic, aocec-tm2";
/*device_name = "aocec";*/
status = "okay";
vendor_name = "Amlogic"; /* Max Chars: 8 */
@@ -875,10 +875,12 @@
* http://standards.ieee.org/develop/regauth/oui/oui.txt
*/
vendor_id = <0x000000>;
product_desc = "TL1"; /* Max Chars: 16 */
product_desc = "TM2"; /* Max Chars: 16 */
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <3>;
ee_cec;
/*cec_sel = <2>;*/
output = <1>; /*output port number*/
arc_port_mask = <0x2>;
interrupts = <0 205 1
0 199 1>;

6
arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts
View File

@@ -850,7 +850,7 @@
};
aocec: aocec {
compatible = "amlogic, aocec-tl1";
compatible = "amlogic, aocec-tm2";
/*device_name = "aocec";*/
status = "okay";
vendor_name = "Amlogic"; /* Max Chars: 8 */
@@ -858,11 +858,13 @@
* http://standards.ieee.org/develop/regauth/oui/oui.txt
*/
vendor_id = <0x000000>;
product_desc = "TL1"; /* Max Chars: 16 */
product_desc = "TM2"; /* Max Chars: 16 */
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <3>;
ee_cec;
/*cec_sel = <2>;*/
arc_port_mask = <0x2>;
output = <1>; /*output port number*/
interrupts = <0 205 1
0 199 1>;
interrupt-names = "hdmi_aocecb","hdmi_aocec";

25
drivers/amlogic/cec/hdmi_ao_cec.c
View File

@@ -82,6 +82,7 @@ struct cec_platform_data_s {
bool ee_to_ao;/*ee cec hw module mv to ao;ao cec delete*/
bool ceca_sts_reg;/*add new internal status register*/
enum cecbver cecb_ver;/* detail discription ref enum cecbver */
enum cecaver ceca_ver;
};
@@ -1135,6 +1136,13 @@ void cec_enable_arc_pin(bool enable)
{
unsigned int data;
if (is_meson_sm1_cpu() ||
cpu_after_eq(MESON_CPU_MAJOR_ID_TM2)) {
/*sm1 and tm2 later, audio module handle this*/
return;
}
if (cec_dev->plat_data->cecb_ver >= CECB_VER_2) {
data = rd_reg_hhi(HHI_HDMIRX_ARC_CNTL);
/* enable bit 1:1 bit 0: 0*/
@@ -3065,6 +3073,7 @@ static const struct cec_platform_data_s cec_g12a_data = {
.line_bit = 3,
.ee_to_ao = 1,
.ceca_sts_reg = 0,
.ceca_ver = CECA_VER_0,
.cecb_ver = CECB_VER_1,
};
@@ -3073,6 +3082,7 @@ static const struct cec_platform_data_s cec_txl_data = {
.line_bit = 7,
.ee_to_ao = 0,
.ceca_sts_reg = 0,
.ceca_ver = CECA_VER_0,
.cecb_ver = CECB_VER_0,
};
@@ -3081,6 +3091,7 @@ static const struct cec_platform_data_s cec_tl1_data = {
.line_bit = 10,
.ee_to_ao = 1,
.ceca_sts_reg = 1,
.ceca_ver = CECA_VER_0,
.cecb_ver = CECB_VER_2,
};
@@ -3089,6 +3100,16 @@ static const struct cec_platform_data_s cec_sm1_data = {
.line_bit = 3,
.ee_to_ao = 1,
.ceca_sts_reg = 1,
.ceca_ver = CECA_VER_1,
.cecb_ver = CECB_VER_2,
};
static const struct cec_platform_data_s cec_tm2_data = {
.line_reg = 0,
.line_bit = 3,
.ee_to_ao = 1,
.ceca_sts_reg = 1,
.ceca_ver = CECA_VER_1,
.cecb_ver = CECB_VER_2,
};
@@ -3117,6 +3138,10 @@ static const struct of_device_id aml_cec_dt_match[] = {
.compatible = "amlogic, aocec-sm1",
.data = &cec_sm1_data,
},
{
.compatible = "amlogic, aocec-tm2",
.data = &cec_tm2_data,
},
{}
};
#endif

8
drivers/amlogic/cec/hdmi_ao_cec.h
View File

@@ -29,6 +29,14 @@
#define CEC_PHY_PORT_NUM 4
#define HR_DELAY(n) (ktime_set(0, n * 1000 * 1000))
enum cecaver {
/*first version*/
CECA_VER_0 = 0,
/*support multi logical address*/
CECA_VER_1 = 1,
};
enum cecbver {
/*first version*/
CECB_VER_0 = 0,