From patchwork Tue Nov 22 19:45:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 9442047 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 3FE5F605EE for ; Tue, 22 Nov 2016 19:48:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E1D91FE95 for ; Tue, 22 Nov 2016 19:48:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 227711FF13; Tue, 22 Nov 2016 19:48:14 +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 3F2281FE95 for ; Tue, 22 Nov 2016 19:48:12 +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 1c9H1d-00074M-B3; Tue, 22 Nov 2016 19:46:41 +0000 Received: from mail-pg0-x233.google.com ([2607:f8b0:400e:c05::233]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c9H1D-0006wx-Ah for linux-arm-kernel@lists.infradead.org; Tue, 22 Nov 2016 19:46:16 +0000 Received: by mail-pg0-x233.google.com with SMTP id f188so10608042pgc.3 for ; Tue, 22 Nov 2016 11:45:54 -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=TJJt/VEojZ1/RVtIainYQhHEtbKmS84Yj0XFWYSB1Is=; b=YjND0bKXaif2d3BsPLJOlXBVk8rSsYpgnXLw4rraEUzaUaaOsKbeMuSfDJTDYtvwkq Kkaex/kXORMwxLtli6IR+UM4YmJfbId5+HmCUbUWbePek2W9ujKI8XcsI7ZbvLalvI2L yAT2a3jRihiR3iTjnU9trYf3FIRpQGfMBwJgXYBFpVWOwYeUhy+7N2iu5E+xAm0y0ygL mEZFXpcmHTyjE2SJxKM9heE9nR8HRSUl8Za9Qy2b7q9d+Lgv8kLgpKBvaq0MZNByYA0A ACnxJvz9gy2FevwRU8471YUpYsVe8AU375S1Aj66maxT3ppyFyUlvYxxTFLcVn9dg/GB DyFQ== 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=TJJt/VEojZ1/RVtIainYQhHEtbKmS84Yj0XFWYSB1Is=; b=LcIJ7FoUbmqA/WaSpZOWX2SkJmO/0sjis8UHSuzNHwHbnhLy001PJi0FDJ5GMyUyGp kEfnzogUB+fUdynXJkkwbTlsUB3nQBjON/1T7XGLCfp4XS16F30iKhX41ywiarENL6yW NNwlnPBFpw8uZkiD1J3X/hOgip1T6s3Dtk6tRbA+pS62ZTFvf4/BLtQKd3ri29YlHYvx aWQ7LaD7rsIJHBJMc+0yJfAf/t+oFDBAl7m61Rf0lY6q/B9elSJJ9ZG6gRmiDYCZFBrT B4W/O+yZkYCGSaWJ80iZwBHipa7W40VnTOelwpgHWnI9X6dVDotq8jKSlx3XlN8swmjv CuFw== X-Gm-Message-State: AKaTC02zagYPdLL3Va53OBFs5XaQip7Px6QxidaGHX7mYzwDtM0wdGdGJuMq1cHOYA4oY1Ad X-Received: by 10.98.11.198 with SMTP id 67mr27027566pfl.90.1479843954178; Tue, 22 Nov 2016 11:45:54 -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 135sm29054999pgc.7.2016.11.22.11.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Nov 2016 11:45:53 -0800 (PST) From: Kevin Hilman To: Sekhar Nori Subject: [PATCH 1/4] ARM: davinci: da8xx: VPIF: enable DT init Date: Tue, 22 Nov 2016 11:45:48 -0800 Message-Id: <20161122194551.3420-2-khilman@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161122194551.3420-1-khilman@baylibre.com> References: <20161122194551.3420-1-khilman@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161122_114615_514071_25D0CC35 X-CRM114-Status: GOOD ( 11.09 ) 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 , Hans Verkuil , =?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..7b41611f2665 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,da850-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 = {