rockchip: move vop driver from rk3288 to rockchip common

The rk3288 and rk3399 can use a common driver even that
there are some different registers.

BRANCH=none
BUG=chrome-os-partner:51537
TEST=boot from veyron_jerry and check display

Change-Id: I510f68ba00308e47608d6e9921154a5c66ad8858
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 1d857a7aa68d831a5007210255b121fed7a9e8de
Original-Change-Id: I063e3eebc836debc01c450d8ab9f1524c9a47c56
Original-Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/341633
Original-Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/14731
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

1 files changed, 0 insertions, 150 deletions

diff --git a/src/soc/rockchip/rk3288/vop.c b/src/soc/rockchip/rk3288/vop.c
deleted file mode 100644
index 607cf8f523..0000000000
--- a/src/soc/rockchip/rk3288/vop.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 Rockchip Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <arch/io.h>
-#include <console/console.h>
-#include <delay.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stddef.h>
-#include <soc/addressmap.h>
-#include <soc/clock.h>
-#include <soc/edp.h>
-#include <soc/vop.h>
-
-#include "chip.h"
-
-static struct rk3288_vop_regs * const vop_regs[] = {
-	(struct rk3288_vop_regs *)VOP_BIG_BASE,
-	(struct rk3288_vop_regs *)VOP_LIT_BASE
-};
-
-void rkvop_enable(u32 vop_id, u32 fbbase, const struct edid *edid)
-{
-	u32 lb_mode;
-	u32 rgb_mode;
-	u32 hactive = edid->mode.ha;
-	u32 vactive = edid->mode.va;
-	u32 hsync_len = edid->mode.hspw;
-	u32 hback_porch = edid->mode.hbl - edid->mode.hso - edid->mode.hspw;
-	u32 vsync_len = edid->mode.vspw;
-	u32 vback_porch = edid->mode.vbl - edid->mode.vso - edid->mode.vspw;
-	u32 xpos = 0, ypos = 0;
-	struct rk3288_vop_regs *preg = vop_regs[vop_id];
-
-	write32(&preg->win0_act_info,
-		V_ACT_WIDTH(hactive - 1) | V_ACT_HEIGHT(vactive - 1));
-
-	write32(&preg->win0_dsp_st, V_DSP_XST(xpos + hsync_len + hback_porch) |
-				    V_DSP_YST(ypos + vsync_len + vback_porch));
-
-	write32(&preg->win0_dsp_info, V_DSP_WIDTH(hactive - 1) |
-				      V_DSP_HEIGHT(vactive - 1));
-
-	clrsetbits_le32(&preg->win0_color_key, M_WIN0_KEY_EN | M_WIN0_KEY_COLOR,
-						V_WIN0_KEY_EN(0) |
-						V_WIN0_KEY_COLOR(0));
-
-	switch (edid->framebuffer_bits_per_pixel) {
-	case 16:
-		rgb_mode = RGB565;
-		write32(&preg->win0_vir, V_RGB565_VIRWIDTH(hactive));
-		break;
-	case 24:
-		rgb_mode = RGB888;
-		write32(&preg->win0_vir, V_RGB888_VIRWIDTH(hactive));
-		break;
-	case 32:
-	default:
-		rgb_mode = ARGB8888;
-		write32(&preg->win0_vir, V_ARGB888_VIRWIDTH(hactive));
-		break;
-	}
-
-	if (hactive > 2560)
-		lb_mode = LB_RGB_3840X2;
-	else if (hactive > 1920)
-		lb_mode = LB_RGB_2560X4;
-	else if (hactive > 1280)
-		lb_mode = LB_RGB_1920X5;
-	else
-		lb_mode = LB_RGB_1280X8;
-
-	clrsetbits_le32(&preg->win0_ctrl0,
-			M_WIN0_LB_MODE | M_WIN0_DATA_FMT | M_WIN0_EN,
-			V_WIN0_LB_MODE(lb_mode) |
-			V_WIN0_DATA_FMT(rgb_mode) | V_WIN0_EN(1));
-
-	write32(&preg->win0_yrgb_mst, fbbase);
-
-	write32(&preg->reg_cfg_done, 0x01); /* enable reg config */
-}
-
-void rkvop_mode_set(u32 vop_id, const struct edid *edid, u32 mode)
-{
-	u32 hactive = edid->mode.ha;
-	u32 vactive = edid->mode.va;
-	u32 hfront_porch = edid->mode.hso;
-	u32 hsync_len = edid->mode.hspw;
-	u32 hback_porch = edid->mode.hbl - edid->mode.hso - edid->mode.hspw;
-	u32 vfront_porch = edid->mode.vso;
-	u32 vsync_len = edid->mode.vspw;
-	u32 vback_porch = edid->mode.vbl - edid->mode.vso - edid->mode.vspw;
-	struct rk3288_vop_regs *preg = vop_regs[vop_id];
-
-	switch (mode) {
-
-	case VOP_MODE_HDMI:
-		clrsetbits_le32(&preg->sys_ctrl,
-				M_ALL_OUT_EN, V_HDMI_OUT_EN(1));
-		break;
-
-	case VOP_MODE_EDP:
-	default:
-		clrsetbits_le32(&preg->sys_ctrl,
-				M_ALL_OUT_EN, V_EDP_OUT_EN(1));
-		break;
-	}
-
-	clrsetbits_le32(&preg->dsp_ctrl0,
-			M_DSP_OUT_MODE | M_DSP_VSYNC_POL | M_DSP_HSYNC_POL,
-			V_DSP_OUT_MODE(15) |
-			V_DSP_HSYNC_POL(edid->mode.phsync == '+') |
-			V_DSP_VSYNC_POL(edid->mode.pvsync == '+'));
-
-	write32(&preg->dsp_htotal_hs_end, V_HSYNC(hsync_len) |
-		V_HORPRD(hsync_len + hback_porch + hactive + hfront_porch));
-
-	write32(&preg->dsp_hact_st_end,
-		V_HEAP(hsync_len + hback_porch + hactive) |
-		V_HASP(hsync_len + hback_porch));
-
-	write32(&preg->dsp_vtotal_vs_end, V_VSYNC(vsync_len) |
-		V_VERPRD(vsync_len + vback_porch + vactive + vfront_porch));
-
-	write32(&preg->dsp_vact_st_end,
-		V_VAEP(vsync_len + vback_porch + vactive) |
-		V_VASP(vsync_len + vback_porch));
-
-	write32(&preg->post_dsp_hact_info,
-		V_HEAP(hsync_len + hback_porch + hactive) |
-		V_HASP(hsync_len + hback_porch));
-
-	write32(&preg->post_dsp_vact_info,
-		V_VAEP(vsync_len + vback_porch + vactive) |
-		V_VASP(vsync_len + vback_porch));
-
-	write32(&preg->reg_cfg_done, 0x01); /* enable reg config */
-}