[PATCH] [media] omap4iss: avoid broken OMAP4 dependency

From: Arnd Bergmann
Date: Fri Apr 10 2015 - 16:20:45 EST

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]

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

Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
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(
+ cam_rx_ctrl = WARN_ON(1);

if (subdevs->interface == ISS_INTERFACE_CSI2A_PHY1) {
@@ -166,8 +164,7 @@ int omap4iss_csiphy_config(struct iss_device *iss,

- omap4_ctrl_pad_writel(cam_rx_ctrl,
+ WARN_ON(1);

/* Reset used lane count */
csi2->phy->used_data_lanes = 0;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/