From patchwork Fri Jun 2 21:34:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 9763541 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 3B0C6602F0 for ; Fri, 2 Jun 2017 21:35:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D6B6285DA for ; Fri, 2 Jun 2017 21:35:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 213B9285DC; Fri, 2 Jun 2017 21:35:06 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI 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 9CCEF285DA for ; Fri, 2 Jun 2017 21:35:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751286AbdFBVfE (ORCPT ); Fri, 2 Jun 2017 17:35:04 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:35390 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751180AbdFBVfD (ORCPT ); Fri, 2 Jun 2017 17:35:03 -0400 Received: by mail-pg0-f43.google.com with SMTP id 8so12334334pgc.2 for ; Fri, 02 Jun 2017 14:35:03 -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=Mllk+o7RqQw4d051/sVdnJ4AWVmjsBq4k1zGeft0c4U=; b=Gjm4r0qpM1s/adF3agX1z7pZXlUKourDzaoz/tftv04r7L/+Vp+oexUBTs9JcUCEzD Sjm216FSnUKxUEG9oG10w1zufisQmC2tfhRs8lQ8J+yGqiVqB9iMriPx1P7+bqD5AoVQ h852PrwXMKWqFMc7/22c1IFgecSFUP0fJLoHkBlYTXxJr2OP2kIwOP9HioBfBIrutd/n moN2GHD24XIiBqT5ZeDptwopuVbEAQHqHlMYBVbSQ4UZh9iz2D4+BWjkbFACmqDnP8cZ Nn2nOg/rsz9wInD+zAyIKHUtfvjo0OB/x2sN+q0Ig+rhn3Guy1XgnVRbl1hTQVSFY0Eg 4Wxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mllk+o7RqQw4d051/sVdnJ4AWVmjsBq4k1zGeft0c4U=; b=LRo3Y/e8ZUTZ3x7FThpFhXdrlxDyIZQRoOL6a3eub7h8J0KzCHz6frPq8Z3m0fqfa6 2LlEP9wk5CDJlXx0NKGHf5E0W8VFrm+O67XtzO7x9dFfYzKerJ/5p+FSXTEJR1W0O0kG I4Ujang/8SoCaMy41FjaUfD7ws2UCyo6f2FJ9DOr6eLO/hBwvs/Jt7pDHOv8LfSujiRZ +pdh50oBkh4qrRlLR9MPobGkVbuV3TOu+9wsO1Aa74fXFnuTD0C9Fvyo7UdnOl9+G8N2 nkwd0GYrcb8LZI7wi49g5sa19U0Eed33q3DuMxTkN/aCMRSD1afUwr8tcUuq0lmM4dl+ 653A== X-Gm-Message-State: AODbwcDQNCnOGrMxMYQnJoiP8i4Ds73fbmYCg9xkCjnP0ThC6tezFTiv fKck/8nY22lQqwRW X-Received: by 10.99.143.90 with SMTP id r26mr9122326pgn.102.1496439303142; Fri, 02 Jun 2017 14:35:03 -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 l63sm43864639pfb.68.2017.06.02.14.35.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2017 14:35:02 -0700 (PDT) From: Kevin Hilman To: Hans Verkuil , Laurent Pinchart , linux-media@vger.kernel.org Cc: Sekhar Nori , Patrick Titiano , linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/4] [media] davinci: vpif: adaptions for DT support Date: Fri, 2 Jun 2017 14:34:31 -0700 Message-Id: <20170602213431.10777-5-khilman@baylibre.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170602213431.10777-1-khilman@baylibre.com> References: <20170602213431.10777-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-Virus-Scanned: ClamAV using ClamSMTP The davinci VPIF is a single hardware block, but the existing driver is broken up into a common library (vpif.c), output (vpif_display.c) and intput (vpif_capture.c). When migrating to DT, to better model the hardware, and because registers, interrupts, etc. are all common,it was decided to have a single VPIF hardware node[1]. Because davinci uses legacy, non-DT boot on several SoCs still, the platform_drivers need to remain. But they are also needed in DT boot. Since there are no DT nodes for the display/capture parts in DT boot (there is a single node for the parent/common device) we need to create platform_devices somewhere to instansiate the platform_drivers. When VPIF display/capture are needed for a DT boot, the VPIF node will have endpoints defined for its subdevs. Therefore, vpif_probe() checks for the presence of endpoints, and if detected manually creates the platform_devices for the display and capture platform_drivers. [1] Documentation/devicetree/bindings/media/ti,da850-vpif.txt Signed-off-by: Kevin Hilman --- drivers/media/platform/davinci/vpif.c | 49 ++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c index 1b02a6363f77..502917abcb13 100644 --- a/drivers/media/platform/davinci/vpif.c +++ b/drivers/media/platform/davinci/vpif.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "vpif.h" @@ -423,7 +424,9 @@ EXPORT_SYMBOL(vpif_channel_getfid); static int vpif_probe(struct platform_device *pdev) { - static struct resource *res; + static struct resource *res, *res_irq; + struct platform_device *pdev_capture, *pdev_display; + struct device_node *endpoint = NULL; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); vpif_base = devm_ioremap_resource(&pdev->dev, res); @@ -435,6 +438,50 @@ static int vpif_probe(struct platform_device *pdev) spin_lock_init(&vpif_lock); dev_info(&pdev->dev, "vpif probe success\n"); + + /* + * If VPIF Node has endpoints, assume "new" DT support, + * where capture and display drivers don't have DT nodes + * so their devices need to be registered manually here + * for their legacy platform_drivers to work. + */ + endpoint = of_graph_get_next_endpoint(pdev->dev.of_node, + endpoint); + if (!endpoint) + return 0; + + /* + * For DT platforms, manually create platform_devices for + * capture/display drivers. + */ + res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (!res_irq) { + dev_warn(&pdev->dev, "Missing IRQ resource.\n"); + return -EINVAL; + } + + pdev_capture = devm_kzalloc(&pdev->dev, sizeof(*pdev_capture), + GFP_KERNEL); + pdev_capture->name = "vpif_capture"; + pdev_capture->id = -1; + pdev_capture->resource = res_irq; + pdev_capture->num_resources = 1; + pdev_capture->dev.dma_mask = pdev->dev.dma_mask; + pdev_capture->dev.coherent_dma_mask = pdev->dev.coherent_dma_mask; + pdev_capture->dev.parent = &pdev->dev; + platform_device_register(pdev_capture); + + pdev_display = devm_kzalloc(&pdev->dev, sizeof(*pdev_display), + GFP_KERNEL); + pdev_display->name = "vpif_display"; + pdev_display->id = -1; + pdev_display->resource = res_irq; + pdev_display->num_resources = 1; + pdev_display->dev.dma_mask = pdev->dev.dma_mask; + pdev_display->dev.coherent_dma_mask = pdev->dev.coherent_dma_mask; + pdev_display->dev.parent = &pdev->dev; + platform_device_register(pdev_display); + return 0; }