From patchwork Sun Apr 22 10:28:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 10354469 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 67A5D6019C for ; Sun, 22 Apr 2018 10:28:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5842B28939 for ; Sun, 22 Apr 2018 10:28:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D3222894D; Sun, 22 Apr 2018 10:28:53 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable 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 0141228939 for ; Sun, 22 Apr 2018 10:28:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751698AbeDVK2t (ORCPT ); Sun, 22 Apr 2018 06:28:49 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:54168 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751517AbeDVK2p (ORCPT ); Sun, 22 Apr 2018 06:28:45 -0400 Received: from avalon.bb.dnainternet.fi (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 74DF360C8; Sun, 22 Apr 2018 12:28:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1524392923; bh=WH9KNFy+FaexsuETJAMzBdlmf6T16AGGftWYK7h2uvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bv1gPBzI6jJlJqd2Y+ifI5dxd/8XUH5O6IIEv8b7AhS0tN7F36DeJVH0bARE7SfEE HbaDVu5AWUdF21jpaD3KfNsYf/eZTpK1NOgcHTwfx3qHrvA9TiTHG8awW8E0G3ISd1 AqJOt1sxy0vQWN1LNoTzGR2qcwdkljWmwd1ImD0A= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Kieran Bingham , Geert Uytterhoeven , Arnd Bergmann Subject: [PATCH 2/3] v4l: rcar_fdp1: Enable compilation on Gen2 platforms Date: Sun, 22 Apr 2018 13:28:48 +0300 Message-Id: <20180422102849.2481-3-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180422102849.2481-1-laurent.pinchart+renesas@ideasonboard.com> References: <20180422102849.2481-1-laurent.pinchart+renesas@ideasonboard.com> 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 Commit 1d3897143815 ("[media] v4l: rcar_fdp1: add FCP dependency") fixed a compilation breakage when the optional VIDEO_RENESAS_FCP dependency is compiled as a module while the rcar_fdp1 driver is built in. As a side effect it disabled compilation on Gen2 by disallowing the valid combination ARCH_RENESAS && !VIDEO_RENESAS_FCP. Fix it by handling the dependency the same way the vsp1 driver did in commit 199946731fa4 ("[media] vsp1: clarify FCP dependency"). Fixes: 1d3897143815 ("[media] v4l: rcar_fdp1: add FCP dependency") Signed-off-by: Laurent Pinchart --- drivers/media/platform/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 621d63b2001d..81c3ab95c050 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -397,7 +397,7 @@ config VIDEO_RENESAS_FDP1 tristate "Renesas Fine Display Processor" depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA depends on ARCH_RENESAS || COMPILE_TEST - depends on (!ARCH_RENESAS && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP + depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV ---help---