Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1209878
| From | Yakir Yang <ykk@rock-chips.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 10/14] drm: bridge: analogix_dp: add some rk3288 special registers setting |
| Date | 2015-08-19 17:00 +0200 |
| Message-ID | <pZd0n-BY-39@gated-at.bofh.it> (permalink) |
| References | <pZcQF-qk-19@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
RK3288 need some special registers setting, we can separate
them out by the dev_type of plat_data.
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
Changes in v3: None
Changes in v2:
- Fix compile failed dut to phy_pd_addr variable misspell error
drivers/gpu/drm/bridge/analogix_dp_reg.c | 76 ++++++++++++++++++++------------
drivers/gpu/drm/bridge/analogix_dp_reg.h | 12 +++++
2 files changed, 60 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/bridge/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix_dp_reg.c
index cc5cdbf..a0fc1fb 100644
--- a/drivers/gpu/drm/bridge/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix_dp_reg.c
@@ -15,6 +15,8 @@
#include <linux/delay.h>
#include <linux/gpio.h>
+#include <drm/bridge/analogix_dp.h>
+
#include "analogix_dp_core.h"
#include "analogix_dp_reg.h"
@@ -72,6 +74,14 @@ void analogix_dp_init_analog_param(struct analogix_dp_device *dp)
reg = SEL_24M | TX_DVDD_BIT_1_0625V;
writel(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_2);
+ if (dp->plat_data && (dp->plat_data->dev_type == RK3288_DP)) {
+ writel(REF_CLK_24M, dp->reg_base + ANALOGIX_DP_PLL_REG_1);
+ writel(0x95, dp->reg_base + ANALOGIX_DP_PLL_REG_2);
+ writel(0x40, dp->reg_base + ANALOGIX_DP_PLL_REG_3);
+ writel(0x58, dp->reg_base + ANALOGIX_DP_PLL_REG_4);
+ writel(0x22, dp->reg_base + ANALOGIX_DP_PLL_REG_5);
+ }
+
reg = DRIVE_DVDD_BIT_1_0625V | VCO_BIT_600_MICRO;
writel(reg, dp->reg_base + ANALOGIX_DP_ANALOG_CTL_3);
@@ -206,81 +216,85 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp,
bool enable)
{
u32 reg;
+ u32 phy_pd_addr = ANALOGIX_DP_PHY_PD;
+
+ if (dp->plat_data && (dp->plat_data->dev_type == RK3288_DP))
+ phy_pd_addr = ANALOGIX_DP_PD;
switch (block) {
case AUX_BLOCK:
if (enable) {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg |= AUX_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg &= ~AUX_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
}
break;
case CH0_BLOCK:
if (enable) {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg |= CH0_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg &= ~CH0_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
}
break;
case CH1_BLOCK:
if (enable) {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg |= CH1_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg &= ~CH1_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
}
break;
case CH2_BLOCK:
if (enable) {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg |= CH2_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg &= ~CH2_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
}
break;
case CH3_BLOCK:
if (enable) {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg |= CH3_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg &= ~CH3_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
}
break;
case ANALOG_TOTAL:
if (enable) {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg |= DP_PHY_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
} else {
- reg = readl(dp->reg_base + ANALOGIX_DP_PHY_PD);
+ reg = readl(dp->reg_base + phy_pd_addr);
reg &= ~DP_PHY_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
}
break;
case POWER_ALL:
if (enable) {
reg = DP_PHY_PD | AUX_PD | CH3_PD | CH2_PD |
CH1_PD | CH0_PD;
- writel(reg, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(reg, dp->reg_base + phy_pd_addr);
} else {
- writel(0x00, dp->reg_base + ANALOGIX_DP_PHY_PD);
+ writel(0x00, dp->reg_base + phy_pd_addr);
}
break;
default:
@@ -399,8 +413,14 @@ void analogix_dp_init_aux(struct analogix_dp_device *dp)
analogix_dp_reset_aux(dp);
/* Disable AUX transaction H/W retry */
- reg = AUX_BIT_PERIOD_EXPECTED_DELAY(3) | AUX_HW_RETRY_COUNT_SEL(0) |
- AUX_HW_RETRY_INTERVAL_600_MICROSECONDS;
+ if (dp->plat_data && (dp->plat_data->dev_type == RK3288_DP))
+ reg = AUX_BIT_PERIOD_EXPECTED_DELAY(0) |
+ AUX_HW_RETRY_COUNT_SEL(3) |
+ AUX_HW_RETRY_INTERVAL_600_MICROSECONDS;
+ else
+ reg = AUX_BIT_PERIOD_EXPECTED_DELAY(3) |
+ AUX_HW_RETRY_COUNT_SEL(0) |
+ AUX_HW_RETRY_INTERVAL_600_MICROSECONDS;
writel(reg, dp->reg_base + ANALOGIX_DP_AUX_HW_RETRY_CTL);
/* Receive AUX Channel DEFER commands equal to DEFFER_COUNT*64 */
diff --git a/drivers/gpu/drm/bridge/analogix_dp_reg.h b/drivers/gpu/drm/bridge/analogix_dp_reg.h
index bed226f..e38af21 100644
--- a/drivers/gpu/drm/bridge/analogix_dp_reg.h
+++ b/drivers/gpu/drm/bridge/analogix_dp_reg.h
@@ -22,6 +22,14 @@
#define ANALOGIX_DP_VIDEO_CTL_8 0x3C
#define ANALOGIX_DP_VIDEO_CTL_10 0x44
+#define ANALOGIX_DP_PLL_REG_1 0xfc
+#define ANALOGIX_DP_PLL_REG_2 0x9e4
+#define ANALOGIX_DP_PLL_REG_3 0x9e8
+#define ANALOGIX_DP_PLL_REG_4 0x9ec
+#define ANALOGIX_DP_PLL_REG_5 0xa00
+
+#define ANALOGIX_DP_PD 0x12c
+
#define ANALOGIX_DP_LANE_MAP 0x35C
#define ANALOGIX_DP_ANALOG_CTL_1 0x370
@@ -154,6 +162,10 @@
#define VSYNC_POLARITY_CFG (0x1 << 1)
#define HSYNC_POLARITY_CFG (0x1 << 0)
+/* ANALOGIX_DP_PLL_REG_1 */
+#define REF_CLK_24M (0x1 << 1)
+#define REF_CLK_27M (0x0 << 1)
+
/* ANALOGIX_DP_LANE_MAP */
#define LANE3_MAP_LOGIC_LANE_0 (0x0 << 6)
#define LANE3_MAP_LOGIC_LANE_1 (0x1 << 6)
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 0/14] Add Analogix Core Display Port Driver Yakir Yang <ykk@rock-chips.com> - 2015-08-19 16:50 +0200
[PATCH v3 07/14] drm: rockchip/dp: add rockchip platform dp driver Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
[PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Rob Herring <robherring2@gmail.com> - 2015-08-24 01:30 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-08-24 02:50 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-24 04:50 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-08-24 06:30 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-24 14:50 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Heiko Stuebner <heiko@sntech.de> - 2015-08-24 15:10 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-25 03:40 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-08-25 02:00 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-08-25 03:40 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-25 03:40 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Jingoo Han <jingoohan1@gmail.com> - 2015-08-24 09:50 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-24 15:00 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-24 04:30 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-24 15:00 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Rob Herring <robherring2@gmail.com> - 2015-08-24 16:50 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Heiko Stuebner <heiko@sntech.de> - 2015-08-24 18:20 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-25 03:30 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Thierry Reding <treding@nvidia.com> - 2015-08-25 11:20 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-25 11:40 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Thierry Reding <treding@nvidia.com> - 2015-08-25 12:50 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-25 13:00 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-25 11:50 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Thierry Reding <treding@nvidia.com> - 2015-08-25 12:10 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-25 16:10 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Thierry Reding <treding@nvidia.com> - 2015-08-25 11:20 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-25 11:40 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Rob Herring <robherring2@gmail.com> - 2015-08-25 15:30 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Thierry Reding <treding@nvidia.com> - 2015-08-25 16:20 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-25 16:30 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Thierry Reding <treding@nvidia.com> - 2015-08-25 12:00 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-08-25 16:10 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Thierry Reding <treding@nvidia.com> - 2015-08-25 16:30 +0200
Re: [PATCH v3 06/14] Documentation: drm/bridge: add document for analogix_dp Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-08-25 18:00 +0200
[PATCH v3 14/14] drm: bridge/analogix_dp: add edid modes parse in get_modes method Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
[PATCH v3 08/14] phy: Add driver for rockchip Display Port PHY Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
Re: [PATCH v3 08/14] phy: Add driver for rockchip Display Port PHY Kishon Vijay Abraham I <kishon@ti.com> - 2015-08-20 06:50 +0200
[PATCH v3 11/14] drm: bridge: analogix_dp: try force hpd after plug in lookup failed Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
[PATCH v3 05/14] drm: bridge/analogix_dp: fix link_rate & lane_count bug Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
Re: [PATCH v3 05/14] drm: bridge/analogix_dp: fix link_rate & lane_count bug Jingoo Han <jingoohan1@gmail.com> - 2015-08-20 09:30 +0200
Re: [PATCH v3 05/14] drm: bridge/analogix_dp: fix link_rate & lane_count bug Yakir Yang <ykk@rock-chips.com> - 2015-08-20 10:10 +0200
[PATCH v3 12/14] drm: bridge/analogix_dp: expand the delay time for hpd detect Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
Re: [PATCH v3 12/14] drm: bridge/analogix_dp: expand the delay time for hpd detect Jingoo Han <jingoohan1@gmail.com> - 2015-08-20 08:20 +0200
Re: [PATCH v3 12/14] drm: bridge/analogix_dp: expand the delay time for hpd detect Yakir Yang <ykk@rock-chips.com> - 2015-08-20 10:10 +0200
[PATCH v3 04/14] drm: bridge/analogix_dp: dynamic parse sync_pol & interlace & colorimetry Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
[PATCH v3 02/14] drm: exynos/dp: convert to drm bridge mode Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
[PATCH v3 13/14] drm: bridge/analogix_dp: move hpd detect to connector detect function Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
Re: [PATCH v3 13/14] drm: bridge/analogix_dp: move hpd detect to connector detect function Jingoo Han <jingoohan1@gmail.com> - 2015-08-20 09:50 +0200
Re: [PATCH v3 13/14] drm: bridge/analogix_dp: move hpd detect to connector detect function Yakir Yang <ykk@rock-chips.com> - 2015-08-20 10:20 +0200
[PATCH v3 10/14] drm: bridge: analogix_dp: add some rk3288 special registers setting Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
[PATCH v3 09/14] drm: bridge/analogix_dp: add platform device type support Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
[PATCH v3 01/14] drm: exynos/dp: fix code style Yakir Yang <ykk@rock-chips.com> - 2015-08-19 17:00 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Dave Airlie <airlied@gmail.com> - 2015-08-20 02:00 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Yakir Yang <ykk@rock-chips.com> - 2015-08-20 03:10 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Archit Taneja <architt@codeaurora.org> - 2015-08-20 06:40 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Jingoo Han <jingoohan1@gmail.com> - 2015-08-20 08:00 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Yakir Yang <ykk@rock-chips.com> - 2015-08-20 08:30 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Jingoo Han <jingoohan1@gmail.com> - 2015-08-20 09:00 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Yakir Yang <ykk@rock-chips.com> - 2015-08-20 10:10 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Jingoo Han <jingoohan1@gmail.com> - 2015-08-21 10:30 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Thierry Reding <treding@nvidia.com> - 2015-08-21 15:20 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Romain Perier <romain.perier@gmail.com> - 2015-08-30 14:20 +0200
Re: [PATCH v3 0/14] Add Analogix Core Display Port Driver Yakir Yang <ykk@rock-chips.com> - 2015-08-31 04:50 +0200
csiph-web