From 5fab1ad4701329bc9978a7dca72960804e2dea7a Mon Sep 17 00:00:00 2001 From: Hu Kejun Date: Fri, 27 Sep 2019 18:35:26 +0800 Subject: [PATCH] media: spi: fix compile error on kernel-4.19 Change-Id: Ia8c4a1d068089534a5e2757fc7d601665d7fdd96 Signed-off-by: Hu Kejun --- drivers/media/spi/Kconfig | 9 +++++++++ drivers/media/spi/Makefile | 1 + drivers/media/spi/rk1608_dphy.c | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig index b07ac86fc53c..fcc2e849c154 100644 --- a/drivers/media/spi/Kconfig +++ b/drivers/media/spi/Kconfig @@ -9,6 +9,15 @@ config VIDEO_GS1662 ---help--- Enable the GS1662 driver which serializes video streams. +config VIDEO_ROCKCHIP_PREISP + tristate "Rockchip Image Signal Pre-processing driver" + depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && SPI_MASTER + depends on ARCH_ROCKCHIP || COMPILE_TEST + select V4L2_FWNODE + default n + help + Support for Pre-isp on the rockchip SoC. + endmenu endif diff --git a/drivers/media/spi/Makefile b/drivers/media/spi/Makefile index 9e536777a330..b431a67193cc 100644 --- a/drivers/media/spi/Makefile +++ b/drivers/media/spi/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_VIDEO_GS1662) += gs1662.o +obj-$(CONFIG_VIDEO_ROCKCHIP_PREISP) += rk1608_dphy.o rk1608.o obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o ccflags-y += -Idrivers/media/dvb-core diff --git a/drivers/media/spi/rk1608_dphy.c b/drivers/media/spi/rk1608_dphy.c index d40ee4687e04..44c1e7c59961 100644 --- a/drivers/media/spi/rk1608_dphy.c +++ b/drivers/media/spi/rk1608_dphy.c @@ -478,9 +478,9 @@ static int rk1608_dphy_probe(struct platform_device *pdev) sd->internal_ops = &dphy_subdev_internal_ops; sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; dphy->pad.flags = MEDIA_PAD_FL_SOURCE; - sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_SENSOR; + sd->entity.function = MEDIA_ENT_F_CAM_SENSOR; - ret = media_entity_init(&sd->entity, 1, &dphy->pad, 0); + ret = media_entity_pads_init(&sd->entity, 1, &dphy->pad); if (ret < 0) goto handler_err; ret = v4l2_async_register_subdev(sd);