shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: cdn-dp: fix some error

Browse Source 
This commit is for fixing some error, according to the comments from
CL:5442
1. correct the use of rate
2. remove the phy switch from DP driver, it is controlled in PHY driver
3. add some const keyword
4. clear int_mask to 0
5. modify spelling errors

Change-Id: I239a9e7183593b85485abb6d288d6cb1558c65f7
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
This commit is contained in:
Chris Zhong
2016-11-22 15:50:05 -05:00
committed by Huang, Tao
parent cb22a964b4
commit 152af2e38e
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/rockchip/cdn-dp-core.c
View File

@@ -43,8 +43,6 @@
#define GRF_SOC_CON9 0x6224
#define DP_SEL_VOP_LIT BIT(12)
#define GRF_SOC_CON26 0x6268
#define UPHY_SEL_BIT 3
#define UPHY_SEL_MASK BIT(19)
#define DPTX_HPD_SEL (3 << 12)
#define DPTX_HPD_DEL (2 << 12)
#define DPTX_HPD_SEL_MASK (3 << 28)
@@ -122,7 +120,7 @@ static int cdn_dp_clk_enable(struct cdn_dp_device *dp)
reset_control_deassert(dp->apb_rst);
rate = clk_get_rate(dp->core_clk);
if (rate < 0) {
if (!rate) {
DRM_DEV_ERROR(dp->dev, "get clk rate failed: %d\n", rate);
goto err_set_rate;
}
@@ -217,7 +215,7 @@ static void cdn_dp_connector_destroy(struct drm_connector *connector)
drm_connector_cleanup(connector);
}
static struct drm_connector_funcs cdn_dp_atomic_connector_funcs = {
static const struct drm_connector_funcs cdn_dp_atomic_connector_funcs = {
.dpms = drm_atomic_helper_connector_dpms,
.detect = cdn_dp_connector_detect,
.destroy = cdn_dp_connector_destroy,
@@ -393,11 +391,6 @@ static int cdn_dp_enable_phy(struct cdn_dp_device *dp, struct cdn_dp_port *port)
union extcon_property_value property;
int ret;
ret = cdn_dp_grf_write(dp, GRF_SOC_CON26,
(port->id << UPHY_SEL_BIT) | UPHY_SEL_MASK);
if (ret)
return ret;
if (!port->phy_enabled) {
ret = phy_power_on(port->phy);
if (ret) {
@@ -702,14 +695,14 @@ static int cdn_dp_encoder_atomic_check(struct drm_encoder *encoder,
return 0;
}
static struct drm_encoder_helper_funcs cdn_dp_encoder_helper_funcs = {
static const struct drm_encoder_helper_funcs cdn_dp_encoder_helper_funcs = {
.mode_set = cdn_dp_encoder_mode_set,
.enable = cdn_dp_encoder_enable,
.disable = cdn_dp_encoder_disable,
.atomic_check = cdn_dp_encoder_atomic_check,
};
static struct drm_encoder_funcs cdn_dp_encoder_funcs = {
static const struct drm_encoder_funcs cdn_dp_encoder_funcs = {
.destroy = drm_encoder_cleanup,
};

4
drivers/gpu/drm/rockchip/cdn-dp-reg.c
View File

@@ -79,8 +79,8 @@ void cdn_dp_clock_reset(struct cdn_dp_device *dp)
SOURCE_CRYPTO_SYS_CLK_EN;
writel(val, dp->regs + SOURCE_CRYPTO_CAR);
val = ~(MAILBOX_INT_MASK_BIT | PIF_INT_MASK_BIT) & ALL_INT_MASK;
writel(val, dp->regs + APB_INT_MASK);
/* enable Mailbox and PIF interrupt */
writel(0, dp->regs + APB_INT_MASK);
}
static int cdn_dp_mailbox_read(struct cdn_dp_device *dp)

2
drivers/gpu/drm/rockchip/cdn-dp-reg.h
View File

@@ -422,7 +422,7 @@
#define SPDIF_JITTER_THRSH(x) (((x) & 0xff) << 3)
#define SPDIF_JITTER_AVG_WIN(x) ((x) & 0x7)
/* Refernce cycles when using lane clock as refernce */
/* Reference cycles when using lane clock as reference */
#define LANE_REF_CYC 0xf000
enum voltage_swing_level {