| From 03a9378331854bf9319e560fbb40eca3acb2dc2b Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Tue, 5 Mar 2019 08:29:48 -0500 |
| Subject: media: staging: davinci_vpfe: disallow building with COMPILE_TEST |
| |
| [ Upstream commit 49dc762cffd8305a861ca649e82dc5533b3e3344 ] |
| |
| The driver should really call dm365_isif_setup_pinmux() through a callback, |
| but uses a hack to include a davinci specific machine header file when |
| compile testing instead. This works almost everywhere, but not on the |
| ARM omap1 platform, which has another header named mach/mux.h. This |
| causes a build failure: |
| |
| drivers/staging/media/davinci_vpfe/dm365_isif.c:2028:2: error: implicit declaration of function 'davinci_cfg_reg' [-Werror,-Wimplicit-function-declaration] |
| davinci_cfg_reg(DM365_VIN_CAM_WEN); |
| ^ |
| drivers/staging/media/davinci_vpfe/dm365_isif.c:2028:2: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] |
| drivers/staging/media/davinci_vpfe/dm365_isif.c:2028:18: error: use of undeclared identifier 'DM365_VIN_CAM_WEN' |
| davinci_cfg_reg(DM365_VIN_CAM_WEN); |
| ^ |
| drivers/staging/media/davinci_vpfe/dm365_isif.c:2029:18: error: use of undeclared identifier 'DM365_VIN_CAM_VD' |
| davinci_cfg_reg(DM365_VIN_CAM_VD); |
| ^ |
| drivers/staging/media/davinci_vpfe/dm365_isif.c:2030:18: error: use of undeclared identifier 'DM365_VIN_CAM_HD' |
| davinci_cfg_reg(DM365_VIN_CAM_HD); |
| ^ |
| drivers/staging/media/davinci_vpfe/dm365_isif.c:2031:18: error: use of undeclared identifier 'DM365_VIN_YIN4_7_EN' |
| davinci_cfg_reg(DM365_VIN_YIN4_7_EN); |
| ^ |
| drivers/staging/media/davinci_vpfe/dm365_isif.c:2032:18: error: use of undeclared identifier 'DM365_VIN_YIN0_3_EN' |
| davinci_cfg_reg(DM365_VIN_YIN0_3_EN); |
| ^ |
| 7 errors generated. |
| |
| Exclude omap1 from compile-testing, under the assumption that all others |
| still work. |
| |
| Fixes: 4907c73deefe ("media: staging: davinci_vpfe: allow building with COMPILE_TEST") |
| |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/staging/media/davinci_vpfe/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/staging/media/davinci_vpfe/Kconfig b/drivers/staging/media/davinci_vpfe/Kconfig |
| index aea449a8dbf8a..76818cc48ddcb 100644 |
| --- a/drivers/staging/media/davinci_vpfe/Kconfig |
| +++ b/drivers/staging/media/davinci_vpfe/Kconfig |
| @@ -1,7 +1,7 @@ |
| config VIDEO_DM365_VPFE |
| tristate "DM365 VPFE Media Controller Capture Driver" |
| depends on VIDEO_V4L2 |
| - depends on (ARCH_DAVINCI_DM365 && !VIDEO_DM365_ISIF) || COMPILE_TEST |
| + depends on (ARCH_DAVINCI_DM365 && !VIDEO_DM365_ISIF) || (COMPILE_TEST && !ARCH_OMAP1) |
| depends on VIDEO_V4L2_SUBDEV_API |
| depends on VIDEO_DAVINCI_VPBE_DISPLAY |
| select VIDEOBUF2_DMA_CONTIG |
| -- |
| 2.20.1 |
| |