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

Commit 5694bc2e authored by Satya Rama Aditya Pinapala's avatar Satya Rama Aditya Pinapala
Browse files

disp: msm: dsi: move dsi pll as subnode to dsi PHY 



DSI PLL is tightly coupled with DSI PHY. This change removes
separate DSI pll driver and makes DSI pll as a subnode to DSI
PHY which is an accurate way of representation. In addition, this
change adds support for 5nm DSI ctrl and PHY revisions and adds
DSI pll support for 5nm. Remove support for older DSI pll revisions
such as 7nm, 10nm, 14nm, 20nm, 28nm.

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

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -27,4 +27,3 @@ endif 


obj-$(CONFIG_DRM_MSM) += msm/

obj-$(CONFIG_MSM_SDE_ROTATOR) += rotator/
 
obj-$(CONFIG_QCOM_MDSS_PLL) += pll/

msm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
ccflags-y := -I$(srctree)/include/drm -I$(srctree)/techpack/display/msm -I$(srctree)/techpack/display/msm/dsi -I$(srctree)/techpack/display/msm/dp

ccflags-y += -I$(srctree)/techpack/display/msm/sde

ccflags-y += -I$(srctree)/techpack/display/rotator

ccflags-y += -I$(srctree)/drivers/clk/qcom/



msm_drm-$(CONFIG_DRM_MSM_DP) += dp/dp_usbpd.o \

	dp/dp_parser.o \
@@ -88,6 +89,8 @@ msm_drm-$(CONFIG_DRM_MSM_DSI) += dsi/dsi_phy.o \ 
	dsi/dsi_phy_timing_v2_0.o \

	dsi/dsi_phy_timing_v3_0.o \

	dsi/dsi_phy_timing_v4_0.o \

	dsi/dsi_pll.o \

	dsi/dsi_pll_5nm.o \

	dsi/dsi_ctrl_hw_cmn.o \

	dsi/dsi_ctrl_hw_1_4.o \

	dsi/dsi_ctrl_hw_2_0.o \

msm/dsi/dsi_catalog.c

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

/*

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

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

 */



#include <linux/errno.h>
@@ -100,6 +100,7 @@ static void dsi_catalog_cmn_init(struct dsi_ctrl_hw *ctrl, 
	case DSI_CTRL_VERSION_2_2:

	case DSI_CTRL_VERSION_2_3:

	case DSI_CTRL_VERSION_2_4:

	case DSI_CTRL_VERSION_2_5:

		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.setup_lane_map = dsi_ctrl_hw_20_setup_lane_map;
@@ -163,6 +164,7 @@ int dsi_catalog_ctrl_setup(struct dsi_ctrl_hw *ctrl, 
	case DSI_CTRL_VERSION_2_2:

	case DSI_CTRL_VERSION_2_3:

	case DSI_CTRL_VERSION_2_4:

	case DSI_CTRL_VERSION_2_5:

		ctrl->phy_isolation_enabled = phy_isolation_enabled;

		dsi_catalog_cmn_init(ctrl, version);

		break;
@@ -302,6 +304,7 @@ int dsi_catalog_phy_setup(struct dsi_phy_hw *phy, 
		break;

	case DSI_PHY_VERSION_4_0:

	case DSI_PHY_VERSION_4_1:

	case DSI_PHY_VERSION_4_2:

		dsi_catalog_phy_4_0_init(phy);

		break;

	case DSI_PHY_VERSION_0_0_HPM:

msm/dsi/dsi_ctrl.c

+15 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

 * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/of_device.h>
@@ -53,6 +53,7 @@ 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 enum dsi_ctrl_version dsi_ctrl_v2_5 = DSI_CTRL_VERSION_2_5;



static const struct of_device_id msm_dsi_of_match[] = {

	{
@@ -75,6 +76,10 @@ static const struct of_device_id msm_dsi_of_match[] = { 
		.compatible = "qcom,dsi-ctrl-hw-v2.4",

		.data = &dsi_ctrl_v2_4,

	},

	{

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

		.data = &dsi_ctrl_v2_5,

	},

	{}

};
@@ -559,6 +564,7 @@ static int dsi_ctrl_init_regmap(struct platform_device *pdev, 
	case DSI_CTRL_VERSION_2_2:

	case DSI_CTRL_VERSION_2_3:

	case DSI_CTRL_VERSION_2_4:

	case DSI_CTRL_VERSION_2_5:

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

		if (IS_ERR(ptr)) {

			DSI_CTRL_ERR(ctrl, "disp_cc base address not found for\n");
@@ -1867,18 +1873,18 @@ static int dsi_ctrl_dev_probe(struct platform_device *pdev) 
		goto fail;

	}



	rc = dsi_ctrl_clocks_init(pdev, dsi_ctrl);

	rc = dsi_ctrl_supplies_init(pdev, dsi_ctrl);

	if (rc) {

		DSI_CTRL_ERR(dsi_ctrl, "Failed to parse clock information, rc = %d\n",

		DSI_CTRL_ERR(dsi_ctrl, "Failed to parse voltage supplies, rc = %d\n",

				rc);

		goto fail;

	}



	rc = dsi_ctrl_supplies_init(pdev, dsi_ctrl);

	rc = dsi_ctrl_clocks_init(pdev, dsi_ctrl);

	if (rc) {

		DSI_CTRL_ERR(dsi_ctrl, "Failed to parse voltage supplies, rc = %d\n",

		DSI_CTRL_ERR(dsi_ctrl, "Failed to parse clock information, rc = %d\n",

				rc);

		goto fail_clks;

		goto fail_supplies;

	}



	rc = dsi_catalog_ctrl_setup(&dsi_ctrl->hw, dsi_ctrl->version,
@@ -1887,7 +1893,7 @@ static int dsi_ctrl_dev_probe(struct platform_device *pdev) 
	if (rc) {

		DSI_CTRL_ERR(dsi_ctrl, "Catalog does not support version (%d)\n",

		       dsi_ctrl->version);

		goto fail_supplies;

		goto fail_clks;

	}



	item->ctrl = dsi_ctrl;
@@ -1905,10 +1911,10 @@ static int dsi_ctrl_dev_probe(struct platform_device *pdev) 


	return 0;



fail_supplies:

	(void)dsi_ctrl_supplies_deinit(dsi_ctrl);

fail_clks:

	(void)dsi_ctrl_clocks_deinit(dsi_ctrl);

fail_supplies:

	(void)dsi_ctrl_supplies_deinit(dsi_ctrl);

fail:

	return rc;

}

msm/dsi/dsi_ctrl_hw.h

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

/*

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

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

 */



#ifndef _DSI_CTRL_HW_H_
@@ -36,6 +36,7 @@ 
 * @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_2_5:     DSI host v2.5 controller

 * @DSI_CTRL_VERSION_MAX:     max version

 */

enum dsi_ctrl_version {
@@ -45,6 +46,7 @@ enum dsi_ctrl_version { 
	DSI_CTRL_VERSION_2_2,

	DSI_CTRL_VERSION_2_3,

	DSI_CTRL_VERSION_2_4,

	DSI_CTRL_VERSION_2_5,

	DSI_CTRL_VERSION_MAX

};