From patchwork Thu Apr 3 09:32:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 3932111 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8B829BF540 for ; Thu, 3 Apr 2014 09:32:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C0F6C202F0 for ; Thu, 3 Apr 2014 09:32:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF14220225 for ; Thu, 3 Apr 2014 09:32:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751596AbaDCJcO (ORCPT ); Thu, 3 Apr 2014 05:32:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59449 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751319AbaDCJcM (ORCPT ); Thu, 3 Apr 2014 05:32:12 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 5C7B3ACEA; Thu, 3 Apr 2014 09:32:09 +0000 (UTC) Date: Thu, 3 Apr 2014 11:32:06 +0200 From: Jean Delvare To: dmaengine@vger.kernel.org, linux-media@vger.kernel.org Cc: Vinod Koul , Dan Williams , Mauro Carvalho Chehab Subject: [PATCH] [media] platform: Fix timberdale dependencies Message-ID: <20140403113206.0aab763f@endymion.delvare> Organization: SUSE Linux X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.22; x86_64-suse-linux-gnu) MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 VIDEO_TIMBERDALE selects TIMB_DMA which itself depends on MFD_TIMBERDALE, so VIDEO_TIMBERDALE should either select or depend on MFD_TIMBERDALE as well. I chose to make it depend on it because I think it makes more sense and it is consistent with what other options are doing. Adding a "|| HAS_IOMEM" to the TIMB_DMA dependencies silenced the kconfig warning about unmet direct dependencies but it was wrong: without MFD_TIMBERDALE, TIMB_DMA is useless as the driver has no device to bind to. Signed-off-by: Jean Delvare Cc: Vinod Koul Cc: Dan Williams Cc: Mauro Carvalho Chehab --- drivers/dma/Kconfig | 2 +- drivers/media/platform/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- linux-3.14.orig/drivers/dma/Kconfig 2014-04-03 09:21:03.566405827 +0200 +++ linux-3.14/drivers/dma/Kconfig 2014-04-03 09:28:32.618779030 +0200 @@ -197,7 +197,7 @@ config AMCC_PPC440SPE_ADMA config TIMB_DMA tristate "Timberdale FPGA DMA support" - depends on MFD_TIMBERDALE || HAS_IOMEM + depends on MFD_TIMBERDALE select DMA_ENGINE help Enable support for the Timberdale FPGA DMA engine. --- linux-3.14.orig/drivers/media/platform/Kconfig 2014-04-03 09:21:03.566405827 +0200 +++ linux-3.14/drivers/media/platform/Kconfig 2014-04-03 09:28:32.618779030 +0200 @@ -56,7 +56,7 @@ config VIDEO_VIU config VIDEO_TIMBERDALE tristate "Support for timberdale Video In/LogiWIN" - depends on VIDEO_V4L2 && I2C && DMADEVICES + depends on MFD_TIMBERDALE && VIDEO_V4L2 && I2C && DMADEVICES select DMA_ENGINE select TIMB_DMA select VIDEO_ADV7180