[PATCH v2 6/7] [media] marvell-ccic: MMP_CAMERA no longer builds

[Arnd Bergmann]

The mmp ccic driver expects a platform_data structure that does not exist
in the mainline kernel and presumably was changed in a kernel fork, which
leads to build errors now:

media/platform/marvell-ccic/mmp-driver.c: In function 'mmpcam_calc_dphy':
media/platform/marvell-ccic/mmp-driver.c:252:15: error: 'struct mmp_camera_platform_data' has no member named 'dphy3_algo'
  switch (pdata->dphy3_algo) {
               ^
media/platform/marvell-ccic/mmp-driver.c:253:7: error: 'DPHY3_ALGO_PXA910' undeclared (first use in this function)
  case DPHY3_ALGO_PXA910:
       ^
media/platform/marvell-ccic/mmp-driver.c:253:7: note: each undeclared identifier is reported only once for each function it appears in
media/platform/marvell-ccic/mmp-driver.c:257:8: error: 'struct mmp_camera_platform_data' has no member named 'dphy'

This marks the driver as 'BROKEN' but keeps the code around.
Alternatively it could be removed entirely.

Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Acked-by: Jonathan Corbet <corbet@xxxxxxx>
Cc: Libin Yang <lbyang@xxxxxxxxxxx>
Fixes: 05fed81625bf75 ("[media] marvell-ccic: add MIPI support for marvell-ccic driver")
----
> This driver most assuredly did work on XO 1.75 machines, and the
> platform_data structure does exist; it's the stuff added by Libin
> afterward that apparently broke things.  Strange that it only came out now,
> though, nearly two years later. Libin, any thoughts on this?

I've carried this workaround in a private git tree that has hundreds of
randconfig fixes, just started flushing out some of the patches again.
The configuration in which the driver gets selected is relatively rare,
and it is not enabled in any of the defconfigs obviously.

When I originally wrote the patch description, I must have missed the
fact that the driver was moved from a different directory and I only
saw that it was broken at the point when it showed up in
drivers/media/platform/marvell-ccic/.

> Meanwhile, it is clearly broken, and I don't have an immediate fix, so,
>
> Acked-by: Jonathan Corbet <corbet@xxxxxxx>

Thanks

> (Though I would like a different patch subject, since the current one is
> wrong).

Done.

diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell-ccic/Kconfig
index 6265d36adceb..7ac0f13c98be 100644
--- a/drivers/media/platform/marvell-ccic/Kconfig
+++ b/drivers/media/platform/marvell-ccic/Kconfig
@@ -13,7 +13,7 @@ config VIDEO_CAFE_CCIC
 config VIDEO_MMP_CAMERA
 	tristate "Marvell Armada 610 integrated camera controller support"
 	depends on ARCH_MMP && I2C && VIDEO_V4L2
-	depends on HAS_DMA
+	depends on HAS_DMA && BROKEN
 	select VIDEO_OV7670
 	select I2C_GPIO
 	select VIDEOBUF2_DMA_SG

--
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/