[v2] media: staging: rkisp1: The rkisp1 should be depended on CONFIG_OF
Commit Message
If 'CONFIG_VIDEO_ROCKCHIP_ISP1' configured but no 'CONFIG_OF', the
default configuration maybe:
# CONFIG_OF is not set
CONFIG_PHY_ROCKCHIP_DPHY_RX0=y
CONFIG_VIDEO_ROCKCHIP_ISP1=y
This will cause the following compilation errors:
drivers/staging/media/rkisp1/rkisp1-isp.o:
In function `rkisp1_mipi_csi2_start.isra.5':
rkisp1-isp.c:(.text+0x1238):
undefined reference to `phy_mipi_dphy_get_default_config'
make: *** [vmlinux] Error 1
Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
---
drivers/staging/media/rkisp1/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Em Tue, 14 Jan 2020 10:17:20 +0800
Zhang Xiaoxu <zhangxiaoxu5@huawei.com> escreveu:
> If 'CONFIG_VIDEO_ROCKCHIP_ISP1' configured but no 'CONFIG_OF', the
> default configuration maybe:
> # CONFIG_OF is not set
> CONFIG_PHY_ROCKCHIP_DPHY_RX0=y
> CONFIG_VIDEO_ROCKCHIP_ISP1=y
>
> This will cause the following compilation errors:
> drivers/staging/media/rkisp1/rkisp1-isp.o:
> In function `rkisp1_mipi_csi2_start.isra.5':
> rkisp1-isp.c:(.text+0x1238):
> undefined reference to `phy_mipi_dphy_get_default_config'
> make: *** [vmlinux] Error 1
>
> Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
> ---
> drivers/staging/media/rkisp1/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/rkisp1/Kconfig b/drivers/staging/media/rkisp1/Kconfig
> index b859a493caba..23080b7f07a6 100644
> --- a/drivers/staging/media/rkisp1/Kconfig
> +++ b/drivers/staging/media/rkisp1/Kconfig
> @@ -3,7 +3,7 @@
> 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
> + depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF
Makes sense. Yet, I would prefer to have this as:
depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF
depends on ARCH_ROCKCHIP || COMPILE_TEST
Just to let the arch-specific/compile test dependency line clearer.
> select VIDEOBUF2_DMA_CONTIG
> select VIDEOBUF2_VMALLOC
> select V4L2_FWNODE
Cheers,
Mauro
@@ -3,7 +3,7 @@
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
+ depends on (ARCH_ROCKCHIP || COMPILE_TEST) && OF
select VIDEOBUF2_DMA_CONTIG
select VIDEOBUF2_VMALLOC
select V4L2_FWNODE