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

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

Merge "ARM: dts: msm: Enable clock_a7 as the driver for mdmfermium cpu clocks"

parents e8c24ebf 6897967b

Documentation/devicetree/bindings/arm/msm/acpuclock/clock-a7.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
- compatible: "qcom,clock-a7-8226", "qcom,clock-a7-9630",

- compatible: "qcom,clock-a7-8226", "qcom,clock-a7-9630",

		"qcom,clock-a53-8916", "qcom,clock-a7-vpipa",

		"qcom,clock-a53-8916", "qcom,clock-a7-vpipa",

		"qcom,clock-a7-9640", "qcom,clock-a7-californium"

		"qcom,clock-a7-9640", "qcom,clock-a7-californium"

		"qcom,clock-a7-9640", "qcom,clock-a7-mdmfermium"

- reg: pairs of physical address and region size

- reg: pairs of physical address and region size

- reg-names: "rcg-base" is expected

- reg-names: "rcg-base" is expected

- clock-names: list of names of clock inputs

- clock-names: list of names of clock inputs

arch/arm/boot/dts/qcom/mdmfermium.dtsi

+40 −4
Original line number Original line Diff line number Diff line
@@ -237,19 +237,55 @@ 




	clock_gcc: qcom,gcc@1800000 {

	clock_gcc: qcom,gcc@1800000 {

		compatible = "qcom,gcc-mdmfermium";

		compatible = "qcom,gcc-mdmfermium";

		reg = <0x1800000 0x80000>;

		reg = <0x1800000 0x80000>,

		reg-names = "cc_base";

			<0x0b008000 0x00050>;

		reg-names = "cc_base", "apcs_base";

		vdd_dig-supply = <&mdmfermium_s3_level>;

		vdd_dig-supply = <&mdmfermium_s3_level>;

		vdd_stromer_dig-supply = <&mdmfermium_s3_level_ao>;

		#clock-cells = <1>;

		#clock-cells = <1>;

	};

	};





	clock_debug: qcom,debug@1874000 {

	clock_debug: qcom,debug@1874000 {

		compatible = "qcom,cc-debug-mdmfermium";

		compatible = "qcom,cc-debug-mdmfermium";

		reg = <0x1800000 0x80000>;

		reg = <0x1800000 0x80000>,

		reg-names = "cc_base";

			<0xb01101c 0x8>;

		reg-names = "cc_base", "meas";

		#clock-cells = <1>;

		#clock-cells = <1>;

	};

	};





	clock_cpu: qcom,clock-a7@0b010008 {

		compatible = "qcom,clock-a7-mdmfermium";

		reg = <0x0b010008 0x8>,

				<0x000a412c 0x8>;

		reg-names = "rcg-base", "efuse";

		qcom,safe-freq = < 400000000 >;

		/* ToDo: update mdmfermium_s1 to apc_vreg_corner */

		cpu-vdd-supply = <&mdmfermium_s1>;

		qcom,enable-opp;

		clocks = <&clock_gcc clk_gpll0_ao_clk_src>,

					<&clock_gcc clk_a7sspll>;

		clock-names = "clk-1", "clk-5";

		qcom,speed0-bin-v0 =

				<          0 0>,

				<  400000000 4>,

				<  800000000 5>,

				< 1190400000 7>;

		#clock-cells = <1>;

	};



	qcom,msm-cpufreq {

		reg = <0 4>;

		compatible = "qcom,msm-cpufreq";

		clocks = <&clock_cpu  clk_a7ssmux>;

		clock-names = "cpu0_clk";

		qcom,cpufreq-table =

				<  400000 >,

				<  800000 >,

				<  998400 >,

				< 1094400 >,

				< 1190400 >;

	};



	qcom,sps {

	qcom,sps {

		compatible = "qcom,msm_sps_4k";

		compatible = "qcom,msm_sps_4k";

		qcom,pipe-attr-ee;

		qcom,pipe-attr-ee;

drivers/clk/msm/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ obj-$(CONFIG_ARCH_MDMFERMIUM) +=clock-gcc-mdmfermium.o 
# ACPU clock

# ACPU clock

obj-$(CONFIG_ARCH_MDM9640)      += clock-a7.o

obj-$(CONFIG_ARCH_MDM9640)      += clock-a7.o

obj-$(CONFIG_ARCH_MDMCALIFORNIUM)	+= clock-a7.o

obj-$(CONFIG_ARCH_MDMCALIFORNIUM)	+= clock-a7.o

obj-$(CONFIG_ARCH_MDMFERMIUM)	+= clock-a7.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-a7.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-a7.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-cpu-8939.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-cpu-8939.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-gcc-8952.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-gcc-8952.o

drivers/clk/msm/clock-a7.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -471,6 +471,7 @@ static struct of_device_id clock_a7_match_table[] = { 
	{.compatible = "qcom,clock-a7-9640"},

	{.compatible = "qcom,clock-a7-9640"},

	{.compatible = "qcom,clock-a53-8916"},

	{.compatible = "qcom,clock-a53-8916"},

	{.compatible = "qcom,clock-a7-californium"},

	{.compatible = "qcom,clock-a7-californium"},

	{.compatible = "qcom,clock-a7-mdmfermium"},

	{}

	{}

};

};

drivers/clk/msm/clock-gcc-mdmfermium.c

+213 −1
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ 
enum {

enum {

	GCC_BASE,

	GCC_BASE,

	DEBUG_BASE,

	DEBUG_BASE,

	APCS_PLL_BASE,

	N_BASES,

	N_BASES,

};

};
@@ -72,21 +73,88 @@ static DEFINE_CLK_BRANCH_VOTER(xo_lpm_clk, &xo_clk_src.c); 
static DEFINE_CLK_BRANCH_VOTER(xo_otg_clk, &xo_clk_src.c);

static DEFINE_CLK_BRANCH_VOTER(xo_otg_clk, &xo_clk_src.c);

static DEFINE_CLK_BRANCH_VOTER(xo_pil_mss_clk, &xo_clk_src.c);

static DEFINE_CLK_BRANCH_VOTER(xo_pil_mss_clk, &xo_clk_src.c);





#define F_APCS_STROMER_PLL(f, l, m, pre_div, post_div, vco) \

	{ \

		.freq_hz = (f), \

		.l_val = (l), \

		.a_val = (m), \

		.pre_div_val = BVAL(14, 12, (pre_div)), \

		.post_div_val = BVAL(11, 8, (post_div)), \

		.vco_val = BVAL(21, 20, (vco)), \

	}



static DEFINE_VDD_REGULATORS(vdd_stromer_pll, VDD_DIG_NUM, 1, vdd_corner, NULL);



static struct alpha_pll_masks pll_masks_p = {

	.lock_mask = BIT(31),

	.active_mask = BIT(30),

	.vco_mask = BM(21, 20) >> 20,

	.vco_shift = 20,

	.alpha_en_mask = BIT(24),

	.output_mask = 0xf,

	.update_mask = BIT(22),

	.post_div_mask = BM(11, 8),

};



static struct alpha_pll_vco_tbl p_vco[] = {

	VCO(0,  700000000, 1400000000),

};



static struct alpha_pll_clk a7sspll = {

	.masks = &pll_masks_p,

	.vco_tbl = p_vco,

	.num_vco = ARRAY_SIZE(p_vco),

	.base = &virt_bases[APCS_PLL_BASE],

	.offset = APCS_MODE,

	.slew = true,

	.enable_config = 1,

	.post_div_config = 0,

	.c = {

		.parent = &xo_a_clk_src.c,

		.dbg_name = "a7sspll",

		.ops = &clk_ops_dyna_alpha_pll,

		VDD_STROMER_FMAX_MAP3(LOWER, 400000000, NOMINAL, 800000000,

					HIGH, 1200000000),

		CLK_INIT(a7sspll.c),

	},

};



static unsigned int soft_vote_gpll0;



static struct pll_vote_clk gpll0_clk_src = {

static struct pll_vote_clk gpll0_clk_src = {

	.en_reg = (void __iomem *)APCS_GPLL_ENA_VOTE,

	.en_reg = (void __iomem *)APCS_GPLL_ENA_VOTE,

	.en_mask = BIT(0),

	.en_mask = BIT(0),

	.status_reg = (void __iomem *)GPLL0_MODE,

	.status_reg = (void __iomem *)GPLL0_MODE,

	.status_mask = BIT(30),

	.status_mask = BIT(30),

	.base = &virt_bases[GCC_BASE],

	.base = &virt_bases[GCC_BASE],

	.soft_vote = &soft_vote_gpll0,

	.soft_vote_mask = PLL_SOFT_VOTE_PRIMARY,

	.c = {

	.c = {

		.parent = &xo_clk_src.c,

		.parent = &xo_clk_src.c,

		.rate = 800000000,

		.rate = 800000000,

		.dbg_name = "gpll0_clk_src",

		.dbg_name = "gpll0_clk_src",

		.ops = &clk_ops_pll_vote,

		.ops = &clk_ops_pll_acpu_vote,

		CLK_INIT(gpll0_clk_src.c),

		CLK_INIT(gpll0_clk_src.c),

	},

	},

};

};





static struct pll_vote_clk gpll0_ao_clk_src = {

	.en_reg = (void __iomem *)APCS_GPLL_ENA_VOTE,

	.en_mask = BIT(0),

	.status_reg = (void __iomem *)GPLL0_MODE,

	.status_mask = BIT(30),

	.soft_vote = &soft_vote_gpll0,

	.soft_vote_mask = PLL_SOFT_VOTE_ACPU,

	.base = &virt_bases[GCC_BASE],

	.c = {

		.parent = &xo_clk_src.c,

		.rate = 800000000,

		.dbg_name = "gpll0_ao_clk_src",

		.ops = &clk_ops_pll_acpu_vote,

		CLK_INIT(gpll0_ao_clk_src.c),

	},

};



static struct pll_vote_clk gpll2_clk_src = {

static struct pll_vote_clk gpll2_clk_src = {

	.en_reg = (void __iomem *)APCS_GPLL_ENA_VOTE,

	.en_reg = (void __iomem *)APCS_GPLL_ENA_VOTE,

	.en_mask = BIT(3),

	.en_mask = BIT(3),
@@ -1403,6 +1471,103 @@ static struct reset_clk gcc_qusb2_phy_clk = { 
	},

	},

};

};





static struct measure_clk apc0_m_clk = {

	.c = {

		.ops = &clk_ops_empty,

		.dbg_name = "apc0_m_clk",

		CLK_INIT(apc0_m_clk.c),

	},

};



static struct measure_clk apc1_m_clk = {

	.c = {

		.ops = &clk_ops_empty,

		.dbg_name = "apc1_m_clk",

		CLK_INIT(apc1_m_clk.c),

	},

};



static struct measure_clk apc2_m_clk = {

	.c = {

		.ops = &clk_ops_empty,

		.dbg_name = "apc2_m_clk",

		CLK_INIT(apc2_m_clk.c),

	},

};



static struct measure_clk apc3_m_clk = {

	.c = {

		.ops = &clk_ops_empty,

		.dbg_name = "apc3_m_clk",

		CLK_INIT(apc3_m_clk.c),

	},

};



static struct measure_clk l2_m_clk = {

	.c = {

		.ops = &clk_ops_empty,

		.dbg_name = "l2_m_clk",

		CLK_INIT(l2_m_clk.c),

	},

};



static void __iomem *meas_base;



static struct mux_clk apss_debug_ter_mux = {

	.ops = &mux_reg_ops,

	.mask = 0x3,

	.shift = 8,

	MUX_SRC_LIST(

		{&apc0_m_clk.c, 0},

		{&apc1_m_clk.c, 1},

		{&apc2_m_clk.c, 2},

		{&apc3_m_clk.c, 3},

	),

	.base = &meas_base,

	.c = {

		.dbg_name = "apss_debug_ter_mux",

		.ops = &clk_ops_gen_mux,

		CLK_INIT(apss_debug_ter_mux.c),

	},

};



static struct mux_clk apss_debug_sec_mux = {

	.ops = &mux_reg_ops,

	.mask = 0x7,

	.shift = 12,

	MUX_SRC_LIST(

		{&apss_debug_ter_mux.c, 0},

		{&l2_m_clk.c, 1},

	),

	MUX_REC_SRC_LIST(

		&apss_debug_ter_mux.c,

	),

	.base = &meas_base,

	.c = {

		.dbg_name = "apss_debug_sec_mux",

		.ops = &clk_ops_gen_mux,

		CLK_INIT(apss_debug_sec_mux.c),

	},

};



static struct mux_clk apss_debug_pri_mux = {

	.ops = &mux_reg_ops,

	.mask = 0x3,

	.shift = 16,

	MUX_SRC_LIST(

		{&apss_debug_sec_mux.c, 0},

	),

	MUX_REC_SRC_LIST(

		&apss_debug_sec_mux.c,

	),

	.base = &meas_base,

	.c = {

		.dbg_name = "apss_debug_pri_mux",

		.ops = &clk_ops_gen_mux,

		CLK_INIT(apss_debug_pri_mux.c),

	},

};



static struct clk_ops clk_ops_debug_mux;

static struct clk_ops clk_ops_debug_mux;





static struct measure_clk_data debug_mux_priv = {

static struct measure_clk_data debug_mux_priv = {
@@ -1491,8 +1656,11 @@ static struct mux_clk gcc_debug_mux = { 
/* Clock lookup */

/* Clock lookup */

static struct clk_lookup msm_clocks_lookup[] = {

static struct clk_lookup msm_clocks_lookup[] = {

	 CLK_LIST(gpll0_clk_src),

	 CLK_LIST(gpll0_clk_src),

	 CLK_LIST(gpll0_ao_clk_src),

	 CLK_LIST(gpll2_clk_src),

	 CLK_LIST(gpll2_clk_src),

	 CLK_LIST(gpll1_clk_src),

	 CLK_LIST(gpll1_clk_src),

	 CLK_LIST(a7sspll),



	 CLK_LIST(pcnoc_clk),

	 CLK_LIST(pcnoc_clk),

	 CLK_LIST(pcnoc_a_clk),

	 CLK_LIST(pcnoc_a_clk),

	 CLK_LIST(pcnoc_msmbus_clk),

	 CLK_LIST(pcnoc_msmbus_clk),
@@ -1631,6 +1799,19 @@ static int msm_gcc_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "apcs_base");

	if (!res) {

		dev_err(&pdev->dev, "APCS PLL Register base not defined\n");

		return -ENOMEM;

	}



	virt_bases[APCS_PLL_BASE] = devm_ioremap(&pdev->dev, res->start,

							resource_size(res));

	if (!virt_bases[APCS_PLL_BASE]) {

		dev_err(&pdev->dev, "Failed to ioremap APCS PLL registers\n");

		return -ENOMEM;

	}



	vdd_dig.regulator[0] = devm_regulator_get(&pdev->dev, "vdd_dig");

	vdd_dig.regulator[0] = devm_regulator_get(&pdev->dev, "vdd_dig");

	if (IS_ERR(vdd_dig.regulator[0])) {

	if (IS_ERR(vdd_dig.regulator[0])) {

		if (!(PTR_ERR(vdd_dig.regulator[0]) == -EPROBE_DEFER))

		if (!(PTR_ERR(vdd_dig.regulator[0]) == -EPROBE_DEFER))
@@ -1639,6 +1820,15 @@ static int msm_gcc_probe(struct platform_device *pdev) 
		return PTR_ERR(vdd_dig.regulator[0]);

		return PTR_ERR(vdd_dig.regulator[0]);

	}

	}





	vdd_stromer_pll.regulator[0] = devm_regulator_get(&pdev->dev,

							"vdd_stromer_dig");

	if (IS_ERR(vdd_stromer_pll.regulator[0])) {

		if (!(PTR_ERR(vdd_stromer_pll.regulator[0]) == -EPROBE_DEFER))

			dev_err(&pdev->dev,

				"Unable to get vdd_stromer_dig regulator!!!\n");

		return PTR_ERR(vdd_stromer_pll.regulator[0]);

	}



	 /*Vote for GPLL0 to turn on. Needed by acpuclock. */

	 /*Vote for GPLL0 to turn on. Needed by acpuclock. */

	regval = readl_relaxed(GCC_REG_BASE(APCS_GPLL_ENA_VOTE));

	regval = readl_relaxed(GCC_REG_BASE(APCS_GPLL_ENA_VOTE));

	regval |= BIT(0);

	regval |= BIT(0);
@@ -1650,6 +1840,10 @@ static int msm_gcc_probe(struct platform_device *pdev) 
	if (ret)

	if (ret)

		return ret;

		return ret;





	ret = enable_rpm_scaling();

	if (ret)

		return ret;



	clk_set_rate(&apss_ahb_clk_src.c, 19200000);

	clk_set_rate(&apss_ahb_clk_src.c, 19200000);

	clk_prepare_enable(&apss_ahb_clk_src.c);

	clk_prepare_enable(&apss_ahb_clk_src.c);

	/*

	/*
@@ -1688,6 +1882,12 @@ arch_initcall(msm_gcc_init); 




static struct clk_lookup msm_clocks_measure[] = {

static struct clk_lookup msm_clocks_measure[] = {

	CLK_LOOKUP_OF("measure", gcc_debug_mux, "debug"),

	CLK_LOOKUP_OF("measure", gcc_debug_mux, "debug"),

	CLK_LIST(apss_debug_pri_mux),

	CLK_LIST(apc0_m_clk),

	CLK_LIST(apc1_m_clk),

	CLK_LIST(apc2_m_clk),

	CLK_LIST(apc3_m_clk),

	CLK_LIST(l2_m_clk),

};

};





static int msm_clock_debug_probe(struct platform_device *pdev)

static int msm_clock_debug_probe(struct platform_device *pdev)
@@ -1711,6 +1911,18 @@ static int msm_clock_debug_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "meas");

	if (!res) {

		dev_err(&pdev->dev, "GLB clock diag base not defined.\n");

		return -EINVAL;

	}



	meas_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));

	if (!meas_base) {

		dev_err(&pdev->dev, "Unable to map GLB clock diag base.\n");

		return -ENOMEM;

	}



	ret =  of_msm_clock_register(pdev->dev.of_node, msm_clocks_measure,

	ret =  of_msm_clock_register(pdev->dev.of_node, msm_clocks_measure,

					ARRAY_SIZE(msm_clocks_measure));

					ARRAY_SIZE(msm_clocks_measure));

	if (ret) {

	if (ret) {