Merge "clk: msm: clock-gcc-9650: Add support to use Max uV for GCC clocks" (3b757581) · Commits · e / devices / android_kernel_xiaomi_markw

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

+5 −12

Original line number	Diff line number	Diff line
		@@ -96,15 +96,6 @@ static void __iomem *virt_apcsbase;
		\| BVAL(10, 8, s##_source_val), \
		}

		static int vdd_corner_sdx20[] = {
		RPM_REGULATOR_LEVEL_NONE, /* VDD_DIG_NONE */
		RPM_REGULATOR_LEVEL_MIN_SVS, /* VDD_DIG_MIN */
		RPM_REGULATOR_LEVEL_LOW_SVS, /* VDD_DIG_LOWER */
		RPM_REGULATOR_LEVEL_SVS, /* VDD_DIG_LOW */
		RPM_REGULATOR_LEVEL_NOM, /* VDD_DIG_NOMINAL */
		RPM_REGULATOR_LEVEL_TURBO, /* VDD_DIG_HIGH */
		};

		static DEFINE_VDD_REGULATORS(vdd_dig, VDD_DIG_NUM, 1, vdd_corner, NULL);
		static DEFINE_VDD_REGULATORS(vdd_dig_ao, VDD_DIG_NUM, 1, vdd_corner, NULL);

		@@ -1675,9 +1666,6 @@ static void msm_clocks_gcc_sdx20_fixup(void)
		usb30_mock_utmi_clk_src.freq_tbl =
		ftbl_usb30_mock_utmi_clk_src_sdx20;

		vdd_dig.vdd_uv = vdd_corner_sdx20;
		vdd_dig_ao.vdd_uv = vdd_corner_sdx20;

		sdcc1_apps_clk_src.c.fmax[VDD_DIG_MIN] = 25000000;
		sdcc1_apps_clk_src.c.fmax[VDD_DIG_LOWER] = 50000000;
		sdcc1_apps_clk_src.c.fmax[VDD_DIG_LOW] = 1000000000;
		@@ -1746,6 +1734,11 @@ static int msm_gcc_9650_probe(struct platform_device *pdev)
		if (ret)
		return ret;

		if (of_device_is_compatible(pdev->dev.of_node, "qcom,gcc-9650")) {
		vdd_dig.use_max_uV = true;
		vdd_dig_ao.use_max_uV = true;
		}

		for_sdx20 = of_device_is_compatible(pdev->dev.of_node,
		"qcom,gcc-sdx20");

+1 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ static int vdd_corner[] = {
		RPM_REGULATOR_LEVEL_LOW_SVS, /* VDD_DIG_LOWER */
		RPM_REGULATOR_LEVEL_SVS, /* VDD_DIG_LOW */
		RPM_REGULATOR_LEVEL_NOM, /* VDD_DIG_NOMINAL */
		RPM_REGULATOR_LEVEL_TURBO_NO_CPR, /* VDD_DIG_HIGH */
		RPM_REGULATOR_LEVEL_TURBO, /* VDD_DIG_HIGH */
		};

		#endif