shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: spi: fix compile error on kernel-4.19

Browse Source 
Change-Id: Ia8c4a1d068089534a5e2757fc7d601665d7fdd96
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
This commit is contained in:
Hu Kejun
2019-09-27 18:35:26 +08:00
committed by Tao Huang
parent afba9f118b
commit 5fab1ad470
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/spi/Kconfig
View File

@@ -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

1
drivers/media/spi/Makefile
View File

@@ -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

4
drivers/media/spi/rk1608_dphy.c
View File

@@ -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);