From patchwork Wed Jul 6 23:36:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9217413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EC79B60B16 for ; Wed, 6 Jul 2016 23:37:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFCFD284E8 for ; Wed, 6 Jul 2016 23:37:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D4A922854D; Wed, 6 Jul 2016 23:37:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA83A2854E for ; Wed, 6 Jul 2016 23:37:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755905AbcGFXh3 (ORCPT ); Wed, 6 Jul 2016 19:37:29 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:33700 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755883AbcGFXh1 (ORCPT ); Wed, 6 Jul 2016 19:37:27 -0400 Received: by mail-oi0-f65.google.com with SMTP id w141so271296oia.0 for ; Wed, 06 Jul 2016 16:37:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NwL3matpsE+7SLG3sDNFVA/ugy2qNOx6gCrBcDjenIg=; b=ZX391E2fwrI5umZhSipWpqRSLrh00/trLz7Y5Ksc1/7qGEjGuDejlM8sBYQZxqlaqY UKepC0Uy7l02Ztm0Ltab456q+InWAThLFWjxn/A7uLympQZ50ChhOuDgEkzANUqOmG22 Za8+gsbvGZiwYGprk71IRoO2/NJ/SSZ3paPdkAPOzRMpjKuZviLKsnU3M66J+kxX93KN gMj5C7c0vRW6+We8vrXmzIWOpxAte6v3eTYknFaCFZq7yS/PLbJHGrH1P7Hk5qLQfTR5 AO5agW/Kb+S8/RrX6Po9jVOybeVoWagIU55ODlyToWHCFyC4ZKF0rkpqJC21KXtAMTC1 N8Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NwL3matpsE+7SLG3sDNFVA/ugy2qNOx6gCrBcDjenIg=; b=EGyWiCMs9x45sz4o3JrSBPOs94qIQwOJnZpS/VO9niyG3TXrd0i8I1pXtMIAIXSQ3K 8N4cP9fwn/mg+98Fk0TMaf6HdiwD0ZjehxUXOZdl8eOp4wz0vNVlY4K2mN61s4Y0f2hH 3vERao3Oo/1Ng/JLD7OpeV4RczaDp5r1wHdNsFXotr45ahZdsfJFdbel07XpL7t+B5ba d9fFWl9KrfvfiSLntp4MHYrqjJtI5buaLYWD7mT70G4GDwkBaopFSviAKjkafMrW0P+S zQOd52LE54pbmNViZTrAswHC2bQY8EOMCBApf+8Sccx4pgAWeFGNSPCTh27kO3JJKa2e GkxA== X-Gm-Message-State: ALyK8tKU6vSi2+qUSH8eyKK5HVJQixaqVyCbOJ4w9zByKY0P5Hny/u0gWFf/HVDnkGOMRw== X-Received: by 10.157.31.22 with SMTP id x22mr15321052otd.15.1467848223593; Wed, 06 Jul 2016 16:37:03 -0700 (PDT) Received: from mothership.sklembedded.com (c-73-241-2-21.hsd1.ca.comcast.net. [73.241.2.21]) by smtp.googlemail.com with ESMTPSA id by5sm166764pad.36.2016.07.06.16.37.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jul 2016 16:37:02 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Steve Longerbeam Subject: [PATCH 6/6] ARM: dts: imx6-sabreauto: add video capture devices and connections Date: Wed, 6 Jul 2016 16:36:43 -0700 Message-Id: <1467848203-14007-7-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467848203-14007-1-git-send-email-steve_longerbeam@mentor.com> References: <1467848203-14007-1-git-send-email-steve_longerbeam@mentor.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Defines the host video capture device node and the ADV7180 decoder sensor. The host capture device connects to the ADV7180 via the parallel-bus mux input on the ipu1_csi0_mux. On the sabreauto, two analog video inputs are routed to the ADV7180, composite on Ain1, and composite on Ain3. Those inputs are defined via inputs and input-names under the endpoint node ipu1_csi0_from_ipu1_csi0_mux. The ADV7180 power pin is via max7310_b port expander. Signed-off-by: Steve Longerbeam --- arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 68 ++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 737bb54..ec952b1 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi @@ -147,10 +147,54 @@ gpio-controller; #gpio-cells = <2>; }; + + camera: adv7180@21 { + compatible = "adi,adv7180"; + reg = <0x21>; + pwdn-gpios = <&max7310_b 2 GPIO_ACTIVE_LOW>; + interrupt-parent = <&gpio1>; + interrupts = <27 0x8>; + + port { + adv7180_to_ipu1_csi0_mux: endpoint { + remote-endpoint = <&ipu1_csi0_mux_from_parallel_sensor>; + bus-width = <8>; + }; + }; + }; + }; + }; + + ipucap0: ipucap0 { + compatible = "fsl,imx-video-capture"; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0>; + ports = <&ipu1_csi0>; + status = "okay"; + + fim { + enable = <1>; }; }; }; +&ipu1_csi0_from_ipu1_csi0_mux { + bus-width = <8>; +}; + +&ipu1_csi0_mux_from_parallel_sensor { + remote-endpoint = <&adv7180_to_ipu1_csi0_mux>; + inputs = <0x00 0x02>; + input-names = "ADV7180 Composite on Ain1", + "ADV7180 Composite on Ain3"; +}; + +&ipu1_csi0_mux { + status = "okay"; +}; + &clks { assigned-clocks = <&clks IMX6QDL_PLL4_BYPASS_SRC>, <&clks IMX6QDL_PLL4_BYPASS>, @@ -450,6 +494,30 @@ >; }; + pinctrl_ipu1_csi0: ipu1grp-csi0 { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT4__IPU1_CSI0_DATA04 0x80000000 + MX6QDL_PAD_CSI0_DAT5__IPU1_CSI0_DATA05 0x80000000 + MX6QDL_PAD_CSI0_DAT6__IPU1_CSI0_DATA06 0x80000000 + MX6QDL_PAD_CSI0_DAT7__IPU1_CSI0_DATA07 0x80000000 + MX6QDL_PAD_CSI0_DAT8__IPU1_CSI0_DATA08 0x80000000 + MX6QDL_PAD_CSI0_DAT9__IPU1_CSI0_DATA09 0x80000000 + MX6QDL_PAD_CSI0_DAT10__IPU1_CSI0_DATA10 0x80000000 + MX6QDL_PAD_CSI0_DAT11__IPU1_CSI0_DATA11 0x80000000 + MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0x80000000 + MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0x80000000 + MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0x80000000 + MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0x80000000 + MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0x80000000 + MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0x80000000 + MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0x80000000 + MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0x80000000 + MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0x80000000 + MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0x80000000 + MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0x80000000 + >; + }; + pinctrl_pwm3: pwm1grp { fsl,pins = < MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1