Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95485493 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dsi-staging: add support for controller version 2.4"

parents 5f2ba0c5 526ea03b

Documentation/devicetree/bindings/drm/msm/sde-dsi.txt

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ Required properties: 
- compatible:           Should be "qcom,dsi-ctrl-hw-v<version>". Supported

			versions include 1.4, 2.0 and 2.2.

			eg: qcom,dsi-ctrl-hw-v1.4, qcom,dsi-ctrl-hw-v2.0,

			qcom,dsi-ctrl-hw-v2.2, qcom,dsi-ctrl-hw-v2.3

			qcom,dsi-ctrl-hw-v2.2, qcom,dsi-ctrl-hw-v2.3,

			qcom,dsi-ctrl-hw-v2.4

			And for dsi phy driver:

			qcom,dsi-phy-v0.0-hpm, qcom,dsi-phy-v0.0-lpm,

			qcom,dsi-phy-v1.0, qcom,dsi-phy-v2.0,

drivers/gpu/drm/msm/dsi-staging/dsi_catalog.c

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ static void dsi_catalog_cmn_init(struct dsi_ctrl_hw *ctrl, 
		break;

	case DSI_CTRL_VERSION_2_2:

	case DSI_CTRL_VERSION_2_3:

	case DSI_CTRL_VERSION_2_4:

		ctrl->ops.phy_reset_config = dsi_ctrl_hw_22_phy_reset_config;

		ctrl->ops.config_clk_gating = dsi_ctrl_hw_22_config_clk_gating;

		ctrl->ops.get_cont_splash_status =
@@ -175,6 +176,7 @@ int dsi_catalog_ctrl_setup(struct dsi_ctrl_hw *ctrl, 
	case DSI_CTRL_VERSION_2_0:

	case DSI_CTRL_VERSION_2_2:

	case DSI_CTRL_VERSION_2_3:

	case DSI_CTRL_VERSION_2_4:

		ctrl->phy_isolation_enabled = phy_isolation_enabled;

		dsi_catalog_cmn_init(ctrl, version);

		break;

drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.c

+6 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ static const enum dsi_ctrl_version dsi_ctrl_v1_4 = DSI_CTRL_VERSION_1_4; 
static const enum dsi_ctrl_version dsi_ctrl_v2_0 = DSI_CTRL_VERSION_2_0;

static const enum dsi_ctrl_version dsi_ctrl_v2_2 = DSI_CTRL_VERSION_2_2;

static const enum dsi_ctrl_version dsi_ctrl_v2_3 = DSI_CTRL_VERSION_2_3;

static const enum dsi_ctrl_version dsi_ctrl_v2_4 = DSI_CTRL_VERSION_2_4;



static const struct of_device_id msm_dsi_of_match[] = {

	{
@@ -73,6 +74,10 @@ static const struct of_device_id msm_dsi_of_match[] = { 
		.compatible = "qcom,dsi-ctrl-hw-v2.3",

		.data = &dsi_ctrl_v2_3,

	},

	{

		.compatible = "qcom,dsi-ctrl-hw-v2.4",

		.data = &dsi_ctrl_v2_4,

	},

	{}

};
@@ -475,6 +480,7 @@ static int dsi_ctrl_init_regmap(struct platform_device *pdev, 
		break;

	case DSI_CTRL_VERSION_2_2:

	case DSI_CTRL_VERSION_2_3:

	case DSI_CTRL_VERSION_2_4:

		ptr = msm_ioremap(pdev, "disp_cc_base", ctrl->name);

		if (IS_ERR(ptr)) {

			pr_err("disp_cc base address not found for [%s]\n",

drivers/gpu/drm/msm/dsi-staging/dsi_ctrl_hw.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
 * @DSI_CTRL_VERSION_2_0:     DSI host v2.0 controller

 * @DSI_CTRL_VERSION_2_2:     DSI host v2.2 controller

 * @DSI_CTRL_VERSION_2_3:     DSI host v2.3 controller

 * @DSI_CTRL_VERSION_2_4:     DSI host v2.4 controller

 * @DSI_CTRL_VERSION_MAX:     max version

 */

enum dsi_ctrl_version {
@@ -44,6 +45,7 @@ enum dsi_ctrl_version { 
	DSI_CTRL_VERSION_2_0,

	DSI_CTRL_VERSION_2_2,

	DSI_CTRL_VERSION_2_3,

	DSI_CTRL_VERSION_2_4,

	DSI_CTRL_VERSION_MAX

};