From patchwork Wed Jan 28 22:11:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 5737291 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0AD1D9F36E for ; Thu, 29 Jan 2015 03:55:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2CD4120218 for ; Thu, 29 Jan 2015 03:55:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A505201CE for ; Thu, 29 Jan 2015 03:55:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757835AbbA2DzI (ORCPT ); Wed, 28 Jan 2015 22:55:08 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:59706 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752768AbbA2BKx (ORCPT ); Wed, 28 Jan 2015 20:10:53 -0500 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0MAdid-1YNUag30Lj-00BwBQ; Wed, 28 Jan 2015 23:11:21 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Mauro Carvalho Chehab , Jonathan Corbet , 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 Message-ID: <1683657.95n8fCPCvc@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1422479867-3370921-7-git-send-email-arnd@arndb.de> References: <1422479867-3370921-1-git-send-email-arnd@arndb.de> <1422479867-3370921-7-git-send-email-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:/wXLpFudlUuAnks4aNKSta7rexE0Dc8LSp6J9oDvbmY4Zuzmywv ael9TCR8QknPHLrKT/Stxi0/Apwa3ElpBtikkjsLFT3nkkyb5osJri1QdyQyiZA9B2Gy9u1 MbHzUvfNxFkp1ZdhFEx59cj+WddyxdTAEQnQgEzW089jhNURjn20HSATFaCD09aag8zBCsg p8p8+lfXlDhBAwD2TtdbQ== X-UI-Out-Filterresults: notjunk:1; Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 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 Acked-by: Jonathan Corbet Cc: Libin Yang 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 Thanks > (Though I would like a different patch subject, since the current one is > wrong). Done. --- To unsubscribe from this list: send the line "unsubscribe linux-media" 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/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