From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755236AbbHFOTy (ORCPT <rfc822;w@1wt.eu>);
	Thu, 6 Aug 2015 10:19:54 -0400
Received: from regular1.263xmail.com ([211.150.99.130]:49153 "EHLO
	regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753533AbbHFOTv (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 6 Aug 2015 10:19:51 -0400
X-263anti-spam: KSV:0;
X-MAIL-GRAY: 0
X-MAIL-DELIVERY: 1
X-KSVirus-check: 0
X-ABS-CHECKED: 4
X-ADDR-CHECKED: 0
X-RL-SENDER: ykk@rock-chips.com
X-FST-TO: heiko@sntech.de
X-SENDER-IP: 58.22.7.114
X-LOGIN-NAME: ykk@rock-chips.com
X-UNIQUE-TAG: <3c88a1401d85a50b589452fe4cd62979>
X-ATTACHMENT-NUM: 0
X-DNS-TYPE: 0
From: Yakir Yang <ykk@rock-chips.com>
To: Heiko Stuebner <heiko@sntech.de>,
        Russell King <rmk+kernel@arm.linux.org.uk>,
        Fabio Estevam <fabio.estevam@freescale.com>,
        Jingoo Han <jingoohan1@gmail.com>, Inki Dae <inki.dae@samsung.com>
Cc: djkurtz@google.com, dianders@google.com, Takashi Iwai <tiwai@suse.de>,
        Andrzej Hajda <a.hajda@samsung.com>, Yakir Yang <ykk@rock-chips.com>,
        Thierry Reding <treding@nvidia.com>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        David Airlie <airlied@linux.ie>,
        Gustavo Padovan <gustavo.padovan@collabora.co.uk>,
        Seung-Woo Kim <sw0312.kim@samsung.com>,
        Kyungmin Park <kyungmin.park@samsung.com>,
        Krzysztof Kozlowski <k.kozlowski@samsung.com>,
        Kukjin Kim <kgene@kernel.org>, Ajay Kumar <ajaykumar.rs@samsung.com>,
        Joonyoung Shim <jy0922.shim@samsung.com>,
        Vincent Palatin <vpalatin@chromium.org>,
        Mark Yao <mark.yao@rock-chips.com>, Andy Yan <andy.yan@rock-chips.com>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
        linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org,
        linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 4/8] drm: rockchip/dp: add rockchip platform dp driver
Date: Thu,  6 Aug 2015 09:19:38 -0500
Message-Id: <1438870778-23847-1-git-send-email-ykk@rock-chips.com>
X-Mailer: git-send-email 1.9.1
In-Reply-To: <1438868947-22132-1-git-send-email-ykk@rock-chips.com>
References: <1438868947-22132-1-git-send-email-ykk@rock-chips.com>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Rockchip have three clocks for dp controller, we leave pclk_edp
to analogix_dp driver control, and keep the sclk_edp_24m and
sclk_edp in platform driver.

Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
 drivers/gpu/drm/rockchip/Kconfig                |  10 +
 drivers/gpu/drm/rockchip/Makefile               |   1 +
 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 419 ++++++++++++++++++++++++
 3 files changed, 430 insertions(+)
 create mode 100644 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 35215f6..096ed77 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -25,3 +25,13 @@ config ROCKCHIP_DW_HDMI
 	  for the Synopsys DesignWare HDMI driver. If you want to
 	  enable HDMI on RK3288 based SoC, you should selet this
 	  option.
+
+
+config ROCKCHIP_ANALOGIX_DP
+        tristate "Rockchip specific extensions for Analogix DP driver"
+        depends on DRM_ROCKCHIP
+        select DRM_ANALOGIX_DP
+        help
+	  This selects support for Rockchip SoC specific extensions
+	  for the Analogix Core DP driver. If you want to enable DP
+	  on RK3288 based SoC, you should selet this option.
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
index f3d8a19..8ad01fb 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -6,5 +6,6 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o rockchip_drm_fbdev.o \
 		rockchip_drm_gem.o
 
 obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
+obj-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
 
 obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_drm_vop.o
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
new file mode 100644
index 0000000..804048c
--- /dev/null
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -0,0 +1,419 @@
+/*
+ * Rockchip SoC DP (Display Port) interface driver.
+ *
+ * Copyright (C) Fuzhou Rockchip Electronics Co., Ltd.
+ * Author: Andy Yan <andy.yan@rock-chips.com>
+ *         Jeff Chen <jeff.chen@rock-chips.com>
+ *         Yakir Yang <ykk@rock-chips.com>
+ *
+ * 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; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+#include <drm/drmP.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_of.h>
+#include <drm/drm_dp_helper.h>
+
+#include <linux/component.h>
+#include <linux/clk.h>
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+
+#include <video/of_videomode.h>
+#include <video/videomode.h>
+
+#include <drm/bridge/analogix_dp.h>
+
+#include "rockchip_drm_drv.h"
+#include "rockchip_drm_vop.h"
+
+#define encoder_to_dp(c) \
+		container_of(c, struct rockchip_dp_device, encoder)
+
+#define plat_data_to_dp(pd) \
+		container_of(pd, struct rockchip_dp_device, plat_data)
+
+/* dp grf register offset */
+#define DP_VOP_SEL                              0x025c /* grf_soc_con6 */
+#define DP_REF_CLK_SEL                          0x0274 /* grf_soc_con12 */
+
+#define GRF_DP_REF_CLK_SEL_INTER                BIT(4)
+#define DP_SEL_VOP_LIT				BIT(5)
+
+struct rockchip_dp_device {
+	struct drm_device        *drm_dev;
+	struct device            *dev;
+	struct drm_encoder       encoder;
+	struct drm_display_mode  mode;
+
+	struct clk               *clk_dp;
+	struct clk               *clk_24m_parent;
+	struct clk               *clk_24m;
+	struct regmap            *grf;
+	struct reset_control     *rst;
+
+	struct analogix_dp_plat_data plat_data;
+};
+
+static int rockchip_dp_clk_enable(struct rockchip_dp_device *dp)
+{
+	int ret = 0;
+
+	ret = clk_prepare_enable(dp->clk_dp);
+	if (ret < 0) {
+		dev_err(dp->dev, "cannot enable clk_dp %d\n", ret);
+		goto err_clk_dp;
+	}
+
+	ret = clk_set_rate(dp->clk_24m, 24000000);
+	if (ret < 0) {
+		dev_err(dp->dev, "cannot set dp clk_24m %d\n",
+			ret);
+		goto err_clk_24m;
+	}
+
+	ret = clk_prepare_enable(dp->clk_24m);
+	if (ret < 0) {
+		dev_err(dp->dev, "cannot enable dp clk_24m %d\n",
+			ret);
+		goto err_clk_24m;
+	}
+
+	return 0;
+
+err_clk_24m:
+	clk_disable_unprepare(dp->clk_dp);
+err_clk_dp:
+	return ret;
+}
+
+static int rockchip_dp_clk_disable(struct rockchip_dp_device *dp)
+{
+	clk_disable_unprepare(dp->clk_dp);
+	clk_disable_unprepare(dp->clk_24m);
+
+	return 0;
+}
+
+static int rockchip_dp_pre_init(struct rockchip_dp_device *dp)
+{
+	u32 val;
+	int ret;
+
+	val = GRF_DP_REF_CLK_SEL_INTER | (GRF_DP_REF_CLK_SEL_INTER << 16);
+	ret = regmap_write(dp->grf, DP_REF_CLK_SEL, val);
+	if (ret != 0) {
+		dev_err(dp->dev, "Could not write to GRF: %d\n", ret);
+		return ret;
+	}
+
+	reset_control_assert(dp->rst);
+	usleep_range(10, 20);
+	reset_control_deassert(dp->rst);
+
+	return 0;
+}
+
+static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data)
+{
+	struct rockchip_dp_device *dp = plat_data_to_dp(plat_data);
+	int ret;
+
+	ret = rockchip_dp_clk_enable(dp);
+	if (ret < 0) {
+		dev_err(dp->dev, "cannot enable dp clk %d\n", ret);
+		return -1;
+	}
+
+	ret = rockchip_dp_pre_init(dp);
+	if (ret < 0) {
+		dev_err(dp->dev, "dp pre init fail %d\n", ret);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int rockchip_dp_poweroff(struct analogix_dp_plat_data *plat_data)
+{
+	struct rockchip_dp_device *dp = plat_data_to_dp(plat_data);
+
+	rockchip_dp_clk_disable(dp);
+
+	return 0;
+}
+
+static bool
+rockchip_dp_drm_encoder_mode_fixup(struct drm_encoder *encoder,
+				   const struct drm_display_mode *mode,
+				   struct drm_display_mode *adjusted_mode)
+{
+	/* do nothing */
+	return true;
+}
+
+static void rockchip_dp_drm_encoder_mode_set(struct drm_encoder *encoder,
+					     struct drm_display_mode *mode,
+					     struct drm_display_mode *adjusted)
+{
+	/* do nothing */
+}
+
+static void rockchip_dp_drm_encoder_prepare(struct drm_encoder *encoder)
+{
+	struct rockchip_dp_device *dp = encoder_to_dp(encoder);
+	u32 val;
+	int ret;
+
+	ret = rockchip_drm_crtc_mode_config(encoder->crtc,
+					    DRM_MODE_CONNECTOR_eDP,
+					    ROCKCHIP_OUT_MODE_AAAA);
+	if (ret < 0) {
+		dev_err(dp->dev, "Could not set crtc mode config: %d.\n", ret);
+		return;
+	}
+
+	ret = rockchip_drm_encoder_get_mux_id(dp->dev->of_node, encoder);
+	if (ret < 0)
+		return;
+
+	if (ret)
+		val = DP_SEL_VOP_LIT | (DP_SEL_VOP_LIT << 16);
+	else
+		val = DP_SEL_VOP_LIT << 16;
+
+	dev_info(dp->dev, "vop %s output to dp\n", (ret) ? "LIT" : "BIG");
+
+	ret = regmap_write(dp->grf, DP_VOP_SEL, val);
+	if (ret != 0) {
+		dev_err(dp->dev, "Could not write to GRF: %d\n", ret);
+		return;
+	}
+}
+
+static void rockchip_dp_drm_encoder_nop(struct drm_encoder *encoder)
+{
+	/* do nothing */
+}
+
+static struct drm_encoder_helper_funcs rockchip_dp_encoder_helper_funcs = {
+	.mode_fixup = rockchip_dp_drm_encoder_mode_fixup,
+	.mode_set = rockchip_dp_drm_encoder_mode_set,
+	.prepare = rockchip_dp_drm_encoder_prepare,
+	.commit = rockchip_dp_drm_encoder_nop,
+	.disable = rockchip_dp_drm_encoder_nop,
+};
+
+static void rockchip_dp_drm_encoder_destroy(struct drm_encoder *encoder)
+{
+	drm_encoder_cleanup(encoder);
+}
+
+static struct drm_encoder_funcs rockchip_dp_encoder_funcs = {
+	.destroy = rockchip_dp_drm_encoder_destroy,
+};
+
+static int rockchip_dp_init(struct rockchip_dp_device *dp)
+{
+	struct device *dev = dp->dev;
+	struct device_node *np = dev->of_node;
+	int ret;
+
+	dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
+	if (IS_ERR(dp->grf)) {
+		dev_err(dev,
+			"rk3288-dp needs rockchip,grf property\n");
+		return PTR_ERR(dp->grf);
+	}
+
+	dp->clk_dp = devm_clk_get(dev, "clk_dp");
+	if (IS_ERR(dp->clk_dp)) {
+		dev_err(dev, "cannot get clk_dp\n");
+		return PTR_ERR(dp->clk_dp);
+	}
+
+	dp->clk_24m = devm_clk_get(dev, "clk_dp_24m");
+	if (IS_ERR(dp->clk_24m)) {
+		dev_err(dev, "cannot get clk_dp_24m\n");
+		return PTR_ERR(dp->clk_24m);
+	}
+
+	dp->rst = devm_reset_control_get(dev, "dp");
+	if (IS_ERR(dp->rst)) {
+		dev_err(dev, "failed to get reset\n");
+		return PTR_ERR(dp->rst);
+	}
+
+	ret = rockchip_dp_clk_enable(dp);
+	if (ret < 0) {
+		dev_err(dp->dev, "cannot enable dp clk %d\n", ret);
+		return ret;
+	}
+
+	ret = rockchip_dp_pre_init(dp);
+	if (ret < 0) {
+		dev_err(dp->dev, "failed to pre init %d\n", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int rockchip_dp_drm_create_encoder(struct rockchip_dp_device *dp)
+{
+	struct drm_encoder *encoder = &dp->encoder;
+	struct drm_device *drm_dev = dp->drm_dev;
+	struct device *dev = dp->dev;
+	int ret;
+
+	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
+							     dev->of_node);
+	DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs);
+
+	ret = drm_encoder_init(drm_dev, encoder, &rockchip_dp_encoder_funcs,
+			       DRM_MODE_ENCODER_TMDS);
+	if (ret) {
+		DRM_ERROR("failed to initialize encoder with drm\n");
+		return ret;
+	}
+
+	drm_encoder_helper_add(encoder, &rockchip_dp_encoder_helper_funcs);
+
+	return 0;
+}
+
+static int rockchip_dp_bind(struct device *dev, struct device *master,
+			    void *data)
+{
+	struct rockchip_dp_device *dp = dev_get_drvdata(dev);
+	struct drm_device *drm_dev = data;
+	int ret;
+
+	/*
+	 * Just like the probe function said, we don't need the
+	 * device drvrate anymore, we should leave the charge to
+	 * analogix dp driver, set the device drvdata to NULL.
+	 */
+	dev_set_drvdata(dev, NULL);
+
+	ret = rockchip_dp_init(dp);
+	if (ret < 0)
+		return ret;
+
+	dp->drm_dev = drm_dev;
+
+	ret = rockchip_dp_drm_create_encoder(dp);
+	if (ret) {
+		DRM_ERROR("failed to create drm encoder\n");
+		return ret;
+	}
+
+	dp->plat_data.attach = NULL;
+	dp->plat_data.power_on = rockchip_dp_poweron;
+	dp->plat_data.power_off = rockchip_dp_poweroff;
+
+	return analogix_dp_bind(dev, dp->drm_dev, &dp->encoder,
+				&dp->plat_data);
+}
+
+static void rockchip_dp_unbind(struct device *dev, struct device *master,
+			       void *data)
+{
+	return analogix_dp_unbind(dev, master, data);
+}
+
+static const struct component_ops rockchip_dp_component_ops = {
+	.bind = rockchip_dp_bind,
+	.unbind = rockchip_dp_unbind,
+};
+
+static int rockchip_dp_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct device_node *panel_node;
+	struct rockchip_dp_device *dp;
+	struct drm_panel *panel;
+
+	panel_node = of_parse_phandle(dev->of_node, "rockchip,panel", 0);
+	if (!panel_node) {
+		DRM_ERROR("failed to find rockchip,panel dt node\n");
+		return -ENODEV;
+	}
+
+	panel = of_drm_find_panel(panel_node);
+	if (!panel) {
+		DRM_ERROR("failed to find panel\n");
+		of_node_put(panel_node);
+		return -EPROBE_DEFER;
+	}
+
+	of_node_put(panel_node);
+
+	dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
+	if (!dp)
+		return -ENOMEM;
+
+	dp->dev = dev;
+
+	dp->plat_data.panel = panel;
+
+	/*
+	 * We just use the drvdata until driver run into component
+	 * add function, and then we would set drvdata to null, so
+	 * that analogix dp driver could take charge of the drvdata.
+	 */
+	platform_set_drvdata(pdev, dp);
+
+	return component_add(dev, &rockchip_dp_component_ops);
+}
+
+static int rockchip_dp_remove(struct platform_device *pdev)
+{
+	component_del(&pdev->dev, &rockchip_dp_component_ops);
+
+	return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int rockchip_dp_suspend(struct device *dev)
+{
+	return analogix_dp_suspend(dev);
+}
+
+static int rockchip_dp_resume(struct device *dev)
+{
+	return analogix_dp_resume(dev);
+}
+#endif
+
+static const struct dev_pm_ops rockchip_dp_pm_ops = {
+	SET_SYSTEM_SLEEP_PM_OPS(rockchip_dp_suspend, rockchip_dp_resume)
+};
+
+static const struct of_device_id rockchip_dp_dt_ids[] = {
+	{.compatible = "rockchip,rk3288-dp",},
+	{}
+};
+MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids);
+
+static struct platform_driver rockchip_dp_driver = {
+	.probe = rockchip_dp_probe,
+	.remove = rockchip_dp_remove,
+	.driver = {
+		   .name = "rockchip-dp",
+		   .owner = THIS_MODULE,
+		   .pm = &rockchip_dp_pm_ops,
+		   .of_match_table = of_match_ptr(rockchip_dp_dt_ids),
+	},
+};
+
+module_platform_driver(rockchip_dp_driver);
+
+MODULE_AUTHOR("Jeff chen <jeff.chen@rock-chips.com>");
+MODULE_AUTHOR("Yakir Yang <ykk@rock-chips.com>");
+MODULE_DESCRIPTION("Rockchip Specific Analogix-DP Driver Extension");
+MODULE_LICENSE("GPL v2");
-- 
2.1.2



From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yakir Yang <ykk@rock-chips.com>
Subject: [RFC PATCH 4/8] drm: rockchip/dp: add rockchip platform dp driver
Date: Thu,  6 Aug 2015 09:19:38 -0500
Message-ID: <1438870778-23847-1-git-send-email-ykk@rock-chips.com>
References: <1438868947-22132-1-git-send-email-ykk@rock-chips.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
In-Reply-To: <1438868947-22132-1-git-send-email-ykk@rock-chips.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: Heiko Stuebner <heiko@sntech.de>, Russell King <rmk+kernel@arm.linux.org.uk>, Fabio Estevam <fabio.estevam@freescale.com>, Jingoo Han <jingoohan1@gmail.com>, Inki Dae <inki.dae@samsung.com>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>, dri-devel@lists.freedesktop.org, Andrzej Hajda <a.hajda@samsung.com>, Yakir Yang <ykk@rock-chips.com>, Gustavo Padovan <gustavo.padovan@collabora.co.uk>, Ajay Kumar <ajaykumar.rs@samsung.com>, linux-samsung-soc@vger.kernel.org, Vincent Palatin <vpalatin@chromium.org>, linux-rockchip@lists.infradead.org, Kukjin Kim <kgene@kernel.org>, Thierry Reding <treding@nvidia.com>, dianders@google.com, linux-arm-kernel@lists.infradead.org, Seung-Woo Kim <sw0312.kim@samsung.com>, linux-kernel@vger.kernel.org, Kyungmin Park <kyungmin.park@samsung.com>, djkurtz@google.com, Andy Yan <andy.yan@rock-chips.com>
List-Id: linux-samsung-soc@vger.kernel.org

Um9ja2NoaXAgaGF2ZSB0aHJlZSBjbG9ja3MgZm9yIGRwIGNvbnRyb2xsZXIsIHdlIGxlYXZlIHBj
bGtfZWRwCnRvIGFuYWxvZ2l4X2RwIGRyaXZlciBjb250cm9sLCBhbmQga2VlcCB0aGUgc2Nsa19l
ZHBfMjRtIGFuZApzY2xrX2VkcCBpbiBwbGF0Zm9ybSBkcml2ZXIuCgpTaWduZWQtb2ZmLWJ5OiBZ
YWtpciBZYW5nIDx5a2tAcm9jay1jaGlwcy5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3JvY2tj
aGlwL0tjb25maWcgICAgICAgICAgICAgICAgfCAgMTAgKwogZHJpdmVycy9ncHUvZHJtL3JvY2tj
aGlwL01ha2VmaWxlICAgICAgICAgICAgICAgfCAgIDEgKwogZHJpdmVycy9ncHUvZHJtL3JvY2tj
aGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMgfCA0MTkgKysrKysrKysrKysrKysrKysrKysrKysr
CiAzIGZpbGVzIGNoYW5nZWQsIDQzMCBpbnNlcnRpb25zKCspCiBjcmVhdGUgbW9kZSAxMDA2NDQg
ZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2FuYWxvZ2l4X2RwLXJvY2tjaGlwLmMKCmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvS2NvbmZpZyBiL2RyaXZlcnMvZ3B1L2RybS9y
b2NrY2hpcC9LY29uZmlnCmluZGV4IDM1MjE1ZjYuLjA5NmVkNzcgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9yb2NrY2hpcC9LY29uZmlnCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hp
cC9LY29uZmlnCkBAIC0yNSwzICsyNSwxMyBAQCBjb25maWcgUk9DS0NISVBfRFdfSERNSQogCSAg
Zm9yIHRoZSBTeW5vcHN5cyBEZXNpZ25XYXJlIEhETUkgZHJpdmVyLiBJZiB5b3Ugd2FudCB0bwog
CSAgZW5hYmxlIEhETUkgb24gUkszMjg4IGJhc2VkIFNvQywgeW91IHNob3VsZCBzZWxldCB0aGlz
CiAJICBvcHRpb24uCisKKworY29uZmlnIFJPQ0tDSElQX0FOQUxPR0lYX0RQCisgICAgICAgIHRy
aXN0YXRlICJSb2NrY2hpcCBzcGVjaWZpYyBleHRlbnNpb25zIGZvciBBbmFsb2dpeCBEUCBkcml2
ZXIiCisgICAgICAgIGRlcGVuZHMgb24gRFJNX1JPQ0tDSElQCisgICAgICAgIHNlbGVjdCBEUk1f
QU5BTE9HSVhfRFAKKyAgICAgICAgaGVscAorCSAgVGhpcyBzZWxlY3RzIHN1cHBvcnQgZm9yIFJv
Y2tjaGlwIFNvQyBzcGVjaWZpYyBleHRlbnNpb25zCisJICBmb3IgdGhlIEFuYWxvZ2l4IENvcmUg
RFAgZHJpdmVyLiBJZiB5b3Ugd2FudCB0byBlbmFibGUgRFAKKwkgIG9uIFJLMzI4OCBiYXNlZCBT
b0MsIHlvdSBzaG91bGQgc2VsZXQgdGhpcyBvcHRpb24uCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw
dS9kcm0vcm9ja2NoaXAvTWFrZWZpbGUgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvTWFrZWZp
bGUKaW5kZXggZjNkOGExOS4uOGFkMDFmYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Jv
Y2tjaGlwL01ha2VmaWxlCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9NYWtlZmlsZQpA
QCAtNiw1ICs2LDYgQEAgcm9ja2NoaXBkcm0teSA6PSByb2NrY2hpcF9kcm1fZHJ2Lm8gcm9ja2No
aXBfZHJtX2ZiLm8gcm9ja2NoaXBfZHJtX2ZiZGV2Lm8gXAogCQlyb2NrY2hpcF9kcm1fZ2VtLm8K
IAogb2JqLSQoQ09ORklHX1JPQ0tDSElQX0RXX0hETUkpICs9IGR3X2hkbWktcm9ja2NoaXAubwor
b2JqLSQoQ09ORklHX1JPQ0tDSElQX0FOQUxPR0lYX0RQKSArPSBhbmFsb2dpeF9kcC1yb2NrY2hp
cC5vCiAKIG9iai0kKENPTkZJR19EUk1fUk9DS0NISVApICs9IHJvY2tjaGlwZHJtLm8gcm9ja2No
aXBfZHJtX3ZvcC5vCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvYW5hbG9n
aXhfZHAtcm9ja2NoaXAuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9hbmFsb2dpeF9kcC1y
b2NrY2hpcC5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjgwNDA0OGMKLS0t
IC9kZXYvbnVsbAorKysgYi9kcml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvYW5hbG9naXhfZHAtcm9j
a2NoaXAuYwpAQCAtMCwwICsxLDQxOSBAQAorLyoKKyAqIFJvY2tjaGlwIFNvQyBEUCAoRGlzcGxh
eSBQb3J0KSBpbnRlcmZhY2UgZHJpdmVyLgorICoKKyAqIENvcHlyaWdodCAoQykgRnV6aG91IFJv
Y2tjaGlwIEVsZWN0cm9uaWNzIENvLiwgTHRkLgorICogQXV0aG9yOiBBbmR5IFlhbiA8YW5keS55
YW5Acm9jay1jaGlwcy5jb20+CisgKiAgICAgICAgIEplZmYgQ2hlbiA8amVmZi5jaGVuQHJvY2st
Y2hpcHMuY29tPgorICogICAgICAgICBZYWtpciBZYW5nIDx5a2tAcm9jay1jaGlwcy5jb20+Cisg
KgorICogVGhpcyBwcm9ncmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRl
IGl0IGFuZC9vciBtb2RpZnkgaXQKKyAqIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVy
YWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZQorICogRnJlZSBTb2Z0d2FyZSBG
b3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAyIG9mIHRoZSBMaWNlbnNlLCBvciAoYXQgeW91cgor
ICogb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqLworI2luY2x1ZGUgPGRybS9kcm1QLmg+
CisjaW5jbHVkZSA8ZHJtL2RybV9jcnRjX2hlbHBlci5oPgorI2luY2x1ZGUgPGRybS9kcm1fcGFu
ZWwuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX29mLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9kcF9oZWxw
ZXIuaD4KKworI2luY2x1ZGUgPGxpbnV4L2NvbXBvbmVudC5oPgorI2luY2x1ZGUgPGxpbnV4L2Ns
ay5oPgorI2luY2x1ZGUgPGxpbnV4L21mZC9zeXNjb24uaD4KKyNpbmNsdWRlIDxsaW51eC9yZWdt
YXAuaD4KKyNpbmNsdWRlIDxsaW51eC9yZXNldC5oPgorCisjaW5jbHVkZSA8dmlkZW8vb2Zfdmlk
ZW9tb2RlLmg+CisjaW5jbHVkZSA8dmlkZW8vdmlkZW9tb2RlLmg+CisKKyNpbmNsdWRlIDxkcm0v
YnJpZGdlL2FuYWxvZ2l4X2RwLmg+CisKKyNpbmNsdWRlICJyb2NrY2hpcF9kcm1fZHJ2LmgiCisj
aW5jbHVkZSAicm9ja2NoaXBfZHJtX3ZvcC5oIgorCisjZGVmaW5lIGVuY29kZXJfdG9fZHAoYykg
XAorCQljb250YWluZXJfb2YoYywgc3RydWN0IHJvY2tjaGlwX2RwX2RldmljZSwgZW5jb2RlcikK
KworI2RlZmluZSBwbGF0X2RhdGFfdG9fZHAocGQpIFwKKwkJY29udGFpbmVyX29mKHBkLCBzdHJ1
Y3Qgcm9ja2NoaXBfZHBfZGV2aWNlLCBwbGF0X2RhdGEpCisKKy8qIGRwIGdyZiByZWdpc3RlciBv
ZmZzZXQgKi8KKyNkZWZpbmUgRFBfVk9QX1NFTCAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
IDB4MDI1YyAvKiBncmZfc29jX2NvbjYgKi8KKyNkZWZpbmUgRFBfUkVGX0NMS19TRUwgICAgICAg
ICAgICAgICAgICAgICAgICAgIDB4MDI3NCAvKiBncmZfc29jX2NvbjEyICovCisKKyNkZWZpbmUg
R1JGX0RQX1JFRl9DTEtfU0VMX0lOVEVSICAgICAgICAgICAgICAgIEJJVCg0KQorI2RlZmluZSBE
UF9TRUxfVk9QX0xJVAkJCQlCSVQoNSkKKworc3RydWN0IHJvY2tjaGlwX2RwX2RldmljZSB7CisJ
c3RydWN0IGRybV9kZXZpY2UgICAgICAgICpkcm1fZGV2OworCXN0cnVjdCBkZXZpY2UgICAgICAg
ICAgICAqZGV2OworCXN0cnVjdCBkcm1fZW5jb2RlciAgICAgICBlbmNvZGVyOworCXN0cnVjdCBk
cm1fZGlzcGxheV9tb2RlICBtb2RlOworCisJc3RydWN0IGNsayAgICAgICAgICAgICAgICpjbGtf
ZHA7CisJc3RydWN0IGNsayAgICAgICAgICAgICAgICpjbGtfMjRtX3BhcmVudDsKKwlzdHJ1Y3Qg
Y2xrICAgICAgICAgICAgICAgKmNsa18yNG07CisJc3RydWN0IHJlZ21hcCAgICAgICAgICAgICpn
cmY7CisJc3RydWN0IHJlc2V0X2NvbnRyb2wgICAgICpyc3Q7CisKKwlzdHJ1Y3QgYW5hbG9naXhf
ZHBfcGxhdF9kYXRhIHBsYXRfZGF0YTsKK307CisKK3N0YXRpYyBpbnQgcm9ja2NoaXBfZHBfY2xr
X2VuYWJsZShzdHJ1Y3Qgcm9ja2NoaXBfZHBfZGV2aWNlICpkcCkKK3sKKwlpbnQgcmV0ID0gMDsK
KworCXJldCA9IGNsa19wcmVwYXJlX2VuYWJsZShkcC0+Y2xrX2RwKTsKKwlpZiAocmV0IDwgMCkg
eworCQlkZXZfZXJyKGRwLT5kZXYsICJjYW5ub3QgZW5hYmxlIGNsa19kcCAlZFxuIiwgcmV0KTsK
KwkJZ290byBlcnJfY2xrX2RwOworCX0KKworCXJldCA9IGNsa19zZXRfcmF0ZShkcC0+Y2xrXzI0
bSwgMjQwMDAwMDApOworCWlmIChyZXQgPCAwKSB7CisJCWRldl9lcnIoZHAtPmRldiwgImNhbm5v
dCBzZXQgZHAgY2xrXzI0bSAlZFxuIiwKKwkJCXJldCk7CisJCWdvdG8gZXJyX2Nsa18yNG07CisJ
fQorCisJcmV0ID0gY2xrX3ByZXBhcmVfZW5hYmxlKGRwLT5jbGtfMjRtKTsKKwlpZiAocmV0IDwg
MCkgeworCQlkZXZfZXJyKGRwLT5kZXYsICJjYW5ub3QgZW5hYmxlIGRwIGNsa18yNG0gJWRcbiIs
CisJCQlyZXQpOworCQlnb3RvIGVycl9jbGtfMjRtOworCX0KKworCXJldHVybiAwOworCitlcnJf
Y2xrXzI0bToKKwljbGtfZGlzYWJsZV91bnByZXBhcmUoZHAtPmNsa19kcCk7CitlcnJfY2xrX2Rw
OgorCXJldHVybiByZXQ7Cit9CisKK3N0YXRpYyBpbnQgcm9ja2NoaXBfZHBfY2xrX2Rpc2FibGUo
c3RydWN0IHJvY2tjaGlwX2RwX2RldmljZSAqZHApCit7CisJY2xrX2Rpc2FibGVfdW5wcmVwYXJl
KGRwLT5jbGtfZHApOworCWNsa19kaXNhYmxlX3VucHJlcGFyZShkcC0+Y2xrXzI0bSk7CisKKwly
ZXR1cm4gMDsKK30KKworc3RhdGljIGludCByb2NrY2hpcF9kcF9wcmVfaW5pdChzdHJ1Y3Qgcm9j
a2NoaXBfZHBfZGV2aWNlICpkcCkKK3sKKwl1MzIgdmFsOworCWludCByZXQ7CisKKwl2YWwgPSBH
UkZfRFBfUkVGX0NMS19TRUxfSU5URVIgfCAoR1JGX0RQX1JFRl9DTEtfU0VMX0lOVEVSIDw8IDE2
KTsKKwlyZXQgPSByZWdtYXBfd3JpdGUoZHAtPmdyZiwgRFBfUkVGX0NMS19TRUwsIHZhbCk7CisJ
aWYgKHJldCAhPSAwKSB7CisJCWRldl9lcnIoZHAtPmRldiwgIkNvdWxkIG5vdCB3cml0ZSB0byBH
UkY6ICVkXG4iLCByZXQpOworCQlyZXR1cm4gcmV0OworCX0KKworCXJlc2V0X2NvbnRyb2xfYXNz
ZXJ0KGRwLT5yc3QpOworCXVzbGVlcF9yYW5nZSgxMCwgMjApOworCXJlc2V0X2NvbnRyb2xfZGVh
c3NlcnQoZHAtPnJzdCk7CisKKwlyZXR1cm4gMDsKK30KKworc3RhdGljIGludCByb2NrY2hpcF9k
cF9wb3dlcm9uKHN0cnVjdCBhbmFsb2dpeF9kcF9wbGF0X2RhdGEgKnBsYXRfZGF0YSkKK3sKKwlz
dHJ1Y3Qgcm9ja2NoaXBfZHBfZGV2aWNlICpkcCA9IHBsYXRfZGF0YV90b19kcChwbGF0X2RhdGEp
OworCWludCByZXQ7CisKKwlyZXQgPSByb2NrY2hpcF9kcF9jbGtfZW5hYmxlKGRwKTsKKwlpZiAo
cmV0IDwgMCkgeworCQlkZXZfZXJyKGRwLT5kZXYsICJjYW5ub3QgZW5hYmxlIGRwIGNsayAlZFxu
IiwgcmV0KTsKKwkJcmV0dXJuIC0xOworCX0KKworCXJldCA9IHJvY2tjaGlwX2RwX3ByZV9pbml0
KGRwKTsKKwlpZiAocmV0IDwgMCkgeworCQlkZXZfZXJyKGRwLT5kZXYsICJkcCBwcmUgaW5pdCBm
YWlsICVkXG4iLCByZXQpOworCQlyZXR1cm4gLTE7CisJfQorCisJcmV0dXJuIDA7Cit9CisKK3N0
YXRpYyBpbnQgcm9ja2NoaXBfZHBfcG93ZXJvZmYoc3RydWN0IGFuYWxvZ2l4X2RwX3BsYXRfZGF0
YSAqcGxhdF9kYXRhKQoreworCXN0cnVjdCByb2NrY2hpcF9kcF9kZXZpY2UgKmRwID0gcGxhdF9k
YXRhX3RvX2RwKHBsYXRfZGF0YSk7CisKKwlyb2NrY2hpcF9kcF9jbGtfZGlzYWJsZShkcCk7CisK
KwlyZXR1cm4gMDsKK30KKworc3RhdGljIGJvb2wKK3JvY2tjaGlwX2RwX2RybV9lbmNvZGVyX21v
ZGVfZml4dXAoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAorCQkJCSAgIGNvbnN0IHN0cnVj
dCBkcm1fZGlzcGxheV9tb2RlICptb2RlLAorCQkJCSAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2Rl
ICphZGp1c3RlZF9tb2RlKQoreworCS8qIGRvIG5vdGhpbmcgKi8KKwlyZXR1cm4gdHJ1ZTsKK30K
Kworc3RhdGljIHZvaWQgcm9ja2NoaXBfZHBfZHJtX2VuY29kZXJfbW9kZV9zZXQoc3RydWN0IGRy
bV9lbmNvZGVyICplbmNvZGVyLAorCQkJCQkgICAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpt
b2RlLAorCQkJCQkgICAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZCkKK3sKKwkv
KiBkbyBub3RoaW5nICovCit9CisKK3N0YXRpYyB2b2lkIHJvY2tjaGlwX2RwX2RybV9lbmNvZGVy
X3ByZXBhcmUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQoreworCXN0cnVjdCByb2NrY2hp
cF9kcF9kZXZpY2UgKmRwID0gZW5jb2Rlcl90b19kcChlbmNvZGVyKTsKKwl1MzIgdmFsOworCWlu
dCByZXQ7CisKKwlyZXQgPSByb2NrY2hpcF9kcm1fY3J0Y19tb2RlX2NvbmZpZyhlbmNvZGVyLT5j
cnRjLAorCQkJCQkgICAgRFJNX01PREVfQ09OTkVDVE9SX2VEUCwKKwkJCQkJICAgIFJPQ0tDSElQ
X09VVF9NT0RFX0FBQUEpOworCWlmIChyZXQgPCAwKSB7CisJCWRldl9lcnIoZHAtPmRldiwgIkNv
dWxkIG5vdCBzZXQgY3J0YyBtb2RlIGNvbmZpZzogJWQuXG4iLCByZXQpOworCQlyZXR1cm47CisJ
fQorCisJcmV0ID0gcm9ja2NoaXBfZHJtX2VuY29kZXJfZ2V0X211eF9pZChkcC0+ZGV2LT5vZl9u
b2RlLCBlbmNvZGVyKTsKKwlpZiAocmV0IDwgMCkKKwkJcmV0dXJuOworCisJaWYgKHJldCkKKwkJ
dmFsID0gRFBfU0VMX1ZPUF9MSVQgfCAoRFBfU0VMX1ZPUF9MSVQgPDwgMTYpOworCWVsc2UKKwkJ
dmFsID0gRFBfU0VMX1ZPUF9MSVQgPDwgMTY7CisKKwlkZXZfaW5mbyhkcC0+ZGV2LCAidm9wICVz
IG91dHB1dCB0byBkcFxuIiwgKHJldCkgPyAiTElUIiA6ICJCSUciKTsKKworCXJldCA9IHJlZ21h
cF93cml0ZShkcC0+Z3JmLCBEUF9WT1BfU0VMLCB2YWwpOworCWlmIChyZXQgIT0gMCkgeworCQlk
ZXZfZXJyKGRwLT5kZXYsICJDb3VsZCBub3Qgd3JpdGUgdG8gR1JGOiAlZFxuIiwgcmV0KTsKKwkJ
cmV0dXJuOworCX0KK30KKworc3RhdGljIHZvaWQgcm9ja2NoaXBfZHBfZHJtX2VuY29kZXJfbm9w
KHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlcikKK3sKKwkvKiBkbyBub3RoaW5nICovCit9CisK
K3N0YXRpYyBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1bmNzIHJvY2tjaGlwX2RwX2VuY29k
ZXJfaGVscGVyX2Z1bmNzID0geworCS5tb2RlX2ZpeHVwID0gcm9ja2NoaXBfZHBfZHJtX2VuY29k
ZXJfbW9kZV9maXh1cCwKKwkubW9kZV9zZXQgPSByb2NrY2hpcF9kcF9kcm1fZW5jb2Rlcl9tb2Rl
X3NldCwKKwkucHJlcGFyZSA9IHJvY2tjaGlwX2RwX2RybV9lbmNvZGVyX3ByZXBhcmUsCisJLmNv
bW1pdCA9IHJvY2tjaGlwX2RwX2RybV9lbmNvZGVyX25vcCwKKwkuZGlzYWJsZSA9IHJvY2tjaGlw
X2RwX2RybV9lbmNvZGVyX25vcCwKK307CisKK3N0YXRpYyB2b2lkIHJvY2tjaGlwX2RwX2RybV9l
bmNvZGVyX2Rlc3Ryb3koc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQoreworCWRybV9lbmNv
ZGVyX2NsZWFudXAoZW5jb2Rlcik7Cit9CisKK3N0YXRpYyBzdHJ1Y3QgZHJtX2VuY29kZXJfZnVu
Y3Mgcm9ja2NoaXBfZHBfZW5jb2Rlcl9mdW5jcyA9IHsKKwkuZGVzdHJveSA9IHJvY2tjaGlwX2Rw
X2RybV9lbmNvZGVyX2Rlc3Ryb3ksCit9OworCitzdGF0aWMgaW50IHJvY2tjaGlwX2RwX2luaXQo
c3RydWN0IHJvY2tjaGlwX2RwX2RldmljZSAqZHApCit7CisJc3RydWN0IGRldmljZSAqZGV2ID0g
ZHAtPmRldjsKKwlzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wID0gZGV2LT5vZl9ub2RlOworCWludCBy
ZXQ7CisKKwlkcC0+Z3JmID0gc3lzY29uX3JlZ21hcF9sb29rdXBfYnlfcGhhbmRsZShucCwgInJv
Y2tjaGlwLGdyZiIpOworCWlmIChJU19FUlIoZHAtPmdyZikpIHsKKwkJZGV2X2VycihkZXYsCisJ
CQkicmszMjg4LWRwIG5lZWRzIHJvY2tjaGlwLGdyZiBwcm9wZXJ0eVxuIik7CisJCXJldHVybiBQ
VFJfRVJSKGRwLT5ncmYpOworCX0KKworCWRwLT5jbGtfZHAgPSBkZXZtX2Nsa19nZXQoZGV2LCAi
Y2xrX2RwIik7CisJaWYgKElTX0VSUihkcC0+Y2xrX2RwKSkgeworCQlkZXZfZXJyKGRldiwgImNh
bm5vdCBnZXQgY2xrX2RwXG4iKTsKKwkJcmV0dXJuIFBUUl9FUlIoZHAtPmNsa19kcCk7CisJfQor
CisJZHAtPmNsa18yNG0gPSBkZXZtX2Nsa19nZXQoZGV2LCAiY2xrX2RwXzI0bSIpOworCWlmIChJ
U19FUlIoZHAtPmNsa18yNG0pKSB7CisJCWRldl9lcnIoZGV2LCAiY2Fubm90IGdldCBjbGtfZHBf
MjRtXG4iKTsKKwkJcmV0dXJuIFBUUl9FUlIoZHAtPmNsa18yNG0pOworCX0KKworCWRwLT5yc3Qg
PSBkZXZtX3Jlc2V0X2NvbnRyb2xfZ2V0KGRldiwgImRwIik7CisJaWYgKElTX0VSUihkcC0+cnN0
KSkgeworCQlkZXZfZXJyKGRldiwgImZhaWxlZCB0byBnZXQgcmVzZXRcbiIpOworCQlyZXR1cm4g
UFRSX0VSUihkcC0+cnN0KTsKKwl9CisKKwlyZXQgPSByb2NrY2hpcF9kcF9jbGtfZW5hYmxlKGRw
KTsKKwlpZiAocmV0IDwgMCkgeworCQlkZXZfZXJyKGRwLT5kZXYsICJjYW5ub3QgZW5hYmxlIGRw
IGNsayAlZFxuIiwgcmV0KTsKKwkJcmV0dXJuIHJldDsKKwl9CisKKwlyZXQgPSByb2NrY2hpcF9k
cF9wcmVfaW5pdChkcCk7CisJaWYgKHJldCA8IDApIHsKKwkJZGV2X2VycihkcC0+ZGV2LCAiZmFp
bGVkIHRvIHByZSBpbml0ICVkXG4iLCByZXQpOworCQlyZXR1cm4gcmV0OworCX0KKworCXJldHVy
biAwOworfQorCitzdGF0aWMgaW50IHJvY2tjaGlwX2RwX2RybV9jcmVhdGVfZW5jb2RlcihzdHJ1
Y3Qgcm9ja2NoaXBfZHBfZGV2aWNlICpkcCkKK3sKKwlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29k
ZXIgPSAmZHAtPmVuY29kZXI7CisJc3RydWN0IGRybV9kZXZpY2UgKmRybV9kZXYgPSBkcC0+ZHJt
X2RldjsKKwlzdHJ1Y3QgZGV2aWNlICpkZXYgPSBkcC0+ZGV2OworCWludCByZXQ7CisKKwllbmNv
ZGVyLT5wb3NzaWJsZV9jcnRjcyA9IGRybV9vZl9maW5kX3Bvc3NpYmxlX2NydGNzKGRybV9kZXYs
CisJCQkJCQkJICAgICBkZXYtPm9mX25vZGUpOworCURSTV9ERUJVR19LTVMoInBvc3NpYmxlX2Ny
dGNzID0gMHgleFxuIiwgZW5jb2Rlci0+cG9zc2libGVfY3J0Y3MpOworCisJcmV0ID0gZHJtX2Vu
Y29kZXJfaW5pdChkcm1fZGV2LCBlbmNvZGVyLCAmcm9ja2NoaXBfZHBfZW5jb2Rlcl9mdW5jcywK
KwkJCSAgICAgICBEUk1fTU9ERV9FTkNPREVSX1RNRFMpOworCWlmIChyZXQpIHsKKwkJRFJNX0VS
Uk9SKCJmYWlsZWQgdG8gaW5pdGlhbGl6ZSBlbmNvZGVyIHdpdGggZHJtXG4iKTsKKwkJcmV0dXJu
IHJldDsKKwl9CisKKwlkcm1fZW5jb2Rlcl9oZWxwZXJfYWRkKGVuY29kZXIsICZyb2NrY2hpcF9k
cF9lbmNvZGVyX2hlbHBlcl9mdW5jcyk7CisKKwlyZXR1cm4gMDsKK30KKworc3RhdGljIGludCBy
b2NrY2hpcF9kcF9iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZSAqbWFzdGVy
LAorCQkJICAgIHZvaWQgKmRhdGEpCit7CisJc3RydWN0IHJvY2tjaGlwX2RwX2RldmljZSAqZHAg
PSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZHJtX2RldiA9IGRh
dGE7CisJaW50IHJldDsKKworCS8qCisJICogSnVzdCBsaWtlIHRoZSBwcm9iZSBmdW5jdGlvbiBz
YWlkLCB3ZSBkb24ndCBuZWVkIHRoZQorCSAqIGRldmljZSBkcnZyYXRlIGFueW1vcmUsIHdlIHNo
b3VsZCBsZWF2ZSB0aGUgY2hhcmdlIHRvCisJICogYW5hbG9naXggZHAgZHJpdmVyLCBzZXQgdGhl
IGRldmljZSBkcnZkYXRhIHRvIE5VTEwuCisJICovCisJZGV2X3NldF9kcnZkYXRhKGRldiwgTlVM
TCk7CisKKwlyZXQgPSByb2NrY2hpcF9kcF9pbml0KGRwKTsKKwlpZiAocmV0IDwgMCkKKwkJcmV0
dXJuIHJldDsKKworCWRwLT5kcm1fZGV2ID0gZHJtX2RldjsKKworCXJldCA9IHJvY2tjaGlwX2Rw
X2RybV9jcmVhdGVfZW5jb2RlcihkcCk7CisJaWYgKHJldCkgeworCQlEUk1fRVJST1IoImZhaWxl
ZCB0byBjcmVhdGUgZHJtIGVuY29kZXJcbiIpOworCQlyZXR1cm4gcmV0OworCX0KKworCWRwLT5w
bGF0X2RhdGEuYXR0YWNoID0gTlVMTDsKKwlkcC0+cGxhdF9kYXRhLnBvd2VyX29uID0gcm9ja2No
aXBfZHBfcG93ZXJvbjsKKwlkcC0+cGxhdF9kYXRhLnBvd2VyX29mZiA9IHJvY2tjaGlwX2RwX3Bv
d2Vyb2ZmOworCisJcmV0dXJuIGFuYWxvZ2l4X2RwX2JpbmQoZGV2LCBkcC0+ZHJtX2RldiwgJmRw
LT5lbmNvZGVyLAorCQkJCSZkcC0+cGxhdF9kYXRhKTsKK30KKworc3RhdGljIHZvaWQgcm9ja2No
aXBfZHBfdW5iaW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZSAqbWFzdGVyLAor
CQkJICAgICAgIHZvaWQgKmRhdGEpCit7CisJcmV0dXJuIGFuYWxvZ2l4X2RwX3VuYmluZChkZXYs
IG1hc3RlciwgZGF0YSk7Cit9CisKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgY29tcG9uZW50X29wcyBy
b2NrY2hpcF9kcF9jb21wb25lbnRfb3BzID0geworCS5iaW5kID0gcm9ja2NoaXBfZHBfYmluZCwK
KwkudW5iaW5kID0gcm9ja2NoaXBfZHBfdW5iaW5kLAorfTsKKworc3RhdGljIGludCByb2NrY2hp
cF9kcF9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQoreworCXN0cnVjdCBkZXZp
Y2UgKmRldiA9ICZwZGV2LT5kZXY7CisJc3RydWN0IGRldmljZV9ub2RlICpwYW5lbF9ub2RlOwor
CXN0cnVjdCByb2NrY2hpcF9kcF9kZXZpY2UgKmRwOworCXN0cnVjdCBkcm1fcGFuZWwgKnBhbmVs
OworCisJcGFuZWxfbm9kZSA9IG9mX3BhcnNlX3BoYW5kbGUoZGV2LT5vZl9ub2RlLCAicm9ja2No
aXAscGFuZWwiLCAwKTsKKwlpZiAoIXBhbmVsX25vZGUpIHsKKwkJRFJNX0VSUk9SKCJmYWlsZWQg
dG8gZmluZCByb2NrY2hpcCxwYW5lbCBkdCBub2RlXG4iKTsKKwkJcmV0dXJuIC1FTk9ERVY7CisJ
fQorCisJcGFuZWwgPSBvZl9kcm1fZmluZF9wYW5lbChwYW5lbF9ub2RlKTsKKwlpZiAoIXBhbmVs
KSB7CisJCURSTV9FUlJPUigiZmFpbGVkIHRvIGZpbmQgcGFuZWxcbiIpOworCQlvZl9ub2RlX3B1
dChwYW5lbF9ub2RlKTsKKwkJcmV0dXJuIC1FUFJPQkVfREVGRVI7CisJfQorCisJb2Zfbm9kZV9w
dXQocGFuZWxfbm9kZSk7CisKKwlkcCA9IGRldm1fa3phbGxvYyhkZXYsIHNpemVvZigqZHApLCBH
RlBfS0VSTkVMKTsKKwlpZiAoIWRwKQorCQlyZXR1cm4gLUVOT01FTTsKKworCWRwLT5kZXYgPSBk
ZXY7CisKKwlkcC0+cGxhdF9kYXRhLnBhbmVsID0gcGFuZWw7CisKKwkvKgorCSAqIFdlIGp1c3Qg
dXNlIHRoZSBkcnZkYXRhIHVudGlsIGRyaXZlciBydW4gaW50byBjb21wb25lbnQKKwkgKiBhZGQg
ZnVuY3Rpb24sIGFuZCB0aGVuIHdlIHdvdWxkIHNldCBkcnZkYXRhIHRvIG51bGwsIHNvCisJICog
dGhhdCBhbmFsb2dpeCBkcCBkcml2ZXIgY291bGQgdGFrZSBjaGFyZ2Ugb2YgdGhlIGRydmRhdGEu
CisJICovCisJcGxhdGZvcm1fc2V0X2RydmRhdGEocGRldiwgZHApOworCisJcmV0dXJuIGNvbXBv
bmVudF9hZGQoZGV2LCAmcm9ja2NoaXBfZHBfY29tcG9uZW50X29wcyk7Cit9CisKK3N0YXRpYyBp
bnQgcm9ja2NoaXBfZHBfcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCit7CisJ
Y29tcG9uZW50X2RlbCgmcGRldi0+ZGV2LCAmcm9ja2NoaXBfZHBfY29tcG9uZW50X29wcyk7CisK
KwlyZXR1cm4gMDsKK30KKworI2lmZGVmIENPTkZJR19QTV9TTEVFUAorc3RhdGljIGludCByb2Nr
Y2hpcF9kcF9zdXNwZW5kKHN0cnVjdCBkZXZpY2UgKmRldikKK3sKKwlyZXR1cm4gYW5hbG9naXhf
ZHBfc3VzcGVuZChkZXYpOworfQorCitzdGF0aWMgaW50IHJvY2tjaGlwX2RwX3Jlc3VtZShzdHJ1
Y3QgZGV2aWNlICpkZXYpCit7CisJcmV0dXJuIGFuYWxvZ2l4X2RwX3Jlc3VtZShkZXYpOworfQor
I2VuZGlmCisKK3N0YXRpYyBjb25zdCBzdHJ1Y3QgZGV2X3BtX29wcyByb2NrY2hpcF9kcF9wbV9v
cHMgPSB7CisJU0VUX1NZU1RFTV9TTEVFUF9QTV9PUFMocm9ja2NoaXBfZHBfc3VzcGVuZCwgcm9j
a2NoaXBfZHBfcmVzdW1lKQorfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBvZl9kZXZpY2VfaWQg
cm9ja2NoaXBfZHBfZHRfaWRzW10gPSB7CisJey5jb21wYXRpYmxlID0gInJvY2tjaGlwLHJrMzI4
OC1kcCIsfSwKKwl7fQorfTsKK01PRFVMRV9ERVZJQ0VfVEFCTEUob2YsIHJvY2tjaGlwX2RwX2R0
X2lkcyk7CisKK3N0YXRpYyBzdHJ1Y3QgcGxhdGZvcm1fZHJpdmVyIHJvY2tjaGlwX2RwX2RyaXZl
ciA9IHsKKwkucHJvYmUgPSByb2NrY2hpcF9kcF9wcm9iZSwKKwkucmVtb3ZlID0gcm9ja2NoaXBf
ZHBfcmVtb3ZlLAorCS5kcml2ZXIgPSB7CisJCSAgIC5uYW1lID0gInJvY2tjaGlwLWRwIiwKKwkJ
ICAgLm93bmVyID0gVEhJU19NT0RVTEUsCisJCSAgIC5wbSA9ICZyb2NrY2hpcF9kcF9wbV9vcHMs
CisJCSAgIC5vZl9tYXRjaF90YWJsZSA9IG9mX21hdGNoX3B0cihyb2NrY2hpcF9kcF9kdF9pZHMp
LAorCX0sCit9OworCittb2R1bGVfcGxhdGZvcm1fZHJpdmVyKHJvY2tjaGlwX2RwX2RyaXZlcik7
CisKK01PRFVMRV9BVVRIT1IoIkplZmYgY2hlbiA8amVmZi5jaGVuQHJvY2stY2hpcHMuY29tPiIp
OworTU9EVUxFX0FVVEhPUigiWWFraXIgWWFuZyA8eWtrQHJvY2stY2hpcHMuY29tPiIpOworTU9E
VUxFX0RFU0NSSVBUSU9OKCJSb2NrY2hpcCBTcGVjaWZpYyBBbmFsb2dpeC1EUCBEcml2ZXIgRXh0
ZW5zaW9uIik7CitNT0RVTEVfTElDRU5TRSgiR1BMIHYyIik7Ci0tIAoyLjEuMgoKCl9fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n
IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl
c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==

From mboxrd@z Thu Jan  1 00:00:00 1970
From: ykk@rock-chips.com (Yakir Yang)
Date: Thu,  6 Aug 2015 09:19:38 -0500
Subject: [RFC PATCH 4/8] drm: rockchip/dp: add rockchip platform dp driver
In-Reply-To: <1438868947-22132-1-git-send-email-ykk@rock-chips.com>
References: <1438868947-22132-1-git-send-email-ykk@rock-chips.com>
Message-ID: <1438870778-23847-1-git-send-email-ykk@rock-chips.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

Rockchip have three clocks for dp controller, we leave pclk_edp
to analogix_dp driver control, and keep the sclk_edp_24m and
sclk_edp in platform driver.

Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
 drivers/gpu/drm/rockchip/Kconfig                |  10 +
 drivers/gpu/drm/rockchip/Makefile               |   1 +
 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 419 ++++++++++++++++++++++++
 3 files changed, 430 insertions(+)
 create mode 100644 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 35215f6..096ed77 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -25,3 +25,13 @@ config ROCKCHIP_DW_HDMI
 	  for the Synopsys DesignWare HDMI driver. If you want to
 	  enable HDMI on RK3288 based SoC, you should selet this
 	  option.
+
+
+config ROCKCHIP_ANALOGIX_DP
+        tristate "Rockchip specific extensions for Analogix DP driver"
+        depends on DRM_ROCKCHIP
+        select DRM_ANALOGIX_DP
+        help
+	  This selects support for Rockchip SoC specific extensions
+	  for the Analogix Core DP driver. If you want to enable DP
+	  on RK3288 based SoC, you should selet this option.
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
index f3d8a19..8ad01fb 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -6,5 +6,6 @@ rockchipdrm-y := rockchip_drm_drv.o rockchip_drm_fb.o rockchip_drm_fbdev.o \
 		rockchip_drm_gem.o
 
 obj-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
+obj-$(CONFIG_ROCKCHIP_ANALOGIX_DP) += analogix_dp-rockchip.o
 
 obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o rockchip_drm_vop.o
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
new file mode 100644
index 0000000..804048c
--- /dev/null
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -0,0 +1,419 @@
+/*
+ * Rockchip SoC DP (Display Port) interface driver.
+ *
+ * Copyright (C) Fuzhou Rockchip Electronics Co., Ltd.
+ * Author: Andy Yan <andy.yan@rock-chips.com>
+ *         Jeff Chen <jeff.chen@rock-chips.com>
+ *         Yakir Yang <ykk@rock-chips.com>
+ *
+ * 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; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+#include <drm/drmP.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_panel.h>
+#include <drm/drm_of.h>
+#include <drm/drm_dp_helper.h>
+
+#include <linux/component.h>
+#include <linux/clk.h>
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+
+#include <video/of_videomode.h>
+#include <video/videomode.h>
+
+#include <drm/bridge/analogix_dp.h>
+
+#include "rockchip_drm_drv.h"
+#include "rockchip_drm_vop.h"
+
+#define encoder_to_dp(c) \
+		container_of(c, struct rockchip_dp_device, encoder)
+
+#define plat_data_to_dp(pd) \
+		container_of(pd, struct rockchip_dp_device, plat_data)
+
+/* dp grf register offset */
+#define DP_VOP_SEL                              0x025c /* grf_soc_con6 */
+#define DP_REF_CLK_SEL                          0x0274 /* grf_soc_con12 */
+
+#define GRF_DP_REF_CLK_SEL_INTER                BIT(4)
+#define DP_SEL_VOP_LIT				BIT(5)
+
+struct rockchip_dp_device {
+	struct drm_device        *drm_dev;
+	struct device            *dev;
+	struct drm_encoder       encoder;
+	struct drm_display_mode  mode;
+
+	struct clk               *clk_dp;
+	struct clk               *clk_24m_parent;
+	struct clk               *clk_24m;
+	struct regmap            *grf;
+	struct reset_control     *rst;
+
+	struct analogix_dp_plat_data plat_data;
+};
+
+static int rockchip_dp_clk_enable(struct rockchip_dp_device *dp)
+{
+	int ret = 0;
+
+	ret = clk_prepare_enable(dp->clk_dp);
+	if (ret < 0) {
+		dev_err(dp->dev, "cannot enable clk_dp %d\n", ret);
+		goto err_clk_dp;
+	}
+
+	ret = clk_set_rate(dp->clk_24m, 24000000);
+	if (ret < 0) {
+		dev_err(dp->dev, "cannot set dp clk_24m %d\n",
+			ret);
+		goto err_clk_24m;
+	}
+
+	ret = clk_prepare_enable(dp->clk_24m);
+	if (ret < 0) {
+		dev_err(dp->dev, "cannot enable dp clk_24m %d\n",
+			ret);
+		goto err_clk_24m;
+	}
+
+	return 0;
+
+err_clk_24m:
+	clk_disable_unprepare(dp->clk_dp);
+err_clk_dp:
+	return ret;
+}
+
+static int rockchip_dp_clk_disable(struct rockchip_dp_device *dp)
+{
+	clk_disable_unprepare(dp->clk_dp);
+	clk_disable_unprepare(dp->clk_24m);
+
+	return 0;
+}
+
+static int rockchip_dp_pre_init(struct rockchip_dp_device *dp)
+{
+	u32 val;
+	int ret;
+
+	val = GRF_DP_REF_CLK_SEL_INTER | (GRF_DP_REF_CLK_SEL_INTER << 16);
+	ret = regmap_write(dp->grf, DP_REF_CLK_SEL, val);
+	if (ret != 0) {
+		dev_err(dp->dev, "Could not write to GRF: %d\n", ret);
+		return ret;
+	}
+
+	reset_control_assert(dp->rst);
+	usleep_range(10, 20);
+	reset_control_deassert(dp->rst);
+
+	return 0;
+}
+
+static int rockchip_dp_poweron(struct analogix_dp_plat_data *plat_data)
+{
+	struct rockchip_dp_device *dp = plat_data_to_dp(plat_data);
+	int ret;
+
+	ret = rockchip_dp_clk_enable(dp);
+	if (ret < 0) {
+		dev_err(dp->dev, "cannot enable dp clk %d\n", ret);
+		return -1;
+	}
+
+	ret = rockchip_dp_pre_init(dp);
+	if (ret < 0) {
+		dev_err(dp->dev, "dp pre init fail %d\n", ret);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int rockchip_dp_poweroff(struct analogix_dp_plat_data *plat_data)
+{
+	struct rockchip_dp_device *dp = plat_data_to_dp(plat_data);
+
+	rockchip_dp_clk_disable(dp);
+
+	return 0;
+}
+
+static bool
+rockchip_dp_drm_encoder_mode_fixup(struct drm_encoder *encoder,
+				   const struct drm_display_mode *mode,
+				   struct drm_display_mode *adjusted_mode)
+{
+	/* do nothing */
+	return true;
+}
+
+static void rockchip_dp_drm_encoder_mode_set(struct drm_encoder *encoder,
+					     struct drm_display_mode *mode,
+					     struct drm_display_mode *adjusted)
+{
+	/* do nothing */
+}
+
+static void rockchip_dp_drm_encoder_prepare(struct drm_encoder *encoder)
+{
+	struct rockchip_dp_device *dp = encoder_to_dp(encoder);
+	u32 val;
+	int ret;
+
+	ret = rockchip_drm_crtc_mode_config(encoder->crtc,
+					    DRM_MODE_CONNECTOR_eDP,
+					    ROCKCHIP_OUT_MODE_AAAA);
+	if (ret < 0) {
+		dev_err(dp->dev, "Could not set crtc mode config: %d.\n", ret);
+		return;
+	}
+
+	ret = rockchip_drm_encoder_get_mux_id(dp->dev->of_node, encoder);
+	if (ret < 0)
+		return;
+
+	if (ret)
+		val = DP_SEL_VOP_LIT | (DP_SEL_VOP_LIT << 16);
+	else
+		val = DP_SEL_VOP_LIT << 16;
+
+	dev_info(dp->dev, "vop %s output to dp\n", (ret) ? "LIT" : "BIG");
+
+	ret = regmap_write(dp->grf, DP_VOP_SEL, val);
+	if (ret != 0) {
+		dev_err(dp->dev, "Could not write to GRF: %d\n", ret);
+		return;
+	}
+}
+
+static void rockchip_dp_drm_encoder_nop(struct drm_encoder *encoder)
+{
+	/* do nothing */
+}
+
+static struct drm_encoder_helper_funcs rockchip_dp_encoder_helper_funcs = {
+	.mode_fixup = rockchip_dp_drm_encoder_mode_fixup,
+	.mode_set = rockchip_dp_drm_encoder_mode_set,
+	.prepare = rockchip_dp_drm_encoder_prepare,
+	.commit = rockchip_dp_drm_encoder_nop,
+	.disable = rockchip_dp_drm_encoder_nop,
+};
+
+static void rockchip_dp_drm_encoder_destroy(struct drm_encoder *encoder)
+{
+	drm_encoder_cleanup(encoder);
+}
+
+static struct drm_encoder_funcs rockchip_dp_encoder_funcs = {
+	.destroy = rockchip_dp_drm_encoder_destroy,
+};
+
+static int rockchip_dp_init(struct rockchip_dp_device *dp)
+{
+	struct device *dev = dp->dev;
+	struct device_node *np = dev->of_node;
+	int ret;
+
+	dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
+	if (IS_ERR(dp->grf)) {
+		dev_err(dev,
+			"rk3288-dp needs rockchip,grf property\n");
+		return PTR_ERR(dp->grf);
+	}
+
+	dp->clk_dp = devm_clk_get(dev, "clk_dp");
+	if (IS_ERR(dp->clk_dp)) {
+		dev_err(dev, "cannot get clk_dp\n");
+		return PTR_ERR(dp->clk_dp);
+	}
+
+	dp->clk_24m = devm_clk_get(dev, "clk_dp_24m");
+	if (IS_ERR(dp->clk_24m)) {
+		dev_err(dev, "cannot get clk_dp_24m\n");
+		return PTR_ERR(dp->clk_24m);
+	}
+
+	dp->rst = devm_reset_control_get(dev, "dp");
+	if (IS_ERR(dp->rst)) {
+		dev_err(dev, "failed to get reset\n");
+		return PTR_ERR(dp->rst);
+	}
+
+	ret = rockchip_dp_clk_enable(dp);
+	if (ret < 0) {
+		dev_err(dp->dev, "cannot enable dp clk %d\n", ret);
+		return ret;
+	}
+
+	ret = rockchip_dp_pre_init(dp);
+	if (ret < 0) {
+		dev_err(dp->dev, "failed to pre init %d\n", ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+static int rockchip_dp_drm_create_encoder(struct rockchip_dp_device *dp)
+{
+	struct drm_encoder *encoder = &dp->encoder;
+	struct drm_device *drm_dev = dp->drm_dev;
+	struct device *dev = dp->dev;
+	int ret;
+
+	encoder->possible_crtcs = drm_of_find_possible_crtcs(drm_dev,
+							     dev->of_node);
+	DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs);
+
+	ret = drm_encoder_init(drm_dev, encoder, &rockchip_dp_encoder_funcs,
+			       DRM_MODE_ENCODER_TMDS);
+	if (ret) {
+		DRM_ERROR("failed to initialize encoder with drm\n");
+		return ret;
+	}
+
+	drm_encoder_helper_add(encoder, &rockchip_dp_encoder_helper_funcs);
+
+	return 0;
+}
+
+static int rockchip_dp_bind(struct device *dev, struct device *master,
+			    void *data)
+{
+	struct rockchip_dp_device *dp = dev_get_drvdata(dev);
+	struct drm_device *drm_dev = data;
+	int ret;
+
+	/*
+	 * Just like the probe function said, we don't need the
+	 * device drvrate anymore, we should leave the charge to
+	 * analogix dp driver, set the device drvdata to NULL.
+	 */
+	dev_set_drvdata(dev, NULL);
+
+	ret = rockchip_dp_init(dp);
+	if (ret < 0)
+		return ret;
+
+	dp->drm_dev = drm_dev;
+
+	ret = rockchip_dp_drm_create_encoder(dp);
+	if (ret) {
+		DRM_ERROR("failed to create drm encoder\n");
+		return ret;
+	}
+
+	dp->plat_data.attach = NULL;
+	dp->plat_data.power_on = rockchip_dp_poweron;
+	dp->plat_data.power_off = rockchip_dp_poweroff;
+
+	return analogix_dp_bind(dev, dp->drm_dev, &dp->encoder,
+				&dp->plat_data);
+}
+
+static void rockchip_dp_unbind(struct device *dev, struct device *master,
+			       void *data)
+{
+	return analogix_dp_unbind(dev, master, data);
+}
+
+static const struct component_ops rockchip_dp_component_ops = {
+	.bind = rockchip_dp_bind,
+	.unbind = rockchip_dp_unbind,
+};
+
+static int rockchip_dp_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct device_node *panel_node;
+	struct rockchip_dp_device *dp;
+	struct drm_panel *panel;
+
+	panel_node = of_parse_phandle(dev->of_node, "rockchip,panel", 0);
+	if (!panel_node) {
+		DRM_ERROR("failed to find rockchip,panel dt node\n");
+		return -ENODEV;
+	}
+
+	panel = of_drm_find_panel(panel_node);
+	if (!panel) {
+		DRM_ERROR("failed to find panel\n");
+		of_node_put(panel_node);
+		return -EPROBE_DEFER;
+	}
+
+	of_node_put(panel_node);
+
+	dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
+	if (!dp)
+		return -ENOMEM;
+
+	dp->dev = dev;
+
+	dp->plat_data.panel = panel;
+
+	/*
+	 * We just use the drvdata until driver run into component
+	 * add function, and then we would set drvdata to null, so
+	 * that analogix dp driver could take charge of the drvdata.
+	 */
+	platform_set_drvdata(pdev, dp);
+
+	return component_add(dev, &rockchip_dp_component_ops);
+}
+
+static int rockchip_dp_remove(struct platform_device *pdev)
+{
+	component_del(&pdev->dev, &rockchip_dp_component_ops);
+
+	return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int rockchip_dp_suspend(struct device *dev)
+{
+	return analogix_dp_suspend(dev);
+}
+
+static int rockchip_dp_resume(struct device *dev)
+{
+	return analogix_dp_resume(dev);
+}
+#endif
+
+static const struct dev_pm_ops rockchip_dp_pm_ops = {
+	SET_SYSTEM_SLEEP_PM_OPS(rockchip_dp_suspend, rockchip_dp_resume)
+};
+
+static const struct of_device_id rockchip_dp_dt_ids[] = {
+	{.compatible = "rockchip,rk3288-dp",},
+	{}
+};
+MODULE_DEVICE_TABLE(of, rockchip_dp_dt_ids);
+
+static struct platform_driver rockchip_dp_driver = {
+	.probe = rockchip_dp_probe,
+	.remove = rockchip_dp_remove,
+	.driver = {
+		   .name = "rockchip-dp",
+		   .owner = THIS_MODULE,
+		   .pm = &rockchip_dp_pm_ops,
+		   .of_match_table = of_match_ptr(rockchip_dp_dt_ids),
+	},
+};
+
+module_platform_driver(rockchip_dp_driver);
+
+MODULE_AUTHOR("Jeff chen <jeff.chen@rock-chips.com>");
+MODULE_AUTHOR("Yakir Yang <ykk@rock-chips.com>");
+MODULE_DESCRIPTION("Rockchip Specific Analogix-DP Driver Extension");
+MODULE_LICENSE("GPL v2");
-- 
2.1.2