From patchwork Fri Mar 21 08:52:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Francois Moine X-Patchwork-Id: 23168 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1WQxE1-0001Y6-OL; Fri, 21 Mar 2014 12:02:57 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-8) with esmtp id 1WQxDz-0006pl-lu; Fri, 21 Mar 2014 12:02:57 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965240AbaCULCx (ORCPT + 1 other); Fri, 21 Mar 2014 07:02:53 -0400 Received: from smtpfb1-g21.free.fr ([212.27.42.9]:60641 "EHLO smtpfb1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964951AbaCULCw (ORCPT ); Fri, 21 Mar 2014 07:02:52 -0400 Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5]) by smtpfb1-g21.free.fr (Postfix) with ESMTP id 791C777D4AC for ; Fri, 21 Mar 2014 12:02:49 +0100 (CET) Received: from localhost (unknown [IPv6:2a01:e35:2f5c:9de0:212:bfff:fe1e:9ce4]) by smtp5-g21.free.fr (Postfix) with ESMTP id 588EDD48037; Fri, 21 Mar 2014 12:02:17 +0100 (CET) X-Mailbox-Line: From 911da5ce15cdb37cf899e629b0edc31f44ce5205 Mon Sep 17 00:00:00 2001 Message-Id: <911da5ce15cdb37cf899e629b0edc31f44ce5205.1395397665.git.moinejf@free.fr> In-Reply-To: References: From: Jean-Francois Moine Date: Fri, 21 Mar 2014 09:52:29 +0100 Subject: [PATCH RFC v2 6/6] ARM: AM33XX: dts: Change the tda998x description To: Russell King , Rob Clark , dri-devel@lists.freedesktop.org Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.3.21.105114 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SXL_RIP_ERROR_SERVFAIL , __SXL_SIG_ERROR_SERVFAIL , __SXL_URI_ERROR_SERVFAIL , __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' The tda998x being moved from a 'slave encoder' to a normal DRM encoder/connector and the tilcdc_slave glue being removed, the declaration of the HDMI transmitter description must be changed in the associated DTs. Signed-off-by: Jean-Francois Moine --- arch/arm/boot/dts/am335x-base0033.dts | 28 +++++++++++++++++++--------- arch/arm/boot/dts/am335x-boneblack.dts | 21 ++++++++++++++++----- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/am335x-base0033.dts b/arch/arm/boot/dts/am335x-base0033.dts index 72a9b3f..05f2b8f 100644 --- a/arch/arm/boot/dts/am335x-base0033.dts +++ b/arch/arm/boot/dts/am335x-base0033.dts @@ -14,15 +14,6 @@ model = "IGEP COM AM335x on AQUILA Expansion"; compatible = "isee,am335x-base0033", "isee,am335x-igep0033", "ti,am33xx"; - hdmi { - compatible = "ti,tilcdc,slave"; - i2c = <&i2c0>; - pinctrl-names = "default", "off"; - pinctrl-0 = <&nxp_hdmi_pins>; - pinctrl-1 = <&nxp_hdmi_off_pins>; - status = "okay"; - }; - leds_base { pinctrl-names = "default"; pinctrl-0 = <&leds_base_pins>; @@ -85,6 +76,11 @@ &lcdc { status = "okay"; + port { + lcd_0: endpoint@0 { + remote-endpoint = <&hdmi_0>; + }; + }; }; &i2c0 { @@ -92,4 +88,18 @@ compatible = "at,24c256"; reg = <0x50>; }; + hdmi: hdmi-encoder { + compatible = "nxp,tda19988"; + reg = <0x70>; + + pinctrl-names = "default", "off"; + pinctrl-0 = <&nxp_hdmi_pins>; + pinctrl-1 = <&nxp_hdmi_off_pins>; + + port { + hdmi_0: endpoint@0 { + remote-endpoint = <&lcd_0>; + }; + }; + }; }; diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 6b71ad9..b94d8bd 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -64,15 +64,26 @@ &lcdc { status = "okay"; + port { + lcd_0: endpoint@0 { + remote-endpoint = <&hdmi_0>; + }; + }; }; -/ { - hdmi { - compatible = "ti,tilcdc,slave"; - i2c = <&i2c0>; +&i2c0 { + hdmi: hdmi-encoder { + compatible = "nxp,tda19988"; + reg = <0x70>; + pinctrl-names = "default", "off"; pinctrl-0 = <&nxp_hdmi_bonelt_pins>; pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; - status = "okay"; + + port { + hdmi_0: endpoint@0 { + remote-endpoint = <&lcd_0>; + }; + }; }; };