From edbc7305b60a43a09ef2d1f73c1327e396ead96f Mon Sep 17 00:00:00 2001 From: Hu Kejun Date: Tue, 27 Mar 2018 18:19:15 +0800 Subject: [PATCH] CHROMIUM: media: fix module building error of rockchip isp1 Split the Rockchip ISP MIPI DPHY as a standalone driver. This fix the error of rockchip isp1 and mipi_dphy_sy when building as modules, "multiple definition of `init_module'". Since the commit 4aa8d9814f21 ("CHROMIUM: media: rockchip/isp1: fixup for different media/v4l API") merged, this patch also removes the BROKEN flag in commit 58d5a7a7ca76 ("CHROMIUM: Mark Rockchip ISP1 driver as BROKEN") BUG=b:36227021 TEST=make allmodconfig Change-Id: I7016842bbc97820d260c3200d25cb10b62ba903d Signed-off-by: Shunqian Zheng Reviewed-on: https://chromium-review.googlesource.com/851556 Reviewed-by: Ricky Liang Reviewed-by: Tomasz Figa VIDEO_ROCKCHIP_ISP_DPHY_SY part is not included Change-Id: I8ec9c6af5491511ff88669dbbb302b60f3d43d11 Signed-off-by: Hu Kejun --- drivers/media/platform/Kconfig | 12 +----------- drivers/media/platform/Makefile | 2 +- drivers/media/platform/rockchip/isp1/Kconfig | 12 ++++++++++++ drivers/media/platform/rockchip/isp1/Makefile | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 drivers/media/platform/rockchip/isp1/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 290932cd372d..77fd1119b372 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -102,17 +102,6 @@ config VIDEO_OMAP3_DEBUG ---help--- Enable debug messages on OMAP 3 camera controller driver. -config VIDEO_ROCKCHIP_ISP1 - tristate "Rockchip Image Signal Processing v1 Unit driver" - depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API - depends on ARCH_ROCKCHIP || COMPILE_TEST - select VIDEOBUF2_DMA_CONTIG - select VIDEOBUF2_VMALLOC - select V4L2_FWNODE - default n - ---help--- - Support for ISP1 on the rockchip SoC. - config VIDEO_S3C_CAMIF tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver" depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API @@ -133,6 +122,7 @@ source "drivers/media/platform/s5p-tv/Kconfig" source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/xilinx/Kconfig" source "drivers/media/platform/rk-isp10/Kconfig" +source "drivers/media/platform/rockchip/isp1/Kconfig" endif # V4L_PLATFORM_DRIVERS diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index cf89d139981c..bed294f93a06 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -49,9 +49,9 @@ obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1/ obj-$(CONFIG_VIDEO_ROCKCHIP_RGA) += rockchip/rga/ -obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rockchip/isp1/ obj-y += omap/ +obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rockchip/isp1/ obj-$(CONFIG_VIDEO_AM437X_VPFE) += am437x/ diff --git a/drivers/media/platform/rockchip/isp1/Kconfig b/drivers/media/platform/rockchip/isp1/Kconfig new file mode 100644 index 000000000000..8c52b8355c1a --- /dev/null +++ b/drivers/media/platform/rockchip/isp1/Kconfig @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0 +config VIDEO_ROCKCHIP_ISP1 + tristate "Rockchip Image Signal Processing v1 Unit driver" + depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API + depends on ARCH_ROCKCHIP || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select VIDEOBUF2_VMALLOC + select V4L2_FWNODE + select VIDEO_ROCKCHIP_ISP_DPHY_SY + default n + help + Support for ISP1 on the rockchip SoC. diff --git a/drivers/media/platform/rockchip/isp1/Makefile b/drivers/media/platform/rockchip/isp1/Makefile index 0412e837cafa..b70dacec16e6 100644 --- a/drivers/media/platform/rockchip/isp1/Makefile +++ b/drivers/media/platform/rockchip/isp1/Makefile @@ -1,9 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += video_rkisp1.o + video_rkisp1-objs += rkisp1.o \ dev.o \ regs.o \ isp_stats.o \ isp_params.o \ - mipi_dphy_sy.o \ capture.o