diff options
| author | Andy Green <andy.green@linaro.org> | 2015-06-11 07:25:04 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2015-08-19 14:09:22 +0800 |
| commit | 0f1b23abe2c65eec999dbedc9f53fe2f6ff79835 (patch) | |
| tree | 5763d5d444b6b726f587582058338f28458889b5 | |
| parent | 642950fe3ef8593a23481e7ddb67fd250d7d5e62 (diff) | |
adv7511 hikey integrate
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm64/boot/dts/hi6220.dtsi | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/hisilicon/hisi_drm_dsi.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/hi6220.dtsi b/arch/arm64/boot/dts/hi6220.dtsi index d1cba877cc19..604714c0b1df 100644 --- a/arch/arm64/boot/dts/hi6220.dtsi +++ b/arch/arm64/boot/dts/hi6220.dtsi @@ -707,6 +707,9 @@ pd-gpio = <&gpio0 4 0>; adi,input-depth = <8>; adi,input-colorspace = "rgb"; + adi,input-clock = "1x"; + adi,clock-delay = <0>; + adi,embedded-sync; }; }; diff --git a/drivers/gpu/drm/hisilicon/hisi_drm_dsi.c b/drivers/gpu/drm/hisilicon/hisi_drm_dsi.c index 6741cd09eefe..fa0c42d7857a 100644 --- a/drivers/gpu/drm/hisilicon/hisi_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/hisi_drm_dsi.c @@ -1014,10 +1014,15 @@ static int hisi_dsi_probe(struct platform_device *pdev) return -EPROBE_DEFER; } + if (!dsi->client->dev.driver) { + DRM_INFO("%s: NULL client driver\n", __func__); + return -EPROBE_DEFER; + } + dsi->drm_i2c_driver = to_drm_i2c_encoder_driver( to_i2c_driver(dsi->client->dev.driver)); - if (!dsi->drm_i2c_driver) { - DRM_INFO("failed initialize encoder driver\n"); + if (IS_ERR(dsi->drm_i2c_driver)) { + pr_err("failed initialize encoder driver %ld\n", PTR_ERR(dsi->drm_i2c_driver)); return -EPROBE_DEFER; } |