Merge "clk: qcom: Add support for GPU clocks for MSMFalcon"

This commit is contained in:
Linux Build Service Account 2016-10-07 12:20:00 -07:00 committed by Gerrit - the friendly Code Review server
commit 44fc68eb86
5 changed files with 543 additions and 21 deletions

View file

@ -0,0 +1,23 @@
Qualcomm Technologies, Inc Graphics Clock & Reset Controller Binding
--------------------------------------------------------------------
Required properties :
- compatible : shall contain only one of the following:
"qcom,gpucc-msmfalcon"
- reg : shall contain base register location and length
- #clock-cells : shall contain 1
- #reset-cells : shall contain 1
Optional properties :
- #power-domain-cells : shall contain 1
Example:
clock-controller@4000000 {
compatible = "qcom,gpucc-msmfalcon";
reg = <<0x5065000 0x10000>;
#clock-cells = <1>;
#reset-cells = <1>;
#power-domain-cells = <1>;
};

View file

@ -155,6 +155,7 @@ config MSM_MMCC_8996
config MSM_GCC_FALCON
tristate "MSMFALCON Global Clock Controller"
select QCOM_GDSC
depends on COMMON_CLK_QCOM
---help---
Support for the global clock controller on Qualcomm Technologies, Inc
@ -162,6 +163,16 @@ config MSM_GCC_FALCON
Say Y if you want to use peripheral devices such as UART, SPI, I2C,
USB, UFS, SD/eMMC, PCIe, etc.
config MSM_GPUCC_FALCON
tristate "MSMFALCON Graphics Clock Controller"
select MSM_GCC_FALCON
depends on COMMON_CLK_QCOM
help
Support for the graphics clock controller on Qualcomm Technologies, Inc
MSMfalcon devices.
Say Y if you want to support graphics controller devices which will
be required to enable those device.
config QCOM_HFPLL
tristate "High-Frequency PLL (HFPLL) Clock Controller"
depends on COMMON_CLK_QCOM

View file

@ -29,6 +29,7 @@ obj-$(CONFIG_MSM_GCC_FALCON) += gcc-msmfalcon.o
obj-$(CONFIG_MSM_MMCC_8960) += mmcc-msm8960.o
obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8974.o
obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm8996.o
obj-$(CONFIG_MSM_GPUCC_FALCON) += gpucc-msmfalcon.o
obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o
obj-$(CONFIG_QCOM_HFPLL) += hfpll.o
obj-$(CONFIG_KRAITCC) += krait-cc.o

View file

@ -0,0 +1,482 @@
/*
* Copyright (c) 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
* only version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include <linux/bitops.h>
#include <linux/clk.h>
#include <linux/clk-provider.h>
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/regmap.h>
#include <linux/reset-controller.h>
#include <dt-bindings/clock/qcom,gpu-msmfalcon.h>
#include "clk-alpha-pll.h"
#include "common.h"
#include "clk-regmap.h"
#include "clk-pll.h"
#include "clk-rcg.h"
#include "clk-branch.h"
#include "vdd-level-falcon.h"
#define F(f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) }
#define F_GFX(f, s, h, m, n, sf) { (f), (s), (2 * (h) - 1), (m), (n), (sf) }
static DEFINE_VDD_REGULATORS(vdd_dig, VDD_DIG_NUM, 1, vdd_corner, NULL);
static DEFINE_VDD_REGULATORS(vdd_mx, VDD_DIG_NUM, 1, vdd_corner, NULL);
static DEFINE_VDD_REGS_INIT(vdd_gfx, 1);
enum {
P_CORE_BI_PLL_TEST_SE,
P_GPLL0_OUT_MAIN,
P_GPLL0_OUT_MAIN_DIV,
P_GPU_PLL0_PLL_OUT_MAIN,
P_GPU_PLL1_PLL_OUT_MAIN,
P_XO,
};
static const struct parent_map gpucc_parent_map_0[] = {
{ P_XO, 0 },
{ P_GPLL0_OUT_MAIN, 5 },
{ P_GPLL0_OUT_MAIN_DIV, 6 },
{ P_CORE_BI_PLL_TEST_SE, 7 },
};
static const char * const gpucc_parent_names_0[] = {
"cxo_a",
"gcc_gpu_gpll0_clk",
"gcc_gpu_gpll0_div_clk",
"core_bi_pll_test_se",
};
static const struct parent_map gpucc_parent_map_1[] = {
{ P_XO, 0 },
{ P_GPU_PLL0_PLL_OUT_MAIN, 1 },
{ P_GPU_PLL1_PLL_OUT_MAIN, 3 },
{ P_GPLL0_OUT_MAIN, 5 },
{ P_CORE_BI_PLL_TEST_SE, 7 },
};
static const char * const gpucc_parent_names_1[] = {
"xo",
"gpu_pll0_pll_out_main",
"gpu_pll1_pll_out_main",
"gcc_gpu_gpll0_clk",
"core_bi_pll_test_se",
};
static struct pll_vco gpu_vco[] = {
{ 1000000000, 2000000000, 0 },
{ 500000000, 1000000000, 2 },
{ 250000000, 500000000, 3 },
};
/* 640MHz configuration */
static const struct pll_config gpu_pll0_config = {
.l = 0x21,
.config_ctl_val = 0x4001055b,
.alpha = 0x55555600,
.alpha_u = 0x55,
.alpha_en_mask = BIT(24),
.vco_val = 0x2 << 20,
.vco_mask = 0x3 << 20,
.main_output_mask = 0x1,
};
static struct pll_vco_data pll_data[] = {
/* Frequency post-div */
{ 640000000, 0x1 },
};
static struct clk_alpha_pll gpu_pll0_pll_out_main = {
.offset = 0x0,
.vco_table = gpu_vco,
.num_vco = ARRAY_SIZE(gpu_vco),
.vco_data = pll_data,
.num_vco_data = ARRAY_SIZE(pll_data),
.clkr = {
.hw.init = &(struct clk_init_data){
.name = "gpu_pll0_pll_out_main",
.parent_names = (const char *[]){ "xo" },
.num_parents = 1,
.ops = &clk_alpha_pll_ops,
VDD_GPU_PLL_FMAX_MAP6(
MIN, 266000000,
LOWER, 432000000,
LOW, 640000000,
LOW_L1, 800000000,
NOMINAL, 1020000000,
HIGH, 1500000000),
},
},
};
static struct clk_alpha_pll gpu_pll1_pll_out_main = {
.offset = 0x40,
.vco_table = gpu_vco,
.num_vco = ARRAY_SIZE(gpu_vco),
.vco_data = pll_data,
.num_vco_data = ARRAY_SIZE(pll_data),
.clkr = {
.hw.init = &(struct clk_init_data){
.name = "gpu_pll1_pll_out_main",
.parent_names = (const char *[]){ "xo" },
.num_parents = 1,
.ops = &clk_alpha_pll_ops,
VDD_GPU_PLL_FMAX_MAP6(
MIN, 266000000,
LOWER, 432000000,
LOW, 640000000,
LOW_L1, 800000000,
NOMINAL, 1020000000,
HIGH, 1500000000),
},
},
};
/* GFX clock init data */
static struct clk_init_data gpu_clks_init[] = {
[0] = {
.name = "gfx3d_clk_src",
.parent_names = gpucc_parent_names_1,
.num_parents = 3,
.ops = &clk_gfx3d_src_ops,
.flags = CLK_SET_RATE_PARENT,
},
[1] = {
.name = "gpucc_gfx3d_clk",
.parent_names = (const char *[]){
"gfx3d_clk_src",
},
.num_parents = 1,
.ops = &clk_branch2_ops,
.flags = CLK_SET_RATE_PARENT,
.vdd_class = &vdd_gfx,
},
};
/*
* Frequencies and PLL configuration
* The PLL source would be to ping-pong between GPU-PLL0
* and GPU-PLL1.
* ====================================================
* | F | PLL SRC Freq | PLL postdiv | RCG Div |
* ====================================================
* | 160000000 | 640000000 | 2 | 2 |
* | 266000000 | 532000000 | 1 | 2 |
* | 370000000 | 740000000 | 1 | 2 |
* | 465000000 | 930000000 | 1 | 2 |
* | 588000000 | 1176000000 | 1 | 2 |
* | 647000000 | 1294000000 | 1 | 2 |
* | 750000000 | 1500000000 | 1 | 2 |
* ====================================================
*/
static const struct freq_tbl ftbl_gfx3d_clk_src[] = {
F_GFX( 19200000, 0, 1, 0, 0, 0),
F_GFX(160000000, 0, 2, 0, 0, 640000000),
F_GFX(266000000, 0, 2, 0, 0, 532000000),
F_GFX(370000000, 0, 2, 0, 0, 740000000),
F_GFX(465000000, 0, 2, 0, 0, 930000000),
F_GFX(588000000, 0, 2, 0, 0, 1176000000),
F_GFX(647000000, 0, 2, 0, 0, 1294000000),
F_GFX(750000000, 0, 2, 0, 0, 1500000000),
{ }
};
static struct clk_rcg2 gfx3d_clk_src = {
.cmd_rcgr = 0x1070,
.mnd_width = 0,
.hid_width = 5,
.freq_tbl = ftbl_gfx3d_clk_src,
.parent_map = gpucc_parent_map_1,
.flags = FORCE_ENABLE_RCGR,
.clkr.hw.init = &gpu_clks_init[0],
};
static const struct freq_tbl ftbl_rbbmtimer_clk_src[] = {
F(19200000, P_XO, 1, 0, 0),
{ }
};
static struct clk_rcg2 rbbmtimer_clk_src = {
.cmd_rcgr = 0x10b0,
.mnd_width = 0,
.hid_width = 5,
.parent_map = gpucc_parent_map_0,
.freq_tbl = ftbl_rbbmtimer_clk_src,
.clkr.hw.init = &(struct clk_init_data){
.name = "rbbmtimer_clk_src",
.parent_names = gpucc_parent_names_0,
.num_parents = 4,
.ops = &clk_rcg2_ops,
VDD_DIG_FMAX_MAP1(MIN, 19200000),
},
};
static const struct freq_tbl ftbl_rbcpr_clk_src[] = {
F(19200000, P_XO, 1, 0, 0),
F(50000000, P_GPLL0_OUT_MAIN_DIV, 6, 0, 0),
{ }
};
static struct clk_rcg2 rbcpr_clk_src = {
.cmd_rcgr = 0x1030,
.mnd_width = 0,
.hid_width = 5,
.parent_map = gpucc_parent_map_0,
.freq_tbl = ftbl_rbcpr_clk_src,
.clkr.hw.init = &(struct clk_init_data){
.name = "rbcpr_clk_src",
.parent_names = gpucc_parent_names_0,
.num_parents = 4,
.ops = &clk_rcg2_ops,
VDD_DIG_FMAX_MAP2(
MIN, 19200000,
NOMINAL, 50000000),
},
};
static struct clk_branch gpucc_cxo_clk = {
.halt_reg = 0x1020,
.halt_check = BRANCH_HALT,
.clkr = {
.enable_reg = 0x1020,
.enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){
.name = "gpucc_cxo_clk",
.parent_names = (const char *[]) {
"cxo_a",
},
.num_parents = 1,
.ops = &clk_branch2_ops,
},
},
};
static struct clk_branch gpucc_gfx3d_clk = {
.halt_reg = 0x1098,
.halt_check = BRANCH_HALT,
.clkr = {
.enable_reg = 0x1098,
.enable_mask = BIT(0),
.hw.init = &gpu_clks_init[1],
},
};
static struct clk_branch gpucc_rbbmtimer_clk = {
.halt_reg = 0x10d0,
.halt_check = BRANCH_HALT,
.clkr = {
.enable_reg = 0x10d0,
.enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){
.name = "gpucc_rbbmtimer_clk",
.parent_names = (const char *[]){
"rbbmtimer_clk_src",
},
.num_parents = 1,
.flags = CLK_SET_RATE_PARENT,
.ops = &clk_branch2_ops,
},
},
};
static struct clk_branch gpucc_rbcpr_clk = {
.halt_reg = 0x1054,
.halt_check = BRANCH_HALT,
.clkr = {
.enable_reg = 0x1054,
.enable_mask = BIT(0),
.hw.init = &(struct clk_init_data){
.name = "gpucc_rbcpr_clk",
.parent_names = (const char *[]){
"rbcpr_clk_src",
},
.num_parents = 1,
.flags = CLK_SET_RATE_PARENT,
.ops = &clk_branch2_ops,
},
},
};
static struct clk_regmap *gpucc_falcon_clocks[] = {
[GFX3D_CLK_SRC] = &gfx3d_clk_src.clkr,
[GPU_PLL0_PLL] = &gpu_pll0_pll_out_main.clkr,
[GPU_PLL1_PLL] = &gpu_pll1_pll_out_main.clkr,
[GPUCC_CXO_CLK] = &gpucc_cxo_clk.clkr,
[GPUCC_GFX3D_CLK] = &gpucc_gfx3d_clk.clkr,
[GPUCC_RBBMTIMER_CLK] = &gpucc_rbbmtimer_clk.clkr,
[GPUCC_RBCPR_CLK] = &gpucc_rbcpr_clk.clkr,
[RBBMTIMER_CLK_SRC] = &rbbmtimer_clk_src.clkr,
[RBCPR_CLK_SRC] = &rbcpr_clk_src.clkr,
};
static const struct regmap_config gpucc_falcon_regmap_config = {
.reg_bits = 32,
.reg_stride = 4,
.val_bits = 32,
.max_register = 0x9034,
.fast_io = true,
};
static const struct qcom_cc_desc gpucc_falcon_desc = {
.config = &gpucc_falcon_regmap_config,
.clks = gpucc_falcon_clocks,
.num_clks = ARRAY_SIZE(gpucc_falcon_clocks),
};
static const struct of_device_id gpucc_falcon_match_table[] = {
{ .compatible = "qcom,gpucc-msmfalcon" },
{ }
};
MODULE_DEVICE_TABLE(of, gpucc_falcon_match_table);
static int of_get_fmax_vdd_class(struct platform_device *pdev,
struct clk_hw *hw, char *prop_name, u32 index)
{
struct device_node *of = pdev->dev.of_node;
int prop_len, i, j;
struct clk_vdd_class *vdd = hw->init->vdd_class;
int num = vdd->num_regulators + 1;
u32 *array;
if (!of_find_property(of, prop_name, &prop_len)) {
dev_err(&pdev->dev, "missing %s\n", prop_name);
return -EINVAL;
}
prop_len /= sizeof(u32);
if (prop_len % num) {
dev_err(&pdev->dev, "bad length %d\n", prop_len);
return -EINVAL;
}
prop_len /= num;
vdd->level_votes = devm_kzalloc(&pdev->dev, prop_len * sizeof(int),
GFP_KERNEL);
if (!vdd->level_votes)
return -ENOMEM;
vdd->vdd_uv = devm_kzalloc(&pdev->dev,
prop_len * sizeof(int) * (num - 1), GFP_KERNEL);
if (!vdd->vdd_uv)
return -ENOMEM;
gpu_clks_init[index].fmax = devm_kzalloc(&pdev->dev, prop_len *
sizeof(unsigned long), GFP_KERNEL);
if (!gpu_clks_init[index].fmax)
return -ENOMEM;
array = devm_kzalloc(&pdev->dev, prop_len * sizeof(u32) * num,
GFP_KERNEL);
if (!array)
return -ENOMEM;
of_property_read_u32_array(of, prop_name, array, prop_len * num);
for (i = 0; i < prop_len; i++) {
gpu_clks_init[index].fmax[i] = array[num * i];
for (j = 1; j < num; j++) {
vdd->vdd_uv[(num - 1) * i + (j - 1)] =
array[num * i + j];
}
}
devm_kfree(&pdev->dev, array);
vdd->num_levels = prop_len;
vdd->cur_level = prop_len;
gpu_clks_init[index].num_fmax = prop_len;
return 0;
}
static int gpucc_falcon_probe(struct platform_device *pdev)
{
int ret = 0;
struct regmap *regmap;
regmap = qcom_cc_map(pdev, &gpucc_falcon_desc);
if (IS_ERR(regmap))
return PTR_ERR(regmap);
/* CX Regulator for RBBMTimer and RBCPR clock */
vdd_dig.regulator[0] = devm_regulator_get(&pdev->dev, "vdd_dig_gfx");
if (IS_ERR(vdd_dig.regulator[0])) {
if (!(PTR_ERR(vdd_dig.regulator[0]) == -EPROBE_DEFER))
dev_err(&pdev->dev,
"Unable to get vdd_dig regulator\n");
return PTR_ERR(vdd_dig.regulator[0]);
}
/* Mx Regulator for GPU-PLLs */
vdd_mx.regulator[0] = devm_regulator_get(&pdev->dev, "vdd_mx_gfx");
if (IS_ERR(vdd_mx.regulator[0])) {
if (!(PTR_ERR(vdd_mx.regulator[0]) == -EPROBE_DEFER))
dev_err(&pdev->dev,
"Unable to get vdd_mx regulator\n");
return PTR_ERR(vdd_mx.regulator[0]);
}
/* GFX Rail Regulator for GFX3D clock */
vdd_gfx.regulator[0] = devm_regulator_get(&pdev->dev, "vdd_gfx");
if (IS_ERR(vdd_gfx.regulator[0])) {
if (!(PTR_ERR(vdd_gfx.regulator[0]) == -EPROBE_DEFER))
dev_err(&pdev->dev,
"Unable to get vdd_gfx regulator\n");
return PTR_ERR(vdd_gfx.regulator[0]);
}
/* GFX rail fmax data linked to branch clock */
of_get_fmax_vdd_class(pdev, &gpucc_gfx3d_clk.clkr.hw,
"qcom,gfxfreq-corner", 1);
clk_alpha_pll_configure(&gpu_pll0_pll_out_main, regmap,
&gpu_pll0_config);
clk_alpha_pll_configure(&gpu_pll1_pll_out_main, regmap,
&gpu_pll0_config);
ret = qcom_cc_really_probe(pdev, &gpucc_falcon_desc, regmap);
if (ret) {
dev_err(&pdev->dev, "Failed to register GPUCC clocks\n");
return ret;
}
clk_prepare_enable(gpucc_cxo_clk.clkr.hw.clk);
dev_info(&pdev->dev, "Registered GPUCC clocks\n");
return ret;
}
static struct platform_driver gpucc_falcon_driver = {
.probe = gpucc_falcon_probe,
.driver = {
.name = "gpucc-msmfalcon",
.of_match_table = gpucc_falcon_match_table,
},
};
static int __init gpucc_falcon_init(void)
{
return platform_driver_register(&gpucc_falcon_driver);
}
core_initcall_sync(gpucc_falcon_init);
static void __exit gpucc_falcon_exit(void)
{
platform_driver_unregister(&gpucc_falcon_driver);
}
module_exit(gpucc_falcon_exit);

View file

@ -14,27 +14,32 @@
#ifndef _DT_BINDINGS_CLK_MSM_GPU_FALCON_H
#define _DT_BINDINGS_CLK_MSM_GPU_FALCON_H
#define GFX3D_CLK_SRC 0
#define GPU_PLL0_PLL 1
#define GPU_PLL0_PLL_OUT_AUX 2
#define GPU_PLL0_PLL_OUT_AUX2 3
#define GPU_PLL0_PLL_OUT_EARLY 4
#define GPU_PLL0_PLL_OUT_MAIN 5
#define GPU_PLL0_PLL_OUT_TEST 6
#define GPU_PLL1_PLL 7
#define GPU_PLL1_PLL_OUT_AUX 8
#define GPU_PLL1_PLL_OUT_AUX2 9
#define GPU_PLL1_PLL_OUT_EARLY 10
#define GPU_PLL1_PLL_OUT_MAIN 11
#define GPU_PLL1_PLL_OUT_TEST 12
#define GPUCC_CXO_CLK 13
#define GPUCC_GFX3D_CLK 14
#define GPUCC_RBBMTIMER_CLK 15
#define GPUCC_RBCPR_CLK 16
#define RBBMTIMER_CLK_SRC 18
#define RBCPR_CLK_SRC 19
#define GFX3D_CLK_SRC 0
#define GPU_PLL0_PLL 1
#define GPU_PLL0_PLL_OUT_AUX 2
#define GPU_PLL0_PLL_OUT_AUX2 3
#define GPU_PLL0_PLL_OUT_EARLY 4
#define GPU_PLL0_PLL_OUT_MAIN 5
#define GPU_PLL0_PLL_OUT_TEST 6
#define GPU_PLL1_PLL 7
#define GPU_PLL1_PLL_OUT_AUX 8
#define GPU_PLL1_PLL_OUT_AUX2 9
#define GPU_PLL1_PLL_OUT_EARLY 10
#define GPU_PLL1_PLL_OUT_MAIN 11
#define GPU_PLL1_PLL_OUT_TEST 12
#define GPUCC_CXO_CLK 13
#define GPUCC_GFX3D_CLK 14
#define GPUCC_RBBMTIMER_CLK 15
#define GPUCC_RBCPR_CLK 16
#define RBBMTIMER_CLK_SRC 17
#define RBCPR_CLK_SRC 18
#define GPU_CX_GDSC 0
#define GPU_GX_GDSC 1
#define GPU_CX_GDSC 0
#define GPU_GX_GDSC 1
#define GPUCC_GPU_CX_BCR 0
#define GPUCC_GPU_GX_BCR 1
#define GPUCC_RBCPR_BCR 2
#define GPUCC_SPDM_BCR 3
#endif