From patchwork Tue Oct 25 23:55:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 9395737 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 C45B760233 for ; Tue, 25 Oct 2016 23:58:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DE1729698 for ; Tue, 25 Oct 2016 23:58:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 726D2296A4; Tue, 25 Oct 2016 23:58:01 +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 0631E29698 for ; Tue, 25 Oct 2016 23:58:01 +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 1bzBaB-0002C0-JX; Tue, 25 Oct 2016 23:56:39 +0000 Received: from mail-pf0-x22f.google.com ([2607:f8b0:400e:c00::22f]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bzBZY-0001kO-F9 for linux-arm-kernel@lists.infradead.org; Tue, 25 Oct 2016 23:56:02 +0000 Received: by mail-pf0-x22f.google.com with SMTP id s8so127627555pfj.2 for ; Tue, 25 Oct 2016 16:55:39 -0700 (PDT) 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=/TxqnjcMd3E5X0wvKFxYPSOdPitB+Kl6YIBxKzz3tE8=; b=ExUCSAlBD66t4YXxivnkMLxelePxEMrcpnuIo4Taa5Hxrw1oPhKyy/QDDiTaZpmQx2 fhowxB1+CfoajAJkkfAVdluGmV/xzoOIAzwzjROpMePCIwEeqIXOtPCN+saCNuPH6akJ 7IiTsFBkqj4gSPkG1UjRFOtlAVdQFU3dX3xr92xCQPhkUNmlpiv69QZik8+994WS6rdL ixqCvPS6zO/rgWzyOXyRmr10GkCeutKubCR004fAEvMaYv9M5jnz/fwPzbJ3KS4X/C8W BJtMk+bVdXNORFFTKF5ghAhTgZ+h24y7eVIGJmJr1UMT1wfzhtL6cizaqXlNt+HMDkQO yloA== 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=/TxqnjcMd3E5X0wvKFxYPSOdPitB+Kl6YIBxKzz3tE8=; b=LtEy3PacdAn4mb1RKfnXc2lhA/BY8EbiR1Swh5zaCxXQHvTLWQ5NIA6Ah2VZ9LVaVw WB6/b8Itf9kn3Q/mNSXBxsAfvJR1SYD3DXxn8bpmSs6/8rc8DusjcCNnAbL4Zm+f77/S xV7X+lDVClc6+szMGIXfhaNgUdF/glr+Eb/kvDk8XztWmUTH2bwlXh+j2MSC0t5csJ3v XUp4KxoudaMBDfTQgQ9Rog48KP6BriD0uDaRfq45Jj3MAQq84S2DGtNwcOhRkFsKQm+0 RXAAa54kylbKsy3tqk8OmYRiPTqRhKG5sAdh4ltgPp3U8ucB5paPy2wxB3Q65jnYvK5n cvHA== X-Gm-Message-State: ABUngvcy1lnk662VD5qIu1J0jFyRd5hdKDegFvvCmjqd9DE2f+GJI/UvN5D46ll4fCi6PBmR X-Received: by 10.98.95.193 with SMTP id t184mr43811214pfb.85.1477439739550; Tue, 25 Oct 2016 16:55:39 -0700 (PDT) Received: from localhost (c-98-203-232-209.hsd1.wa.comcast.net. [98.203.232.209]) by smtp.gmail.com with ESMTPSA id x16sm35910614pff.39.2016.10.25.16.55.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Oct 2016 16:55:39 -0700 (PDT) From: Kevin Hilman To: Hans Verkuil , Laurent Pinchart , linux-media@vger.kernel.org Subject: [RFC PATCH 2/6] ARM: davinci: da8xx: VPIF: enable DT init Date: Tue, 25 Oct 2016 16:55:32 -0700 Message-Id: <20161025235536.7342-3-khilman@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161025235536.7342-1-khilman@baylibre.com> References: <20161025235536.7342-1-khilman@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161025_165600_788403_B36DF332 X-CRM114-Status: GOOD ( 11.90 ) 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 , Sekhar Nori , =?UTF-8?q?Bartosz=20Go=C5=82aszewski?= , Alexandre Bailon , linux-arm-kernel@lists.infradead.org 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 basic support for DT initializaion of VPIF (capture) via DT. Clocks and mux still need to happen in this file until there are real clock and pinctrl drivers, but the video nodes and subdevs can all come from DT. Signed-off-by: Kevin Hilman --- arch/arm/mach-davinci/da8xx-dt.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index c9f7e9274aa8..e1b7d72f9070 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -17,6 +17,7 @@ #include #include "cp_intc.h" #include +#include static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL), @@ -38,14 +39,30 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { NULL), OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL), OF_DEV_AUXDATA("ti,da850-aemif", 0x68000000, "ti-aemif", NULL), + OF_DEV_AUXDATA("ti,vpif", 0x01e17000, "vpif", NULL), {} }; #ifdef CONFIG_ARCH_DAVINCI_DA850 +#if IS_ENABLED(CONFIG_VIDEO_DAVINCI_VPIF_CAPTURE) +static __init void da850_vpif_capture_init(void) +{ + int ret; + + ret = davinci_cfg_reg_list(da850_vpif_capture_pins); + if (ret) + pr_warn("da850_evm_init: VPIF capture mux setup failed: %d\n", + ret); +} +#else +#define da850_vpif_capture_init() +#endif + static void __init da850_init_machine(void) { of_platform_default_populate(NULL, da850_auxdata_lookup, NULL); + da850_vpif_capture_init(); } static const char *const da850_boards_compat[] __initconst = {