From ccbd66f027f175f69525c68ef23c6e232a2c2298 Mon Sep 17 00:00:00 2001 From: Yong Qin Date: Mon, 23 Jul 2018 15:42:31 +0800 Subject: [PATCH] cec: add cec support for txl p346 p341 PD#170469: cec: add cec support for txl p346 p341 1.support p346 2.support p341 Change-Id: I4b680d407ce0c79eb952a3b74c2cf06df15d32ae Signed-off-by: Yong Qin --- arch/arm64/boot/dts/amlogic/mesontxl.dtsi | 26 +++++++++++++++++++ arch/arm64/boot/dts/amlogic/txl_t962_p320.dts | 26 ------------------- arch/arm64/boot/dts/amlogic/txl_t962_p321.dts | 26 ------------------- 3 files changed, 26 insertions(+), 52 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi index df6fcb52519c..2aeb76e8459a 100644 --- a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi @@ -802,6 +802,32 @@ }; }; + aocec: aocec@0xc8100000 { + compatible = "amlogic, aocec-txl"; + status = "okay"; + vendor_name = "Amlogic"; /* Max Chars: 8 */ + /* Refer to the following URL at: + * http://standards.ieee.org/develop/regauth/oui/oui.txt + */ + vendor_id = <0x000000>; + product_desc = "TXL"; /* Max Chars: 16 */ + cec_osd_string = "AML_TV"; /* Max Chars: 14 */ + port_num = <3>; + ee_cec; + arc_port_mask = <0x2>; + interrupts = <0 56 1 + 0 199 1>; + interrupt-names = "hdmi_aocecb","hdmi_aocec"; + pinctrl-names = "default","hdmitx_aocecb","cec_pin_sleep"; + pinctrl-0=<&hdmitx_aocec>; + pinctrl-1=<&hdmitx_aocecb>; + pinctrl-2=<&hdmitx_aocec>; + reg = <0x0 0xc810023c 0x0 0x4 + 0x0 0xc8100000 0x0 0x200 + 0x0 0xda83e000 0x0 0x10 + 0x0 0xc883c000 0x0 0x400>; + }; + canvas: canvas{ compatible = "amlogic, meson, canvas"; dev_name = "amlogic-canvas"; diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts index b792d3e48306..3024447644d3 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts @@ -774,32 +774,6 @@ }; }; - aocec: aocec@0xc8100000 { - compatible = "amlogic, aocec-txl"; - status = "okay"; - vendor_name = "Amlogic"; /* Max Chars: 8 */ - /* Refer to the following URL at: - * http://standards.ieee.org/develop/regauth/oui/oui.txt - */ - vendor_id = <0x000000>; - product_desc = "TXL"; /* Max Chars: 16 */ - cec_osd_string = "AML_TV"; /* Max Chars: 14 */ - port_num = <3>; - ee_cec; - arc_port_mask = <0x2>; - interrupts = <0 56 1 - 0 199 1>; - interrupt-names = "hdmi_aocecb","hdmi_aocec"; - pinctrl-names = "default","hdmitx_aocecb","cec_pin_sleep"; - pinctrl-0=<&hdmitx_aocec>; - pinctrl-1=<&hdmitx_aocecb>; - pinctrl-2=<&hdmitx_aocec>; - reg = <0x0 0xc810023c 0x0 0x4 - 0x0 0xc8100000 0x0 0x200 - 0x0 0xda83e000 0x0 0x10 - 0x0 0xc883c000 0x0 0x400>; - }; - /* start AUDIO_RELATED */ i2s_dai: I2S { #sound-dai-cells = <0>; diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts index d48e90f5ec02..a3bcedb8a7b4 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts @@ -783,32 +783,6 @@ }; }; - aocec: aocec@0xc8100000 { - compatible = "amlogic, aocec-txl"; - status = "okay"; - vendor_name = "Amlogic"; /* Max Chars: 8 */ - /* Refer to the following URL at: - * http://standards.ieee.org/develop/regauth/oui/oui.txt - */ - vendor_id = <0x000000>; - product_desc = "TXL"; /* Max Chars: 16 */ - cec_osd_string = "AML_TV"; /* Max Chars: 14 */ - port_num = <3>; - ee_cec; - arc_port_mask = <0x2>; - interrupts = <0 56 1 - 0 199 1>; - interrupt-names = "hdmi_aocecb","hdmi_aocec"; - pinctrl-names = "default","hdmitx_aocecb","cec_pin_sleep"; - pinctrl-0=<&hdmitx_aocec>; - pinctrl-1=<&hdmitx_aocecb>; - pinctrl-2=<&hdmitx_aocec>; - reg = <0x0 0xc810023c 0x0 0x4 - 0x0 0xc8100000 0x0 0x200 - 0x0 0xda83e000 0x0 0x10 - 0x0 0xc883c000 0x0 0x400>; - }; - /* start AUDIO_RELATED */ i2s_dai: I2S { #sound-dai-cells = <0>;