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: 37780 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bzBZM-0006aY-Cm; Tue, 25 Oct 2016 23:55:48 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-8) with esmtp id 1bzBZK-0007JC-jj; Wed, 26 Oct 2016 01:55:48 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753834AbcJYXzm (ORCPT + 1 other); Tue, 25 Oct 2016 19:55:42 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:33593 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753107AbcJYXzk (ORCPT ); Tue, 25 Oct 2016 19:55:40 -0400 Received: by mail-pf0-f172.google.com with SMTP id 197so3669360pfu.0 for ; Tue, 25 Oct 2016 16:55:40 -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=He5kKU47NjExiPrwlRnyhHJ8mcVg5i8CWcRKR4mWhkWRYMT627IkWT2Zf/o0Oi8QWx d/nUYVNI55Sxl/HJgj01oz/hfDdLOVYWcCu846hLDHdmYlOnGRYes16YDQYEWSXnFOPB 8o9ApnMeF8rgmfXQfdSM/UsLo92m1DueEno9/QPrkO0mmsh4z/PSl6II+xPAZeszOwbi LtYsA6ejftxhO4UkjK707dIdJKQstA9eho522TPlDTfThESXViDLQA0GQurKyBYmTvA8 s6uS3HFlJjnHTkQdbxTHxJJT1yzRVDQt86EghYF71PoLft1QASHNs6Y676cLLC1QDHn6 s6qA== X-Gm-Message-State: ABUngvc564yrMyLm20tepPpjNxfysm4e9O0RicXVQWbuCAR+EtN1t29u1oNAkcpLBtQs3eGc 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 Cc: Sekhar Nori , Axel Haslam , =?UTF-8?q?Bartosz=20Go=C5=82aszewski?= , Alexandre Bailon , David Lechner , linux-arm-kernel@lists.infradead.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 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: 2016.10.25.234516 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_1900_1999 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_NEGATE 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CTE 0, __FROM_DOMAIN_IN_ANY_CC2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __YOUTUBE_RCVD 0' 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 = {