From: Arnd Bergmann <arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>, Jonathan Corbet <corbet@lwn.net>, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 6/7] [media] marvell-ccic: MMP_CAMERA no longer builds Date: Wed, 28 Jan 2015 23:11:20 +0100 [thread overview] Message-ID: <1683657.95n8fCPCvc@wuerfel> (raw) In-Reply-To: <1422479867-3370921-7-git-send-email-arnd@arndb.de> 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@arndb.de> Acked-by: Jonathan Corbet <corbet@lwn.net> Cc: Libin Yang <lbyang@marvell.com> 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@lwn.net> 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
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 6/7] [media] marvell-ccic: MMP_CAMERA no longer builds Date: Wed, 28 Jan 2015 23:11:20 +0100 [thread overview] Message-ID: <1683657.95n8fCPCvc@wuerfel> (raw) In-Reply-To: <1422479867-3370921-7-git-send-email-arnd@arndb.de> 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@arndb.de> Acked-by: Jonathan Corbet <corbet@lwn.net> Cc: Libin Yang <lbyang@marvell.com> 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@lwn.net> 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
next prev parent reply other threads:[~2015-01-29 3:55 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-28 21:17 [PATCH 0/7] [media] ARM randconfig fixes Arnd Bergmann 2015-01-28 21:17 ` Arnd Bergmann 2015-01-28 21:17 ` [PATCH 1/7] [media] timberdale: do not select TIMB_DMA Arnd Bergmann 2015-01-28 21:17 ` Arnd Bergmann 2015-01-28 21:17 ` [PATCH 2/7] [media] radio/aimslab: use mdelay instead of udelay Arnd Bergmann 2015-01-28 21:17 ` Arnd Bergmann 2015-01-28 21:17 ` [PATCH 3/7] [media] staging/davinci/vpfe/dm365: add missing dependencies Arnd Bergmann 2015-01-28 21:17 ` Arnd Bergmann 2015-01-29 10:26 ` Lad, Prabhakar 2015-01-29 10:26 ` Lad, Prabhakar 2015-01-28 21:17 ` [PATCH 4/7] [media] siano: fix Kconfig dependencies Arnd Bergmann 2015-01-28 21:17 ` Arnd Bergmann 2015-01-28 21:17 ` [PATCH 5/7] [media] gspca: add INPUT dependency Arnd Bergmann 2015-01-28 21:17 ` Arnd Bergmann 2015-01-28 21:17 ` [PATCH 6/7] [media] marvell-ccic: MMP_CAMERA never worked Arnd Bergmann 2015-01-28 21:17 ` Arnd Bergmann 2015-01-28 21:57 ` Jonathan Corbet 2015-01-28 21:57 ` Jonathan Corbet 2015-01-28 22:11 ` Arnd Bergmann [this message] 2015-01-28 22:11 ` [PATCH v2 6/7] [media] marvell-ccic: MMP_CAMERA no longer builds Arnd Bergmann 2015-01-28 21:17 ` [PATCH 7/7] [media] marvell-ccic needs VIDEOBUF2_DMA_SG Arnd Bergmann 2015-01-28 21:17 ` Arnd Bergmann 2015-01-28 21:58 ` Jonathan Corbet 2015-01-28 21:58 ` Jonathan Corbet
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=1683657.95n8fCPCvc@wuerfel \ --to=arnd@arndb.de \ --cc=corbet@lwn.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=mchehab@osg.samsung.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.