Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8820b68b authored by Jeffy Chen's avatar Jeffy Chen Committed by Sean Paul
Browse files

drm/rockchip: Refactor the component match logic. 



Currently we are adding all components from the dts, if one of their
drivers been disabled, we would not be able to bring up others.

Refactor component match logic, follow exynos drm.

Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Acked-by: default avatarMark Yao <mark.yao@rock-chips.com>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1490152880-21855-1-git-send-email-jeffy.chen@rock-chips.com
parent 0cad7f71

drivers/gpu/drm/rockchip/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config DRM_ROCKCHIP 
	  IP found on the SoC.



config ROCKCHIP_ANALOGIX_DP

	tristate "Rockchip specific extensions for Analogix DP driver"

	bool "Rockchip specific extensions for Analogix DP driver"

	depends on DRM_ROCKCHIP

	select DRM_ANALOGIX_DP

	help
@@ -22,7 +22,7 @@ config ROCKCHIP_ANALOGIX_DP 
	  on RK3288 based SoC, you should selet this option.



config ROCKCHIP_CDN_DP

        tristate "Rockchip cdn DP"

        bool "Rockchip cdn DP"

        depends on DRM_ROCKCHIP

	depends on EXTCON

	select SND_SOC_HDMI_CODEC if SND_SOC
@@ -33,7 +33,7 @@ config ROCKCHIP_CDN_DP 
	  option.



config ROCKCHIP_DW_HDMI

        tristate "Rockchip specific extensions for Synopsys DW HDMI"

        bool "Rockchip specific extensions for Synopsys DW HDMI"

        depends on DRM_ROCKCHIP

        select DRM_DW_HDMI

        help
@@ -43,7 +43,7 @@ config ROCKCHIP_DW_HDMI 
	  option.



config ROCKCHIP_DW_MIPI_DSI

	tristate "Rockchip specific extensions for Synopsys DW MIPI DSI"

	bool "Rockchip specific extensions for Synopsys DW MIPI DSI"

	depends on DRM_ROCKCHIP

	select DRM_MIPI_DSI

	help
@@ -53,7 +53,7 @@ config ROCKCHIP_DW_MIPI_DSI 
	 option.



config ROCKCHIP_INNO_HDMI

	tristate "Rockchip specific extensions for Innosilicon HDMI"

	bool "Rockchip specific extensions for Innosilicon HDMI"

	depends on DRM_ROCKCHIP

	help

	  This selects support for Rockchip SoC specific extensions

drivers/gpu/drm/rockchip/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ 
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o \

		rockchip_drm_gem.o rockchip_drm_psr.o rockchip_drm_vop.o

		rockchip_drm_gem.o rockchip_drm_psr.o \

		rockchip_drm_vop.o rockchip_vop_reg.o

rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.o



obj-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o

obj-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp.o

cdn-dp-objs := cdn-dp-core.o cdn-dp-reg.o

obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o

obj-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o

obj-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o

rockchipdrm-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o

rockchipdrm-$(CONFIG_ROCKCHIP_CDN_DP) += cdn-dp-core.o cdn-dp-reg.o

rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o

rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o

rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o



obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_vop_reg.o
 
obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o

drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

+1 −8
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static const struct of_device_id rockchip_dp_dt_ids[] = { 
};

MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids);



static struct platform_driver rockchip_dp_driver = {

struct platform_driver rockchip_dp_driver = {

	.probe = rockchip_dp_probe,

	.remove = rockchip_dp_remove,

	.driver = {
@@ -516,10 +516,3 @@ static struct platform_driver rockchip_dp_driver = { 
		   .of_match_table = of_match_ptr(rockchip_dp_dt_ids),

	},

};
 


module_platform_driver(rockchip_dp_driver);



MODULE_AUTHOR("Yakir Yang <ykk@rock-chips.com>");

MODULE_AUTHOR("Jeff chen <jeff.chen@rock-chips.com>");

MODULE_DESCRIPTION("Rockchip Specific Analogix-DP Driver Extension");

MODULE_LICENSE("GPL v2");

drivers/gpu/drm/rockchip/cdn-dp-core.c

+1 −7
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ static const struct dev_pm_ops cdn_dp_pm_ops = { 
				cdn_dp_resume)

};



static struct platform_driver cdn_dp_driver = {

struct platform_driver cdn_dp_driver = {

	.probe = cdn_dp_probe,

	.remove = cdn_dp_remove,

	.shutdown = cdn_dp_shutdown,
@@ -1255,9 +1255,3 @@ static struct platform_driver cdn_dp_driver = { 
		   .pm = &cdn_dp_pm_ops,

	},

};
 


module_platform_driver(cdn_dp_driver);



MODULE_AUTHOR("Chris Zhong <zyw@rock-chips.com>");

MODULE_DESCRIPTION("cdn DP Driver");

MODULE_LICENSE("GPL v2");

drivers/gpu/drm/rockchip/dw-mipi-dsi.c

+1 −7
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ static int dw_mipi_dsi_remove(struct platform_device *pdev) 
	return 0;

}



static struct platform_driver dw_mipi_dsi_driver = {

struct platform_driver dw_mipi_dsi_driver = {

	.probe		= dw_mipi_dsi_probe,

	.remove		= dw_mipi_dsi_remove,

	.driver		= {
@@ -1312,9 +1312,3 @@ static struct platform_driver dw_mipi_dsi_driver = { 
		.name	= DRIVER_NAME,

	},

};
 
module_platform_driver(dw_mipi_dsi_driver);



MODULE_DESCRIPTION("ROCKCHIP MIPI DSI host controller driver");

MODULE_AUTHOR("Chris Zhong <zyw@rock-chips.com>");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:" DRIVER_NAME);