From patchwork Thu Jan 29 16:19:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Towle X-Patchwork-Id: 28096 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1YGrp4-0003Ad-Uh; Thu, 29 Jan 2015 17:20:02 +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-5) with esmtp id 1YGrp3-0005Gt-6m; Thu, 29 Jan 2015 17:20:02 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753588AbbA2QT6 (ORCPT + 1 other); Thu, 29 Jan 2015 11:19:58 -0500 Received: from 82-70-136-246.dsl.in-addr.zen.co.uk ([82.70.136.246]:55517 "EHLO xk120" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753323AbbA2QTx (ORCPT ); Thu, 29 Jan 2015 11:19:53 -0500 Received: from william by xk120 with local (Exim 4.80) (envelope-from ) id 1YGrot-0007Wt-Dq; Thu, 29 Jan 2015 16:19:51 +0000 From: William Towle To: linux-kernel@lists.codethink.co.uk, linux-media@vger.kernel.org, Guennadi Liakhovetski , Sergei Shtylyov , Hans Verkuil Subject: [PATCH 8/8] WmT: dts/i vin0/adv7612 (HDMI) Date: Thu, 29 Jan 2015 16:19:48 +0000 Message-Id: <1422548388-28861-9-git-send-email-william.towle@codethink.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1422548388-28861-1-git-send-email-william.towle@codethink.co.uk> References: <1422548388-28861-1-git-send-email-william.towle@codethink.co.uk> 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: 2015.1.29.161217 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, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_TO_X5 0, __REFERENCES 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' --- arch/arm/boot/dts/r8a7790-lager.dts | 51 +++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 17 deletions(-) \ No newline at end of file diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index be44493..c20b6cb 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -249,9 +249,9 @@ renesas,function = "usb2"; }; - vin1_pins: vin { - renesas,groups = "vin1_data8", "vin1_clk"; - renesas,function = "vin1"; + vin0_pins: vin0 { + renesas,groups = "vin0_data24", "vin0_sync", "vin0_field", "vin0_clkenb", "vin0_clk"; + renesas,function = "vin0"; }; }; @@ -391,15 +391,15 @@ pinctrl-0 = <&iic2_pins>; pinctrl-names = "default"; - composite-in@20 { - compatible = "adi,adv7180"; - reg = <0x20>; - remote = <&vin1>; + adv7612: adv7612@0x4c { + compatible = "adi,adv7612"; + reg = <0x4c>; + remote = <&vin0>; port { - adv7180: endpoint { - bus-width = <8>; - remote-endpoint = <&vin1ep0>; + adv7612_1: endpoint { + remote-endpoint = <&vin0ep0>; + default-input = <0>; }; }; }; @@ -419,6 +419,19 @@ i2c-gpio,delay-us = <1>; /* ~100 kHz */ #address-cells = <1>; #size-cells = <0>; + + adv7612: adv7612@0x4c { + compatible = "adi,adv7612"; + reg = <0x4c>; + remote = <&vin0>; + + port { + adv7612_1: endpoint { + remote-endpoint = <&vin0ep0>; + default-input = <0>; + }; + }; + }; }; }; #endif @@ -457,9 +470,9 @@ pinctrl-names = "default"; }; -/* composite video input */ -&vin1 { - pinctrl-0 = <&vin1_pins>; +/* HDMI video input */ +&vin0 { + pinctrl-0 = <&vin0_pins>; pinctrl-names = "default"; status = "ok"; @@ -468,9 +481,13 @@ #address-cells = <1>; #size-cells = <0>; - vin1ep0: endpoint { - remote-endpoint = <&adv7180>; - bus-width = <8>; + vin0ep0: endpoint { + remote-endpoint = <&adv7612_1>; + bus-width = <24>; + hsync-active = <0>; + vsync-active = <0>; + pclk-sample = <1>; + data-active = <1>; }; }; -}; +};