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

cec: revert changesy [1/1]

Browse Source 
PD#SWPL-418

Problem:
TXL can't bootup

Solution:
revert it

Verify:
p321

Revert "cec: for support multi-logical address [2/2]"
This reverts commit cc185dc81d.

Revert "cec: for support multi-logical address [1/2]"
This reverts commit b7922078ea.

Change-Id: I1cef0ac194464d75ffff3fe765f15b5f944406b2
Signed-off-by: Lei Qian <lei.qian@amlogic.com>

Conflicts:
	drivers/amlogic/cec/hdmi_ao_cec.c
This commit is contained in:
Lei Qian
2018-11-05 20:22:13 +08:00
committed by Dongjin Kim
parent 42565ac96b
commit 472272230e
8 changed files with 229 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts
View File

@@ -994,7 +994,6 @@
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <4>; /*all port number*/
/*ee_cec;*/
cec_sel = <2>;
output = <1>; /*output port number*/
/*arc support port:bit 0-3, according to portmap*/
arc_port_mask = <0x8>;
@@ -1002,9 +1001,9 @@
0 199 1>;
interrupt-names = "hdmi_aocecb","hdmi_aocec";
pinctrl-names = "default","hdmitx_aocecb","cec_pin_sleep";
pinctrl-0=<&hdmitx_aocec &hdmitx_aocecb1>;
pinctrl-1=<&hdmitx_aocec &hdmitx_aocecb1>;
pinctrl-2=<&hdmitx_aocec &hdmitx_aocecb1>;
pinctrl-0=<&hdmitx_aocec>;
pinctrl-1=<&hdmitx_aocecb>;
pinctrl-2=<&hdmitx_aocecb>;
reg = <0xFF80023c 0x4
0xFF800000 0x400>;
reg-names = "ao_exit","ao";

7
arch/arm64/boot/dts/amlogic/atom.dts
View File

@@ -992,16 +992,15 @@
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <4>; /*all port number*/
/*ee_cec;*/
cec_sel = <2>;
output = <1>;
arc_port_mask = <0x8>;
interrupts = <0 205 1
0 199 1>;
interrupt-names = "hdmi_aocecb","hdmi_aocec";
pinctrl-names = "default","hdmitx_aocecb","cec_pin_sleep";
pinctrl-0=<&hdmitx_aocec &hdmitx_aocecb1>;
pinctrl-1=<&hdmitx_aocec &hdmitx_aocecb1>;
pinctrl-2=<&hdmitx_aocec &hdmitx_aocecb1>;
pinctrl-0=<&hdmitx_aocec>;
pinctrl-1=<&hdmitx_aocecb>;
pinctrl-2=<&hdmitx_aocecb>;
reg = <0x0 0xFF80023c 0x0 0x4
0x0 0xFF800000 0x0 0x400>;
reg-names = "ao_exit","ao";

7
arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts
View File

@@ -993,7 +993,6 @@
cec_osd_string = "AML_TV"; /* Max Chars: 14 */
port_num = <4>; /*all port number*/
/*ee_cec;*/
cec_sel = <2>;
output = <1>; /*output port number*/
/*arc support port:bit 0-3, according to portmap*/
arc_port_mask = <0x8>;
@@ -1001,9 +1000,9 @@
0 199 1>;
interrupt-names = "hdmi_aocecb","hdmi_aocec";
pinctrl-names = "default","hdmitx_aocecb","cec_pin_sleep";
pinctrl-0=<&hdmitx_aocec &hdmitx_aocecb1>;
pinctrl-1=<&hdmitx_aocec &hdmitx_aocecb1>;
pinctrl-2=<&hdmitx_aocec &hdmitx_aocecb1>;
pinctrl-0=<&hdmitx_aocec>;
pinctrl-1=<&hdmitx_aocecb>;
pinctrl-2=<&hdmitx_aocecb>;
reg = <0x0 0xFF80023c 0x0 0x4
0x0 0xFF800000 0x0 0x400>;
reg-names = "ao_exit","ao";

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

File diff suppressed because it is too large Load Diff

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

@@ -56,10 +56,6 @@ enum cecbver {
#define L_1 1
#define L_2 2
#define L_3 3
#define CEC_A 0
#define CEC_B 1
/*
#define CEC_FUNC_MASK 0
#define ONE_TOUCH_PLAY_MASK 1
@@ -532,7 +528,7 @@ int __attribute__((weak))hdmirx_get_connect_info(void)
#ifdef CONFIG_AMLOGIC_AO_CEC
unsigned int aocec_rd_reg(unsigned long addr);
void aocec_wr_reg(unsigned long addr, unsigned long data);
void cecb_irq_handle(void);
void cecrx_irq_handle(void);
void cec_logicaddr_set(int l_add);
void cec_arbit_bit_time_set(unsigned int bit_set,
unsigned int time_set, unsigned int flag);
@@ -541,9 +537,6 @@ void aocec_irq_enable(bool enable);
extern void dump_reg(void);
#endif
extern void cec_dump_info(void);
extern void cec_hw_reset(unsigned int cec_sel);
extern void cec_restore_logical_addr(unsigned int cec_sel,
unsigned int addr_en);
extern void cec_logicaddr_add(unsigned int cec_sel, unsigned int l_add);
extern void cec_clear_all_logical_addr(unsigned int cec_sel);
extern void cec_hw_reset(void);
#endif /* __AO_CEC_H__ */

2
drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_drv.h
View File

@@ -472,7 +472,7 @@ extern void rx_send_hpd_pulse(void);
/* irq */
extern void rx_irq_en(bool enable);
extern irqreturn_t irq_handler(int irq, void *params);
extern void cecb_irq_handle(void);
extern void cecrx_irq_handle(void);
/* user interface */
extern int pc_mode_en;

2
drivers/amlogic/media/vin/tvin/hdmirx/hdmi_rx_wrapper.c
View File

@@ -311,7 +311,7 @@ static int hdmi_rx_ctrl_irq_handler(void)
hdmirx_rd_dwc(DWC_AUD_CEC_ISTS) &
hdmirx_rd_dwc(DWC_AUD_CEC_IEN);
if (intr_aud_cec != 0) {
cecb_irq_handle();
cecrx_irq_handle();
hdmirx_wr_dwc(DWC_AUD_CEC_ICLR, intr_aud_cec);
}
}

1
include/linux/amlogic/media/vout/hdmi_tx/hdmi_tx_cec_20.h
View File

@@ -314,7 +314,6 @@ struct cec_global_info_t {
unsigned int cec_version;
unsigned char power_status;
unsigned char log_addr;
unsigned int addr_enable;
unsigned char menu_status;
unsigned char osd_name[16];
struct input_dev *remote_cec_dev; /* cec input device */