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

Commit 2dd85338 authored by Satya Rama Aditya Pinapala's avatar Satya Rama Aditya Pinapala Committed by Gerrit - the friendly Code Review server
Browse files

drm/msm/dsi-staging: Adding ctrl version for kona 



This change adds DSI Controller hardware version
2.4 for kona target.

Change-Id: I977af131f0555ed6ab01afda201e3650a43edb0b
Signed-off-by: default avatarSatya Rama Aditya Pinapala <psraditya30@codeaurora.org>
parent 24bc55c8

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

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,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 =
@@ -163,6 +164,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
@@ -63,6 +63,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[] = {

	{
@@ -81,6 +82,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,

	},

	{}

};
@@ -483,6 +488,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

+3 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 */



#ifndef _DSI_CTRL_HW_H_
@@ -28,6 +28,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 {
@@ -36,6 +37,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

};