From patchwork Thu Dec 8 00:14:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 9465473 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 8FB6560512 for ; Thu, 8 Dec 2016 00:16:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93FA7285A4 for ; Thu, 8 Dec 2016 00:16:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84C84285A6; Thu, 8 Dec 2016 00:16:22 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0667228599 for ; Thu, 8 Dec 2016 00:16:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEmMN-0004qG-JR; Thu, 08 Dec 2016 00:14:51 +0000 Received: from mail-pg0-x22d.google.com ([2607:f8b0:400e:c05::22d]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEmMD-0004fg-VN for linux-arm-kernel@lists.infradead.org; Thu, 08 Dec 2016 00:14:44 +0000 Received: by mail-pg0-x22d.google.com with SMTP id 3so167354239pgd.0 for ; Wed, 07 Dec 2016 16:14:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m5vlvfOiNEqHVbnS3KarC2LR3ullb1/jrIwyW+Dh15I=; b=Tdvbo/vWFXiNYwp+1VgJjHHUODP3ybXAjCQ4XKNkFJK+w9T0WO7lrHRQA7Lbaw4J04 NpI8mnz8mpuq2X55TaTbXqre1Mb9mqfuFzHOrvaLbYBYZtLymDV7+dGSoSNejwBkvIJo GaMOy0gaF/qONfTCWQBLT9Dyzr0WTjpMdFHS84uxFYtImJs44uHLKc+z7H2ctB3gvMw+ +tKPd22owcsIwEpArgGVkauxWidDiNqxx20pzKZXE9QaC8C5sZJUCNlMU3URW71BKWlD BZwAs+cG5pd6dC6kIlhPeoLATh39N0XMsOI/wXRy7+225wudZgE2WumpR9fY4UDTQ+zu Z8dA== 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:mime-version:content-transfer-encoding; bh=m5vlvfOiNEqHVbnS3KarC2LR3ullb1/jrIwyW+Dh15I=; b=LqGYKE93xNjlr/rLo8XbBEePePpZ2uhDuA/h2lChsEsZIGhfAkT3ZAxboMhofNcDPf y0ynhTgEDGmwLPWS5fq5PUuS+LVte9QRj2u8gwtY7Bm2HAu/H02D4dYLjAF2hwc53MHJ xOsbhvvw9KTkcHKrd+brFS8Esb2gGTdAN0cVzMrml51KlGXzJ8jOGawRKM25VWQCAcUh 7F58lzBFWC+NRJNqyvNOJgBsTx5lGHXXs9mbFMefuaX6SjQdBgZ2v0XQ/yHh3lnJ2YvR eaiJBvk9Tn7J4u0KPILYhEAjTVfhRsb58yJ9pj5meKI+yDLem9ptXR2WUPwc9PvD2as2 iJGA== X-Gm-Message-State: AKaTC02VVvZ2DU8vGnbPQpsqnTKryUYBrPr0r8/Sd88z0E3czmuCpBHLG/LBRt5RhSZIQ9NS X-Received: by 10.99.156.2 with SMTP id f2mr127830481pge.20.1481156060846; Wed, 07 Dec 2016 16:14:20 -0800 (PST) Received: from localhost (c-98-203-232-209.hsd1.wa.comcast.net. [98.203.232.209]) by smtp.gmail.com with ESMTPSA id x2sm45051802pfx.65.2016.12.07.16.14.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Dec 2016 16:14:20 -0800 (PST) From: Kevin Hilman To: Sekhar Nori Subject: [PATCH v2.1 1/4] ARM: dts: davinci: da850: VPIF: add node and muxing Date: Wed, 7 Dec 2016 16:14:18 -0800 Message-Id: <20161208001418.4469-1-khilman@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161207193137.27947-2-khilman@baylibre.com> References: <20161207193137.27947-2-khilman@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161207_161442_180047_FBD4029F X-CRM114-Status: GOOD ( 10.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Lechner , Axel Haslam , javier@osg.samsung.com, Hans Verkuil , =?UTF-8?q?Bartosz=20Go=C5=82aszewski?= , Sakari Ailus , Alexandre Bailon , Patrick Titiano , linux-arm-kernel@lists.infradead.org, Laurent Pinchart Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add VPIF node an pins to da850 and enable on boards. VPIF has two input channels described using the standard DT ports and enpoints. Signed-off-by: Kevin Hilman Reviewed-by: Laurent Pinchart --- v2 -> v2.1: moved ports from SoC .dtsi to board .dts files. arch/arm/boot/dts/da850-evm.dts | 20 ++++++++++++++++++++ arch/arm/boot/dts/da850-lcdk.dts | 13 +++++++++++++ arch/arm/boot/dts/da850.dtsi | 27 ++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts index 41de15fe15a2..cea36ee6fd07 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts @@ -289,3 +289,23 @@ }; }; }; + +&vpif { + pinctrl-names = "default"; + pinctrl-0 = <&vpif_capture_pins>; + status = "okay"; + + /* VPIF capture port */ + port { + vpif_ch0: endpoint@0 { + reg = <0>; + bus-width = <8>; + }; + + vpif_ch1: endpoint@1 { + reg = <1>; + bus-width = <8>; + data-shift = <8>; + }; + }; +}; diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts index 7b8ab21fed6c..5fc21528e0ba 100644 --- a/arch/arm/boot/dts/da850-lcdk.dts +++ b/arch/arm/boot/dts/da850-lcdk.dts @@ -219,3 +219,16 @@ }; }; }; + +&vpif { + pinctrl-names = "default"; + pinctrl-0 = <&vpif_capture_pins>; + status = "okay"; + + /* VPIF capture port */ + port { + vpif_ch0: endpoint { + bus-width = <8>; + }; + }; +}; diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index f79e1b91c680..5f0b40510b2b 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi @@ -186,7 +186,18 @@ 0xc 0x88888888 0xffffffff >; }; - + vpif_capture_pins: vpif_capture_pins { + pinctrl-single,bits = < + /* VP_DIN[2..7], VP_CLKIN1, VP_CLKIN0 */ + 0x38 0x11111111 0xffffffff + /* VP_DIN[10..15,0..1] */ + 0x3c 0x11111111 0xffffffff + /* VP_DIN[8..9] */ + 0x40 0x00000011 0x000000ff + /* VP_CLKIN3, VP_CLKIN2 */ + 0x4c 0x00010100 0x000f0f00 + >; + }; }; edma0: edma@0 { compatible = "ti,edma3-tpcc"; @@ -399,7 +410,21 @@ <&edma0 0 1>; dma-names = "tx", "rx"; }; + + vpif: video@217000 { + compatible = "ti,da850-vpif"; + reg = <0x217000 0x1000>; + interrupts = <92>; + status = "disabled"; + + /* VPIF capture port */ + port { + #address-cells = <1>; + #size-cells = <0>; + }; + }; }; + aemif: aemif@68000000 { compatible = "ti,da850-aemif"; #address-cells = <2>;