From edfb48bcadc4430e98c59e7692911558bcda2041 Mon Sep 17 00:00:00 2001 From: Jianwei Fan Date: Tue, 2 Aug 2022 11:58:28 +0000 Subject: [PATCH] phy: rockchip: csi2-dphy: modify to adapt fast reverse camera if CONFIG_VIDEO_REVERSE_IMAGE=y Signed-off-by: Jianwei Fan Change-Id: I9ce4c20ea056f1b39b2f29e57a55d79331919759 --- drivers/phy/rockchip/phy-rockchip-csi2-dphy-common.h | 3 +++ drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c | 7 +++++-- drivers/phy/rockchip/phy-rockchip-csi2-dphy.c | 7 +++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-csi2-dphy-common.h b/drivers/phy/rockchip/phy-rockchip-csi2-dphy-common.h index 97d31da945bd..9d4ea147c9c3 100644 --- a/drivers/phy/rockchip/phy-rockchip-csi2-dphy-common.h +++ b/drivers/phy/rockchip/phy-rockchip-csi2-dphy-common.h @@ -120,4 +120,7 @@ struct csi2_dphy_hw { void (*ttl_mode_disable)(struct csi2_dphy_hw *hw); }; +int rockchip_csi2_dphy_hw_init(void); +int rockchip_csi2_dphy_init(void); + #endif diff --git a/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c b/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c index e11f27cfb3b0..527962352337 100644 --- a/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c +++ b/drivers/phy/rockchip/phy-rockchip-csi2-dphy-hw.c @@ -979,16 +979,19 @@ static struct platform_driver rockchip_csi2_dphy_hw_driver = { .of_match_table = rockchip_csi2_dphy_hw_match_id, }, }; -#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC) -static int __init rockchip_csi2_dphy_hw_init(void) + +int rockchip_csi2_dphy_hw_init(void) { return platform_driver_register(&rockchip_csi2_dphy_hw_driver); } +#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC) subsys_initcall(rockchip_csi2_dphy_hw_init); #else +#if !defined(CONFIG_VIDEO_REVERSE_IMAGE) module_platform_driver(rockchip_csi2_dphy_hw_driver); #endif +#endif MODULE_AUTHOR("Rockchip Camera/ISP team"); MODULE_DESCRIPTION("Rockchip MIPI CSI2 DPHY HW driver"); diff --git a/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c b/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c index 7dac6ef5eed8..d6980d49787d 100644 --- a/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c +++ b/drivers/phy/rockchip/phy-rockchip-csi2-dphy.c @@ -806,16 +806,19 @@ struct platform_driver rockchip_csi2_dphy_driver = { .of_match_table = rockchip_csi2_dphy_match_id, }, }; -#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC) -static int __init rockchip_csi2_dphy_init(void) + +int rockchip_csi2_dphy_init(void) { return platform_driver_register(&rockchip_csi2_dphy_driver); } +#if defined(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP) && !defined(CONFIG_INITCALL_ASYNC) subsys_initcall(rockchip_csi2_dphy_init); #else +#if !defined(CONFIG_VIDEO_REVERSE_IMAGE) module_platform_driver(rockchip_csi2_dphy_driver); #endif +#endif MODULE_AUTHOR("Rockchip Camera/ISP team"); MODULE_DESCRIPTION("Rockchip MIPI CSI2 DPHY driver");