This series provides HDMI enablement for the RK3399 and will support video console on the RK3399 either with VOP-lit or VOP-big: - pinctrl and clk support for the hdmi node - a refactoring of rk_vop.c and rk_hdmi.c to allow for the minor differences between the RK3288 and RK3399 VOP and HDMI blocks
This has been tested (on top of sjg/master) using 'bmp display' and 'setenv stdout vidconsole' on the RK3399-Q7 with various HDMI monitors, both for VOP-lit and VOP-big (setting the other one to 'disabled').
v4 splits the changes to the rk_vop and rk_hdmi components into more manageable series of changes.
Changes in v4: - added patch to break down into smaller changes - added patch to break down into smaller changes - added patch to break down into smaller changes - split the massive "refactor, split and add RK3399 support"-change into smaller chunks that are more easily digestible - new patch (split off from the earlier RK3399 HDMI encoder change) - splits the large change into smaller changes
Changes in v3: - splits the VOP driver into SOC-specific and common portions - moves the "maximum x" and "maximum y" resolution config into Kconfig (instead of having hard-coded values that may need to be revised each time someone adds a new device or new features) - split into separate drivers for the SOC-specific portion of the driver - rebase to sjg/next
Changes in v2: - removed DEBUG from the patch (as was done in our production branches, but missing from the patch-prep branch) - updated SJG's comment (with a TODO for the RK3288) to reflect the new code structure
Philipp Tomsich (9): rockchip: video: Kconfig: reformat help for VIDEO_ROCKCHIP rockchip: video: Kconfig: set MAX_XRES and MAX_YRES via Kconfig rockchip: video: refactor rk_vop and split RK3328-specific code off rockchip: video: rk3399: enable HDMI output (from the rk_vop) for the RK3399 rockchip: video: add mpixelclock settings from Linux driver rockchip: video: split RK3228-specific part off from rk_hdmi rockchip: video: rk3399: add HDMI TX support on the RK3399 rockchip: dts: rk3399: enable HDMI output in the DTS rockchip: board: puma_rk3399: enable BMP_16BPP, BMP_24BPP and BMP_32BPP
arch/arm/dts/rk3399.dtsi | 39 +++++ arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 3 + arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 ++ drivers/video/rockchip/Kconfig | 29 +++- drivers/video/rockchip/Makefile | 6 +- drivers/video/rockchip/rk3288_hdmi.c | 116 +++++++++++++++ drivers/video/rockchip/rk3288_vop.c | 95 ++++++++++++ drivers/video/rockchip/rk3399_hdmi.c | 81 +++++++++++ drivers/video/rockchip/rk3399_vop.c | 105 ++++++++++++++ drivers/video/rockchip/rk_hdmi.c | 114 ++++----------- drivers/video/rockchip/rk_hdmi.h | 32 ++++ drivers/video/rockchip/rk_vop.c | 185 ++++++++++++------------ drivers/video/rockchip/rk_vop.h | 32 ++++ include/configs/puma_rk3399.h | 4 + 14 files changed, 662 insertions(+), 190 deletions(-) create mode 100644 drivers/video/rockchip/rk3288_hdmi.c create mode 100644 drivers/video/rockchip/rk3288_vop.c create mode 100644 drivers/video/rockchip/rk3399_hdmi.c create mode 100644 drivers/video/rockchip/rk3399_vop.c create mode 100644 drivers/video/rockchip/rk_hdmi.h create mode 100644 drivers/video/rockchip/rk_vop.h