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

Commit fdbea037 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: clk: add support for DSI pll on MSM8909"

parents bbe36ee2 565a4ef3

drivers/clk/msm/mdss/mdss-dsi-pll-28lpm.c

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -497,7 +497,8 @@ int dsi_pll_clock_register_lpm(struct platform_device *pdev, 
	}



	if ((pll_res->target_id == MDSS_PLL_TARGET_8952) ||

		(pll_res->target_id == MDSS_PLL_TARGET_8937)) {

		(pll_res->target_id == MDSS_PLL_TARGET_8937) ||

		(pll_res->target_id == MDSS_PLL_TARGET_8909)) {

		if (!pll_res->index)

			rc = of_msm_clock_register(pdev->dev.of_node,

				dsi_pll0_cc, ARRAY_SIZE(dsi_pll0_cc));

drivers/clk/msm/mdss/mdss-pll.c

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -132,6 +132,9 @@ static int mdss_pll_resource_parse(struct platform_device *pdev, 
	} else if (!strcmp(compatible_stream, "qcom,mdss_dsi_pll_8937")) {

		pll_res->pll_interface_type = MDSS_DSI_PLL_LPM;

		pll_res->target_id = MDSS_PLL_TARGET_8937;

	} else if (!strcmp(compatible_stream, "qcom,mdss_dsi_pll_8909")) {

		pll_res->pll_interface_type = MDSS_DSI_PLL_LPM;

		pll_res->target_id = MDSS_PLL_TARGET_8909;

	} else if (!strcmp(compatible_stream, "qcom,mdss_dsi_pll_8996")) {

		pll_res->pll_interface_type = MDSS_DSI_PLL_8996;

		pll_res->target_id = MDSS_PLL_TARGET_8996;
@@ -398,6 +401,7 @@ static const struct of_device_id mdss_pll_dt_match[] = { 
	{.compatible = "qcom,mdss_hdmi_pll_8996_v3_1p8"},

	{.compatible = "qcom,mdss_dsi_pll_8952"},

	{.compatible = "qcom,mdss_dsi_pll_8937"},

	{.compatible = "qcom,mdss_dsi_pll_8909"},

	{.compatible = "qcom,mdss_dsi_pll_titanium"},

	{}

};

drivers/clk/msm/mdss/mdss-pll.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -43,6 +43,7 @@ enum { 
	MDSS_PLL_TARGET_8952,

	MDSS_PLL_TARGET_8937,

	MDSS_PLL_TARGET_TITANIUM,

	MDSS_PLL_TARGET_8909,

};



#define DFPS_MAX_NUM_OF_FRAME_RATES 10

include/dt-bindings/clock/msm-clocks-8909.h

+3 −1
Original line number Diff line number Diff line 
/*

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

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -168,6 +168,8 @@ 


#define clk_pixel_clk_src			0x8b6f83d8

#define clk_byte_clk_src			0x3a911c53

#define clk_dsi_pll0_byte_clk_src		0x44539836

#define clk_dsi_pll0_pixel_clk_src		0x5767c287



/* RPM */

#define clk_pcnoc_clk				0xc1296d0f