From patchwork Tue Jul 2 15:47:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Almeida?= X-Patchwork-Id: 11028197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 825EF13A4 for ; Tue, 2 Jul 2019 15:49:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AAA928985 for ; Tue, 2 Jul 2019 15:49:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F6212898D; Tue, 2 Jul 2019 15:49:32 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 0B0EF28985 for ; Tue, 2 Jul 2019 15:49:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727198AbfGBPtR (ORCPT ); Tue, 2 Jul 2019 11:49:17 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:58388 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727197AbfGBPtQ (ORCPT ); Tue, 2 Jul 2019 11:49:16 -0400 Received: from turingmachine.home (unknown [IPv6:2804:431:c7f4:61e7:d711:794d:1c68:5ed3]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: tonyk) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 0C43A28631D; Tue, 2 Jul 2019 16:49:10 +0100 (BST) From: =?utf-8?q?Andr=C3=A9_Almeida?= To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, hverkuil@xs4all.nl, helen.koike@collabora.com, kernel@collabora.com, linux-kernel@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Al?= =?utf-8?q?meida?= Subject: [PATCH 5/7] media: vimc: core: Add output device on the pipeline Date: Tue, 2 Jul 2019 12:47:50 -0300 Message-Id: <20190702154752.14939-6-andrealmeid@collabora.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190702154752.14939-1-andrealmeid@collabora.com> References: <20190702154752.14939-1-andrealmeid@collabora.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 Add the output video device on the hardcoded pipeline. Change the link to it be enabled by default. Signed-off-by: André Almeida --- drivers/media/platform/vimc/vimc-core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c index 571c55aa0e16..ecdea1d631c5 100644 --- a/drivers/media/platform/vimc/vimc-core.c +++ b/drivers/media/platform/vimc/vimc-core.c @@ -95,8 +95,7 @@ static const struct vimc_ent_config ent_config[] = { }, { .name = "RGB/YUV Input", - /* TODO: change this to vimc-input when it is implemented */ - .drv = "vimc-sensor", + .drv = "vimc-output", }, { .name = "Scaler", @@ -118,11 +117,11 @@ static const struct vimc_ent_link ent_links[] = { /* Link: Sensor B (Pad 0)->(Pad 0) Raw Capture 1 */ VIMC_ENT_LINK(1, 0, 5, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), /* Link: Debayer A (Pad 1)->(Pad 0) Scaler */ - VIMC_ENT_LINK(2, 1, 7, 0, MEDIA_LNK_FL_ENABLED), + VIMC_ENT_LINK(2, 1, 7, 0, 0), /* Link: Debayer B (Pad 1)->(Pad 0) Scaler */ VIMC_ENT_LINK(3, 1, 7, 0, 0), /* Link: RGB/YUV Input (Pad 0)->(Pad 0) Scaler */ - VIMC_ENT_LINK(6, 0, 7, 0, 0), + VIMC_ENT_LINK(6, 0, 7, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), /* Link: Scaler (Pad 1)->(Pad 0) RGB/YUV Capture */ VIMC_ENT_LINK(7, 1, 8, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), };