From patchwork Wed Jun 11 14:49:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4336641 Return-Path: X-Original-To: patchwork-linux-omap@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 18E0CBEEAA for ; Wed, 11 Jun 2014 14:50:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 33AA9201FE for ; Wed, 11 Jun 2014 14:50:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BF9E201EF for ; Wed, 11 Jun 2014 14:50:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754127AbaFKOuS (ORCPT ); Wed, 11 Jun 2014 10:50:18 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:61309 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752568AbaFKOuR (ORCPT ); Wed, 11 Jun 2014 10:50:17 -0400 Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue005) with ESMTP (Nemesis) id 0McAb5-1XEBy720t5-00JaFp; Wed, 11 Jun 2014 16:49:32 +0200 From: Arnd Bergmann To: Nishanth Menon Cc: gregkh@linuxfoundation.org, Tony Lindgren , Mauro Carvalho Chehab , Laurent Pinchart , linux-omap@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, arm@kernel.org Subject: Re: [PATCH] [media] staging: allow omap4iss to be modular Date: Wed, 11 Jun 2014 16:49:31 +0200 Message-ID: <7948240.P51u2omQa4@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.11.0-18-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <53986ABC.4070302@ti.com> References: <5192928.MkINji4uKU@wuerfel> <53986ABC.4070302@ti.com> MIME-Version: 1.0 X-Provags-ID: V02:K0:GK5RSwXDTKZ/Z/um/1NigHgVm2c9OzyjbnvBgMv6e++ 3wNbf4IFDAaH0jJNw0Q8t8zMhPuO0lQum55ZvmgmCFnYTdzoD3 bcd6wZbXSyxEPHubiqq434cZm8/gULaXQdOQmEErnfwEWDij16 DlAPcx87eVBqPmQuC24+nyR3VlLYVVcy6Gk244G3PrmKp9pjV7 iB2+s7GITDckH55Cbg65eOIchhVnU3eYa1GJcvBcMjxQ1Sgin2 p0qYXA4NiyFv36rMU3XZQ8psT5qzRH6bansHwReoL8LjhKP9Re NzNdghOZtjdRYSfTceYnsmzMbg9/7m59k/2eF7pUEBv99SP44L 2pGfiNk8RVcgVzSC4f/Q= Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@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 On Wednesday 11 June 2014 09:42:04 Nishanth Menon wrote: > On 06/11/2014 09:35 AM, Arnd Bergmann wrote: > > The OMAP4 camera support depends on I2C and VIDEO_V4L2, both > > of which can be loadable modules. This causes build failures > > if we want the camera driver to be built-in. > > > > This can be solved by turning the option into "tristate", > > which unfortunately causes another problem, because the > > driver incorrectly calls a platform-internal interface > > for omap4_ctrl_pad_readl/omap4_ctrl_pad_writel. > > To work around that, we can export those symbols, but > > that isn't really the correct solution, as we should not > > have dependencies on platform code this way. > > > > Signed-off-by: Arnd Bergmann > > --- > > This is one of just two patches we currently need to get > > 'make allmodconfig' to build again on ARM. > > > > diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c > > index 751f354..05d2d98 100644 > > --- a/arch/arm/mach-omap2/control.c > > +++ b/arch/arm/mach-omap2/control.c > > @@ -190,11 +190,13 @@ u32 omap4_ctrl_pad_readl(u16 offset) > > { > > return readl_relaxed(OMAP4_CTRL_PAD_REGADDR(offset)); > > } > > +EXPORT_SYMBOL_GPL(omap4_ctrl_pad_readl); > > > > void omap4_ctrl_pad_writel(u32 val, u16 offset) > > { > > writel_relaxed(val, OMAP4_CTRL_PAD_REGADDR(offset)); > > } > > +EXPORT_SYMBOL_GPL(omap4_ctrl_pad_writel); > > > > #ifdef CONFIG_ARCH_OMAP3 > > > > diff --git a/drivers/staging/media/omap4iss/Kconfig b/drivers/staging/media/omap4iss/Kconfig > > index 78b0fba..0c3e3c1 100644 > > --- a/drivers/staging/media/omap4iss/Kconfig > > +++ b/drivers/staging/media/omap4iss/Kconfig > > @@ -1,5 +1,5 @@ > > config VIDEO_OMAP4 > > - bool "OMAP 4 Camera support" > > + tristate "OMAP 4 Camera support" > > depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && I2C && ARCH_OMAP4 > > select VIDEOBUF2_DMA_CONTIG > > ---help--- > > > > This was discussed in detail here: > http://marc.info/?t=140198692500001&r=1&w=2 > Direct dependency from a staging driver to mach-omap2 driver is not > something we'd like, right? So it was decided to just leave ARM allmodconfig broken? Why not at least do this instead? 8<---- From 3a965f4fd5a6b3ef4a66aa4e7c916cfd34fd5706 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 21 Jan 2014 09:32:43 +0100 Subject: [PATCH] [media] staging: tighten omap4iss dependencies The OMAP4 camera support depends on I2C and VIDEO_V4L2, both of which can be loadable modules. This causes build failures if we want the camera driver to be built-in. This can be solved by turning the option into "tristate", which unfortunately causes another problem, because the driver incorrectly calls a platform-internal interface for omap4_ctrl_pad_readl/omap4_ctrl_pad_writel. Instead, this patch just forbids the invalid configurations and ensures that the driver can only be built if all its dependencies are built-in. Signed-off-by: Arnd Bergmann Acked-by: Tony Lindgren Acked-by: Laurent Pinchart --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/staging/media/omap4iss/Kconfig b/drivers/staging/media/omap4iss/Kconfig index 78b0fba..8afc6fe 100644 --- a/drivers/staging/media/omap4iss/Kconfig +++ b/drivers/staging/media/omap4iss/Kconfig @@ -1,6 +1,6 @@ config VIDEO_OMAP4 bool "OMAP 4 Camera support" - depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && I2C && ARCH_OMAP4 + depends on VIDEO_V4L2=y && VIDEO_V4L2_SUBDEV_API && I2C=y && ARCH_OMAP4 select VIDEOBUF2_DMA_CONTIG ---help--- Driver for an OMAP 4 ISS controller.