From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Arnd Bergmann <arnd@arndb.de> Cc: linux-media@vger.kernel.org, Tony Lindgren <tony@atomide.com>, Tero Kristo <t-kristo@ti.com>, Mauro Carvalho Chehab <mchehab@osg.samsung.com>, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Subject: Re: [PATCH] [media] omap4iss: avoid broken OMAP4 dependency Date: Sun, 12 Apr 2015 15:22:24 +0300 [thread overview] Message-ID: <62125726.UhoJzFudPk@avalon> (raw) In-Reply-To: <3292592.cickJMVhRq@wuerfel> Hi Arnd, Thank you for the patch. On Friday 10 April 2015 22:20:20 Arnd Bergmann wrote: > The omap4iss driver uses an interface that used to be provided > by OMAP4 but has now been removed and replaced with a WARN_ON(1) > statement, which likely broke the iss_csiphy code at runtime. > > It also broke compiling the driver when CONFIG_ARCH_OMAP2PLUS > is set, which is implied by OMAP4: > > drivers/staging/media/omap4iss/iss_csiphy.c: In function > 'omap4iss_csiphy_config': > drivers/staging/media/omap4iss/iss_csiphy.c:167:2: error: implicit > declaration of function 'omap4_ctrl_pad_writel' > [-Werror=implicit-function-declaration] omap4_ctrl_pad_writel(cam_rx_ctrl, > > In turn, this broke ARM allyesconfig builds. Replacing the > omap4_ctrl_pad_writel call with WARN_ON(1) won't make the > situation any worse than it already is, but fixes the build > problem. I've fixed the problem properly by switching to the syscon API. I'll send the patch as a separate reply, let's discuss there how to handle the issue. > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: efde234674d9 ("ARM: OMAP4+: control: remove support for legacy pad > read/write") > --- > diff --git a/drivers/staging/media/omap4iss/iss_csiphy.c > b/drivers/staging/media/omap4iss/iss_csiphy.c index > 7c3d55d811ef..24f56ed90ac3 100644 > --- a/drivers/staging/media/omap4iss/iss_csiphy.c > +++ b/drivers/staging/media/omap4iss/iss_csiphy.c > > @@ -140,9 +140,7 @@ int omap4iss_csiphy_config(struct iss_device *iss, > * - bit [18] : CSIPHY1 CTRLCLK enable > * - bit [17:16] : CSIPHY1 config: 00 d-phy, 01/10 ccp2 > */ > - cam_rx_ctrl = omap4_ctrl_pad_readl( > - OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_CAMERA_RX); > - > + cam_rx_ctrl = WARN_ON(1); > > if (subdevs->interface == ISS_INTERFACE_CSI2A_PHY1) { > cam_rx_ctrl &= ~(OMAP4_CAMERARX_CSI21_LANEENABLE_MASK | > @@ -166,8 +164,7 @@ int omap4iss_csiphy_config(struct iss_device *iss, > cam_rx_ctrl |= OMAP4_CAMERARX_CSI22_CTRLCLKEN_MASK; > } > > - omap4_ctrl_pad_writel(cam_rx_ctrl, > - OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_CAMERA_RX); > + WARN_ON(1); > > /* Reset used lane count */ > csi2->phy->used_data_lanes = 0; -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: laurent.pinchart@ideasonboard.com (Laurent Pinchart) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] [media] omap4iss: avoid broken OMAP4 dependency Date: Sun, 12 Apr 2015 15:22:24 +0300 [thread overview] Message-ID: <62125726.UhoJzFudPk@avalon> (raw) In-Reply-To: <3292592.cickJMVhRq@wuerfel> Hi Arnd, Thank you for the patch. On Friday 10 April 2015 22:20:20 Arnd Bergmann wrote: > The omap4iss driver uses an interface that used to be provided > by OMAP4 but has now been removed and replaced with a WARN_ON(1) > statement, which likely broke the iss_csiphy code at runtime. > > It also broke compiling the driver when CONFIG_ARCH_OMAP2PLUS > is set, which is implied by OMAP4: > > drivers/staging/media/omap4iss/iss_csiphy.c: In function > 'omap4iss_csiphy_config': > drivers/staging/media/omap4iss/iss_csiphy.c:167:2: error: implicit > declaration of function 'omap4_ctrl_pad_writel' > [-Werror=implicit-function-declaration] omap4_ctrl_pad_writel(cam_rx_ctrl, > > In turn, this broke ARM allyesconfig builds. Replacing the > omap4_ctrl_pad_writel call with WARN_ON(1) won't make the > situation any worse than it already is, but fixes the build > problem. I've fixed the problem properly by switching to the syscon API. I'll send the patch as a separate reply, let's discuss there how to handle the issue. > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Fixes: efde234674d9 ("ARM: OMAP4+: control: remove support for legacy pad > read/write") > --- > diff --git a/drivers/staging/media/omap4iss/iss_csiphy.c > b/drivers/staging/media/omap4iss/iss_csiphy.c index > 7c3d55d811ef..24f56ed90ac3 100644 > --- a/drivers/staging/media/omap4iss/iss_csiphy.c > +++ b/drivers/staging/media/omap4iss/iss_csiphy.c > > @@ -140,9 +140,7 @@ int omap4iss_csiphy_config(struct iss_device *iss, > * - bit [18] : CSIPHY1 CTRLCLK enable > * - bit [17:16] : CSIPHY1 config: 00 d-phy, 01/10 ccp2 > */ > - cam_rx_ctrl = omap4_ctrl_pad_readl( > - OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_CAMERA_RX); > - > + cam_rx_ctrl = WARN_ON(1); > > if (subdevs->interface == ISS_INTERFACE_CSI2A_PHY1) { > cam_rx_ctrl &= ~(OMAP4_CAMERARX_CSI21_LANEENABLE_MASK | > @@ -166,8 +164,7 @@ int omap4iss_csiphy_config(struct iss_device *iss, > cam_rx_ctrl |= OMAP4_CAMERARX_CSI22_CTRLCLKEN_MASK; > } > > - omap4_ctrl_pad_writel(cam_rx_ctrl, > - OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_CAMERA_RX); > + WARN_ON(1); > > /* Reset used lane count */ > csi2->phy->used_data_lanes = 0; -- Regards, Laurent Pinchart
next prev parent reply other threads:[~2015-04-12 12:22 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-10 20:20 [PATCH] [media] omap4iss: avoid broken OMAP4 dependency Arnd Bergmann 2015-04-10 20:20 ` Arnd Bergmann 2015-04-12 12:22 ` Laurent Pinchart [this message] 2015-04-12 12:22 ` Laurent Pinchart 2015-04-12 12:28 ` [PATCH] v4l: omap4iss: Replace outdated OMAP4 control pad API with syscon Laurent Pinchart 2015-04-12 12:28 ` Laurent Pinchart 2015-04-12 14:31 ` Sakari Ailus 2015-04-12 14:31 ` Sakari Ailus 2015-04-12 14:48 ` Laurent Pinchart 2015-04-12 14:48 ` Laurent Pinchart 2015-04-12 20:04 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=62125726.UhoJzFudPk@avalon \ --to=laurent.pinchart@ideasonboard.com \ --cc=arnd@arndb.de \ --cc=devel@driverdev.osuosl.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=mchehab@osg.samsung.com \ --cc=t-kristo@ti.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.