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

drm/rockchip: analogix_dp: add regulators in edp

Browse Source 
I found if eDP_AVDD_1V0 and eDP_AVDD_1V8 are not been power at
RK3288, once trying to enable the pclk clock, the kernel would dead.
This patch would try to enable them first.

The eDP_AVDD_1V8 is used for eDP phy, and the eDP_AVDD_1V0 are used
both for eDP phy and controller.

Change-Id: I4e8a34609d5b292d7da77385ff15bebbf258090c
Signed-off-by: Randy Li <ayaka@soulik.info>
Signed-off-by: Randy Li <randy.li@rock-chips.com>
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Randy Li
2016-10-23 03:18:53 +08:00
committed by Sandy Huang
parent 513746512a
commit e30f5c312e
2 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
View File

@@ -33,6 +33,9 @@ Optional property for different chips:
- clock-names: from common clock binding:
Required elements: "grf"
Optional properties
- vcc-supply: Regulator for eDP_AVDD_1V0.
- vccio-supply: Regulator for eDP_AVDD_1V8.
For the below properties, please refer to Analogix DP binding document:
* Documentation/devicetree/bindings/display/bridge/analogix_dp.txt

59
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
View File

@@ -17,6 +17,7 @@
#include <linux/of_device.h>
#include <linux/of_graph.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h>
#include <linux/reset.h>
#include <linux/clk.h>
@@ -70,6 +71,8 @@ struct rockchip_dp_device {
struct clk *grfclk;
struct regmap *grf;
struct reset_control *rst;
struct regulator *vcc_supply;
struct regulator *vccio_supply;
const struct rockchip_dp_chip_data *data;
@@ -114,6 +117,24 @@ static int rockchip_dp_poweron_start(struct analogix_dp_plat_data *plat_data)
struct rockchip_dp_device *dp = to_dp(plat_data);
int ret;
if (!IS_ERR(dp->vcc_supply)) {
ret = regulator_enable(dp->vcc_supply);
if (ret) {
dev_err(dp->dev,
"failed to enable vcc regulator: %d\n", ret);
return ret;
}
}
if (!IS_ERR(dp->vccio_supply)) {
ret = regulator_enable(dp->vccio_supply);
if (ret) {
dev_err(dp->dev,
"failed to enable vccio regulator: %d\n", ret);
return ret;
}
}
ret = clk_prepare_enable(dp->pclk);
if (ret < 0) {
DRM_DEV_ERROR(dp->dev, "failed to enable pclk %d\n", ret);
@@ -148,6 +169,11 @@ static int rockchip_dp_powerdown(struct analogix_dp_plat_data *plat_data)
clk_disable_unprepare(dp->pclk);
if (!IS_ERR(dp->vccio_supply))
regulator_disable(dp->vccio_supply);
if (!IS_ERR(dp->vcc_supply))
regulator_disable(dp->vcc_supply);
return 0;
}
@@ -258,6 +284,7 @@ static int rockchip_dp_of_probe(struct rockchip_dp_device *dp)
{
struct device *dev = dp->dev;
struct device_node *np = dev->of_node;
int ret = 0;
dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
if (IS_ERR(dp->grf)) {
@@ -287,6 +314,38 @@ static int rockchip_dp_of_probe(struct rockchip_dp_device *dp)
return PTR_ERR(dp->rst);
}
dp->vcc_supply = devm_regulator_get_optional(dev, "vcc");
dp->vccio_supply = devm_regulator_get_optional(dev, "vccio");
if (IS_ERR(dp->vcc_supply)) {
dev_err(dev, "failed to get vcc regulator: %ld\n",
PTR_ERR(dp->vcc_supply));
} else {
ret = regulator_enable(dp->vcc_supply);
if (ret) {
dev_err(dev,
"failed to enable vcc regulator: %d\n", ret);
return ret;
}
}
if (IS_ERR(dp->vccio_supply)) {
dev_err(dev, "failed to get vccio regulator: %ld\n",
PTR_ERR(dp->vccio_supply));
} else {
ret = regulator_enable(dp->vccio_supply);
if (ret) {
dev_err(dev,
"failed to enable vccio regulator: %d\n", ret);
return ret;
}
}
ret = clk_prepare_enable(dp->pclk);
if (ret < 0) {
dev_err(dp->dev, "failed to enable pclk %d\n", ret);
return ret;
}
return 0;
}