From patchwork Thu Apr 19 10:17:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Miguel Silva X-Patchwork-Id: 133723 Delivered-To: patch@linaro.org Received: by 10.80.173.174 with SMTP id a43csp613868edd; Thu, 19 Apr 2018 03:18:35 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+4dK2VDBFILHnmo0cdXBLsrt+Yfkhj3ceM2aTbTOFuRKY1LqpKbndoKXaEkXE4oM11xGw+ X-Received: by 2002:a17:902:566:: with SMTP id 93-v6mr5659477plf.327.1524133115878; Thu, 19 Apr 2018 03:18:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524133115; cv=none; d=google.com; s=arc-20160816; b=K7vGTevGWYEhyQjq5lLyUbwXG1szcWFfTknR7cEouIFqG3ua9JYn6t/x+AmUgsf3JD Lev9+djeUSS0tEdHM93lsizyF6KEWTD23YZnifvvxQspjLXwO5yPoMqatYqq//o4hTyU P7W+ifymmpDEQEKSpTArzY+fX/XasK0DcO0O8SXpx9YPQ7r0utG8m5hvRWKxRj/TN8bX 4+43EE6LVf8DQFltpiTET4Azp+/g+/12WENUN+AVmcEvGifVtkSuJz/irPySCOc46gtO /+otYHF1pRSf9rITxBHP9pqtfjirxuw7RAn5kaydmpl8ZInZVJ7jb71OyoZuBGY8qSZP 8xLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=QUnr4cTaghjdC6bPP/2yjFvXTrylJj4++AYjYIS3uEQ=; b=GU+QSbn/YxsYILoFUhNYa6R2T6FAL5jRslMWjfU+m+94O2quKS5RjvaBSL33A4NjN3 asEjq8gZxv5KexB40aNdGK5KLju9vVdrS6wQ049PZlHs/yYr6ARrykGdupdCrDTkSfOy NxS2H+wCnIPeiW8OUXtQpU2uj+zdmV32pchd45aZ2lTbxrPVl1IleYRjJOq7z/K2hNgP ghHRHkzvHVTfyrvLMrlBlFJocGYutTCJHR3aEfLScNB+G9jar+Vj/WT/wwr0XamNGym2 uKSHKq0bUGORNx+dZVoGtVTi8vW+CdQ3LgKGgwcAx1lafVoc8/6lxBewdgD2ApwzF2kl bU8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=L/UZmqNI; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r18si3018088pfe.168.2018.04.19.03.18.35; Thu, 19 Apr 2018 03:18:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=L/UZmqNI; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751168AbeDSKSe (ORCPT + 6 others); Thu, 19 Apr 2018 06:18:34 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:42281 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751092AbeDSKSb (ORCPT ); Thu, 19 Apr 2018 06:18:31 -0400 Received: by mail-wr0-f194.google.com with SMTP id s18-v6so12501637wrg.9 for ; Thu, 19 Apr 2018 03:18:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VTiZKVGJd8lhDh5PwgUrZyRUYlKLlhJ6Zh51ReByWME=; b=L/UZmqNIWFdX1dLamSreCfziyMfpA+lIvw4gjZsu2Sh3QwVI7cGbmo8qTHkE7AmSox PTki+3WuDft+AiATw0KFTq7/EajZpjE/FrZIwhAD0rfF1yQ89mciJAaW0kteE9GcZWDH rnzBARj9uIjsfIOooub6lZd+I+tTOSwFQNLcs= 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; bh=VTiZKVGJd8lhDh5PwgUrZyRUYlKLlhJ6Zh51ReByWME=; b=fd+E+6QxCkiZEQUIEH2f6QE3SUyydSf8CBgQWVFV9mZ0RvnuvizTOlwypVbifB5g35 cX/SpliNzWmNDUwMH200M/b/rGUKbHn18I3GO1lvf5BVO4avDAkIbsHb3ZL0M5f0KtqF 5bjvj8lrsGwNUqagSWhHUqK+bick+J3gCs6uccJTmTBGauEhKWrStSPVkaJsEV/tEsHl 19++gAnx87ag3p1o1aVcuouUh4TZ1gRwSkGRRmj45cQFj3MiG7zBQyjT7BL3A2+bQhBc 3TUuMBLpzX1lyxYgqZ5DCNY4bEPbyytfuCLOJAvxvn2Bz1qTToJId7dQNUojP6yfXJUJ AAFg== X-Gm-Message-State: ALQs6tDdFWANpQiA3VlIR1P17qBp2cx6jyV62v/kvRlVwfzk0GQFRqkm +qEvQmD2M2fym6TtJVuv7iB7lw== X-Received: by 10.28.14.70 with SMTP id 67mr4379905wmo.17.1524133110740; Thu, 19 Apr 2018 03:18:30 -0700 (PDT) Received: from arch-late.local (a109-49-46-234.cpe.netcabo.pt. [109.49.46.234]) by smtp.gmail.com with ESMTPSA id v66sm5220937wmd.41.2018.04.19.03.18.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 03:18:29 -0700 (PDT) From: Rui Miguel Silva To: mchehab@kernel.org, sakari.ailus@linux.intel.com, Steve Longerbeam , Philipp Zabel , Rob Herring Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org, Shawn Guo , Fabio Estevam , devicetree@vger.kernel.org, Greg Kroah-Hartman , Ryan Harkin , Rui Miguel Silva Subject: [PATCH 01/15] media: staging/imx: add support to media dev for no IPU systems Date: Thu, 19 Apr 2018 11:17:58 +0100 Message-Id: <20180419101812.30688-2-rui.silva@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180419101812.30688-1-rui.silva@linaro.org> References: <20180419101812.30688-1-rui.silva@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Some i.MX SoC do not have IPU, like the i.MX7, add to the the media device infrastructure support to be used in this type of systems that do not have internal subdevices besides the CSI. Signed-off-by: Rui Miguel Silva --- drivers/staging/media/imx/imx-media-dev.c | 16 +++++++++++----- .../staging/media/imx/imx-media-internal-sd.c | 3 +++ drivers/staging/media/imx/imx-media.h | 3 +++ 3 files changed, 17 insertions(+), 5 deletions(-) -- 2.17.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c index f67ec8e27093..a8afe0ec4134 100644 --- a/drivers/staging/media/imx/imx-media-dev.c +++ b/drivers/staging/media/imx/imx-media-dev.c @@ -92,6 +92,9 @@ static int imx_media_get_ipu(struct imx_media_dev *imxmd, struct ipu_soc *ipu; int ipu_id; + if (imxmd->no_ipu_present) + return 0; + ipu = dev_get_drvdata(csi_sd->dev->parent); if (!ipu) { v4l2_err(&imxmd->v4l2_dev, @@ -481,16 +484,19 @@ static int imx_media_probe(struct platform_device *pdev) goto notifier_cleanup; } - ret = imx_media_add_internal_subdevs(imxmd); - if (ret) { - v4l2_err(&imxmd->v4l2_dev, - "add_internal_subdevs failed with %d\n", ret); - goto notifier_cleanup; + if (!imxmd->no_ipu_present) { + ret = imx_media_add_internal_subdevs(imxmd); + if (ret) { + v4l2_err(&imxmd->v4l2_dev, + "add_internal_subdevs failed with %d\n", ret); + goto notifier_cleanup; + } } /* no subdevs? just bail */ if (imxmd->notifier.num_subdevs == 0) { ret = -ENODEV; + v4l2_err(&imxmd->v4l2_dev, "no subdevs\n"); goto notifier_cleanup; } diff --git a/drivers/staging/media/imx/imx-media-internal-sd.c b/drivers/staging/media/imx/imx-media-internal-sd.c index 0fdc45dbfb76..4a246813b4e1 100644 --- a/drivers/staging/media/imx/imx-media-internal-sd.c +++ b/drivers/staging/media/imx/imx-media-internal-sd.c @@ -238,6 +238,9 @@ int imx_media_create_internal_links(struct imx_media_dev *imxmd, struct media_pad *pad; int i, j, ret; + if (imxmd->no_ipu_present) + return 0; + intsd = find_intsd_by_grp_id(sd->grp_id); if (!intsd) return -ENODEV; diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h index 44532cd5b812..0c63132861a0 100644 --- a/drivers/staging/media/imx/imx-media.h +++ b/drivers/staging/media/imx/imx-media.h @@ -147,6 +147,9 @@ struct imx_media_dev { /* for async subdev registration */ struct v4l2_async_notifier notifier; + + /* indicator to if the system lack IPU */ + bool no_ipu_present; }; enum codespace_sel {