From patchwork Wed Jan 28 21:17:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5734841 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D2D24BF440 for ; Thu, 29 Jan 2015 02:23:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2EC60201F2 for ; Thu, 29 Jan 2015 02:23:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6397F201EC for ; Thu, 29 Jan 2015 02:23:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755482AbbA2BwG (ORCPT ); Wed, 28 Jan 2015 20:52:06 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:52205 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755464AbbA2BwD (ORCPT ); Wed, 28 Jan 2015 20:52:03 -0500 Received: from wuerfel.lan. ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0MKZT5-1YHxRN0uLH-001wzP; Wed, 28 Jan 2015 22:17:54 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 1/7] [media] timberdale: do not select TIMB_DMA Date: Wed, 28 Jan 2015 22:17:41 +0100 Message-Id: <1422479867-3370921-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1422479867-3370921-1-git-send-email-arnd@arndb.de> References: <1422479867-3370921-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:I7im+ZZ4nZo7T5EbfkU8X6pAq9PJ5BQPGkzMOfgR2T5rUhPhTI3 8rLKZQaG7BkO55NEMkovL+Po0HWFhEPAA6XiA3aN9J/dUnICFI9ok7yx/BwvjRWiHEFStW2 NeY334lLvcOG4ckLwiGfxFgewJX9+RRXc5g0yEO9RC+FMjJva+t83DWPJiXM3mNm5OGP9rc fhoFa5ZtHYYLKGsGkPFXA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The timberdale media driver requires the use of the respective dma engine driver, but that may not be enabled, causing a Kconfig warning: warning: (VIDEO_TIMBERDALE) selects TIMB_DMA which has unmet direct dependencies (DMADEVICES && MFD_TIMBERDALE) This fixes the dependency by removing the inappropriate 'select' statement and replacing it with a direct dependency on the drivers that provide the services this needs. Signed-off-by: Arnd Bergmann Fixes: 7155043c2d027 ("[media] enable COMPILE_TEST for media drivers") --- drivers/media/platform/Kconfig | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 765bffb49a72..6a1334be7544 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -56,10 +56,8 @@ config VIDEO_VIU config VIDEO_TIMBERDALE tristate "Support for timberdale Video In/LogiWIN" - depends on VIDEO_V4L2 && I2C && DMADEVICES - depends on MFD_TIMBERDALE || COMPILE_TEST - select DMA_ENGINE - select TIMB_DMA + depends on VIDEO_V4L2 && I2C + depends on (MFD_TIMBERDALE && TIMB_DMA) || COMPILE_TEST select VIDEO_ADV7180 select VIDEOBUF_DMA_CONTIG ---help---