From patchwork Tue Mar 5 14:13:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sekhar Nori X-Patchwork-Id: 2219381 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by patchwork1.kernel.org (Postfix) with ESMTP id 343213FCF6 for ; Tue, 5 Mar 2013 14:13:45 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r25EDicg002004 for ; Tue, 5 Mar 2013 08:13:44 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r25EDiT4003129 for ; Tue, 5 Mar 2013 08:13:44 -0600 Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Tue, 5 Mar 2013 08:13:44 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id r25EDi7q016611 for ; Tue, 5 Mar 2013 08:13:44 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 484158062C for ; Tue, 5 Mar 2013 08:13:44 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dbdp20.itg.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by linux.omap.com (Postfix) with ESMTP id E6E0380626 for ; Tue, 5 Mar 2013 08:13:36 -0600 (CST) Received: from DBDE70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id r25EDXYo028217; Tue, 5 Mar 2013 19:43:33 +0530 (IST) Received: from dbdp32.itg.ti.com (172.24.170.251) by dbde70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 14.1.323.3; Tue, 5 Mar 2013 19:43:33 +0530 Received: from psplinux063 (smtpvbd.itg.ti.com [172.24.170.250]) by dbdp32.itg.ti.com (8.13.8/8.13.8) with ESMTP id r25EDUmL018831; Tue, 5 Mar 2013 19:43:31 +0530 Received: from a0875516 by psplinux063 with local (Exim 4.71) (envelope-from ) id 1UCscU-0003Rc-2a; Tue, 05 Mar 2013 19:43:30 +0530 From: Sekhar Nori To: Manjunath Hadli , Prabhakar Lad Subject: [PATCH] media: davinci: kconfig: fix incorrect selects Date: Tue, 5 Mar 2013 19:43:21 +0530 Message-ID: <1362492801-13202-1-git-send-email-nsekhar@ti.com> X-Mailer: git-send-email 1.7.10.1 MIME-Version: 1.0 CC: Russell King , , Mauro Carvalho Chehab , X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com drivers/media/platform/davinci/Kconfig uses selects where it should be using 'depends on'. This results in warnings of the following sort when doing randconfig builds. warning: (VIDEO_DM6446_CCDC && VIDEO_DM355_CCDC && VIDEO_ISIF && VIDEO_DAVINCI_VPBE_DISPLAY) selects VIDEO_VPSS_SYSTEM which has unmet direct dependencies (MEDIA_SUPPORT && V4L_PLATFORM_DRIVERS && ARCH_DAVINCI) The VPIF kconfigs had a strange 'select' and 'depends on' cross linkage which have been fixed as well. This patch has only been build tested, I do not have the setup to test video. I also do not know if the dependencies are really needed, I have just tried to not break any existing assumptions. Reported-by: Russell King Signed-off-by: Sekhar Nori --- drivers/media/platform/davinci/Kconfig | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig index 3c56037..313e343 100644 --- a/drivers/media/platform/davinci/Kconfig +++ b/drivers/media/platform/davinci/Kconfig @@ -1,8 +1,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY tristate "DM646x/DA850/OMAPL138 EVM Video Display" - depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM) + depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM) && VIDEO_DAVINCI_VPIF select VIDEOBUF2_DMA_CONTIG - select VIDEO_DAVINCI_VPIF select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT select VIDEO_THS7303 if MEDIA_SUBDRV_AUTOSELECT help @@ -15,9 +14,8 @@ config VIDEO_DAVINCI_VPIF_DISPLAY config VIDEO_DAVINCI_VPIF_CAPTURE tristate "DM646x/DA850/OMAPL138 EVM Video Capture" - depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM) + depends on VIDEO_DEV && (MACH_DAVINCI_DM6467_EVM || MACH_DAVINCI_DA850_EVM) && VIDEO_DAVINCI_VPIF select VIDEOBUF2_DMA_CONTIG - select VIDEO_DAVINCI_VPIF help Enables Davinci VPIF module used for captur devices. This module is common for following DM6467/DA850/OMAPL138 @@ -28,7 +26,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE config VIDEO_DAVINCI_VPIF tristate "DaVinci VPIF Driver" - depends on VIDEO_DAVINCI_VPIF_DISPLAY || VIDEO_DAVINCI_VPIF_CAPTURE + depends on ARCH_DAVINCI help Support for DaVinci VPIF Driver. @@ -56,8 +54,7 @@ config VIDEO_VPFE_CAPTURE config VIDEO_DM6446_CCDC tristate "DM6446 CCDC HW module" - depends on VIDEO_VPFE_CAPTURE - select VIDEO_VPSS_SYSTEM + depends on VIDEO_VPFE_CAPTURE && VIDEO_VPSS_SYSTEM default y help Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces @@ -71,8 +68,7 @@ config VIDEO_DM6446_CCDC config VIDEO_DM355_CCDC tristate "DM355 CCDC HW module" - depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE - select VIDEO_VPSS_SYSTEM + depends on ARCH_DAVINCI_DM355 && VIDEO_VPFE_CAPTURE && VIDEO_VPSS_SYSTEM default y help Enables DM355 CCD hw module. DM355 CCDC hw interfaces @@ -86,8 +82,7 @@ config VIDEO_DM355_CCDC config VIDEO_ISIF tristate "ISIF HW module" - depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE - select VIDEO_VPSS_SYSTEM + depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE && VIDEO_VPSS_SYSTEM default y help Enables ISIF hw module. This is the hardware module for @@ -99,8 +94,7 @@ config VIDEO_ISIF config VIDEO_DM644X_VPBE tristate "DM644X VPBE HW module" - depends on ARCH_DAVINCI_DM644x - select VIDEO_VPSS_SYSTEM + depends on ARCH_DAVINCI_DM644x && VIDEO_VPSS_SYSTEM select VIDEOBUF2_DMA_CONTIG help Enables VPBE modules used for display on a DM644x @@ -113,7 +107,7 @@ config VIDEO_DM644X_VPBE config VIDEO_VPBE_DISPLAY tristate "VPBE V4L2 Display driver" depends on ARCH_DAVINCI_DM644x - select VIDEO_DM644X_VPBE + depends on VIDEO_DM644X_VPBE help Enables VPBE V4L2 Display driver on a DM644x device