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

Commit 2d4f7bda authored by Nickey Yang's avatar Nickey Yang Committed by Andrzej Hajda
Browse files

drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver 



Add the ROCKCHIP DSI controller driver that uses the Synopsys DesignWare
MIPI DSI host controller bridge and remove the old separate one.

changes:

v2:
   add err_pllref, remove unnecessary encoder.enable & disable
   correct spelling mistakes
v3:
   call dw_mipi_dsi_unbind() in dw_mipi_dsi_rockchip_unbind()
   fix typo, use of_device_get_match_data(),
   change some bind() logic into probe()
   add 'dev_set_drvdata()'
v4:
  return -EINVAL when can not get best_freq
  add a clarifying comment when get vco
  add review tag
v5:
  keep our power domain enabled while touching GRF
v6:
  change func name dw_mipi_encoder_disable to
  dw_mipi_dsi_encoder_disable
v7:
  none
v8: Heiko
  add Archit's Review tag
  adapt to recent changes in the original rockchip-dsi driver
  beautify grf-handling
  split hw-setup (resources, dsi-host) from bind into probe
v2-new: Heiko
  add SPDX header instead of license blurb
  drop old versioning to not confuse people
v3-new: Heiko
  include ordering
  moved hwaccess from mode_set to enable callback
  move pllref_clk enablement to bind (needed by bridge mode_set->lane_mbps)
v4-new: Heiko
  rebase against recent rockchip-dsi changes
  move to call component_add in the new glue host-attach

Signed-off-by: default avatarNickey Yang <nickey.yang@rock-chips.com>
Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Reviewed-by: default avatarBrian Norris <briannorris@chromium.org>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Reviewed-by: default avatarArchit Taneja <architt@codeaurora.org>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181001123845.11818-6-heiko@sntech.de
parent 90910a65

drivers/gpu/drm/rockchip/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ config DRM_ROCKCHIP 
	select VIDEOMODE_HELPERS

	select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP

	select DRM_DW_HDMI if ROCKCHIP_DW_HDMI

	select DRM_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI

	select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI

	select DRM_RGB if ROCKCHIP_RGB

	select SND_SOC_HDMI_CODEC if ROCKCHIP_CDN_DP && SND_SOC

	help

drivers/gpu/drm/rockchip/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ rockchipdrm-$(CONFIG_DRM_FBDEV_EMULATION) += rockchip_drm_fbdev.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_DW_MIPI_DSI) += dw-mipi-dsi-rockchip.o

rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o

rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o

rockchipdrm-$(CONFIG_ROCKCHIP_RGB) += rockchip_rgb.o

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

0 → 100644
+939 −0

File added.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0
+0 −1349

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/rockchip/rockchip_drm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int __init rockchip_drm_init(void) 
	ADD_ROCKCHIP_SUB_DRIVER(cdn_dp_driver, CONFIG_ROCKCHIP_CDN_DP);

	ADD_ROCKCHIP_SUB_DRIVER(dw_hdmi_rockchip_pltfm_driver,

				CONFIG_ROCKCHIP_DW_HDMI);

	ADD_ROCKCHIP_SUB_DRIVER(dw_mipi_dsi_driver,

	ADD_ROCKCHIP_SUB_DRIVER(dw_mipi_dsi_rockchip_driver,

				CONFIG_ROCKCHIP_DW_MIPI_DSI);

	ADD_ROCKCHIP_SUB_DRIVER(inno_hdmi_driver, CONFIG_ROCKCHIP_INNO_HDMI);