arm: tegra12: Enable CPU CVB support

- Add cl-dvfs platform data
- Add function call to get cpu clock switch cooling
  device trip points.

Bug 1563635

Change-Id: I07e0a9e8d170543906f91979fb35b98c02fe18cb
Signed-off-by: sreenivasulu velpula <svelpula@nvidia.com>
Reviewed-on: http://git-master/r/437195
(cherry picked from commit 55321cec6a72dd9b2e0ad6fb94ff2cc42937a14a)
Reviewed-on: http://git-master/r/559393
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Tested-by: Bibek Basu <bbasu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>

diff --git a/arch/arm/configs/tegra_vcm30t124_gnu_linux_defconfig b/arch/arm/configs/tegra_vcm30t124_gnu_linux_defconfig
index 4f8d5a5c261aa4031bf846639c111f3836c873e6..8594dd64c7cc2a7269aa4b609ad3668fae9db000 100644 (file)
--- a/arch/arm/configs/tegra_vcm30t124_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_vcm30t124_gnu_linux_defconfig
@@ -32,7 +32,7 @@ CONFIG_MACH_VCM30_T124=y
 CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
 # CONFIG_TEGRA_CORE_CAP is not set
 CONFIG_TEGRA_DYNAMIC_PWRDET=y
-CONFIG_TEGRA_USE_DFLL_RANGE=0
+CONFIG_TEGRA_USE_DFLL_RANGE=3
 CONFIG_TEGRA_PLLM_SCALED=y
 CONFIG_TEGRA_MC_DOMAINS=y
 # CONFIG_CACHE_L2X0 is not set

diff --git a/arch/arm/mach-tegra/board-common.c b/arch/arm/mach-tegra/board-common.c
index 3da8835e41b9ea1a6f03eabdb820c03a1311544d..e78430c365b649fa917fabb0597c643a05ef66d8 100644 (file)
--- a/arch/arm/mach-tegra/board-common.c
+++ b/arch/arm/mach-tegra/board-common.c
@@ -218,3 +218,10 @@ void tegra_add_core_vmax_trips(struct thermal_trip_info *trips, int *num_trips)
        tegra_add_trip_points(trips, num_trips,
                              tegra_dvfs_get_core_vmax_cdev());
 }
+
+void tegra_add_cpu_clk_switch_trips(struct thermal_trip_info *trips,
+                                                       int *num_trips)
+{
+       tegra_add_trip_points(trips, num_trips,
+                                tegra_dvfs_get_cpu_clk_switch_cdev());
+}

diff --git a/arch/arm/mach-tegra/board-common.h b/arch/arm/mach-tegra/board-common.h
index 682644ca826d12299783f6028844e55c9bedc460..d75c5bd00e12e65e704fcefaafa973be11e35b2a 100644 (file)
--- a/arch/arm/mach-tegra/board-common.h
+++ b/arch/arm/mach-tegra/board-common.h
@@ -1,7 +1,7 @@
 /*
  * board-common.h: Common function API declaration for all board files.
  *
- * Copyright (c) 2012-2013, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2012-2014, NVIDIA CORPORATION.  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 as published by
@@ -34,6 +34,9 @@ void tegra_add_core_vmin_trips(struct thermal_trip_info *trips, int *num_trips);
 void tegra_add_cpu_vmax_trips(struct thermal_trip_info *trips, int *num_trips);
 void tegra_add_core_edp_trips(struct thermal_trip_info *trips, int *num_trips);
 void tegra_add_tgpu_trips(struct thermal_trip_info *trips, int *num_trips);
+void tegra_add_cpu_clk_switch_trips(struct thermal_trip_info *trips,
+                                       int *num_trips);
+
 void tegra_add_vc_trips(struct thermal_trip_info *trips, int *num_trips);
 void tegra_add_core_vmax_trips(struct thermal_trip_info *trips, int *num_trips);
 

diff --git a/arch/arm/mach-tegra/board-vcm30_t124-power.c b/arch/arm/mach-tegra/board-vcm30_t124-power.c
index 3725ac172414368c19395f028efee24912f42768..d3f2934eae309398b2d9b5cf8b96b06fe07e7f19 100644 (file)
--- a/arch/arm/mach-tegra/board-vcm30_t124-power.c
+++ b/arch/arm/mach-tegra/board-vcm30_t124-power.c
@@ -175,6 +175,57 @@ static struct i2c_board_info __initdata max15569_vddcpu_boardinfo[] = {
        },
 };
 
+#ifdef CONFIG_ARCH_TEGRA_HAS_CL_DVFS
+/* board parameters for cpu dfll */
+static struct tegra_cl_dvfs_cfg_param vcm30_t124_cl_dvfs_param = {
+       .sample_rate = 12500,
+
+       .force_mode = TEGRA_CL_DVFS_FORCE_FIXED,
+       .cf = 10,
+       .ci = 0,
+       .cg = 2,
+
+       .droop_cut_value = 0xF,
+       .droop_restore_ramp = 0x0,
+       .scale_out_ramp = 0x0,
+};
+
+/* MAX15569: fixed 10mV steps from 600mV to 1400mV, with offset 0x0b */
+#define PMU_CPU_VDD_MAP_SIZE ((1400000 - 600000) / 10000 + 1)
+static struct voltage_reg_map pmu_cpu_vdd_map[PMU_CPU_VDD_MAP_SIZE];
+static inline void fill_reg_map(void)
+{
+       int i;
+       for (i = 0; i < PMU_CPU_VDD_MAP_SIZE; i++) {
+               pmu_cpu_vdd_map[i].reg_value = i + 0x0b;
+               pmu_cpu_vdd_map[i].reg_uV = 600000 + 10000 * i;
+       }
+}
+
+static struct tegra_cl_dvfs_platform_data vcm30_t124_cl_dvfs_data = {
+       .dfll_clk_name = "dfll_cpu",
+       .pmu_if = TEGRA_CL_DVFS_PMU_I2C,
+       .u.pmu_i2c = {
+               .fs_rate = 400000,
+               .slave_addr = 0x74,
+               .reg = 0x07,
+       },
+       .vdd_map = pmu_cpu_vdd_map,
+       .vdd_map_size = PMU_CPU_VDD_MAP_SIZE,
+       .flags = TEGRA_CL_DVFS_DYN_OUTPUT_CFG,
+       .cfg_param = &vcm30_t124_cl_dvfs_param,
+};
+
+static int __init vcm30_t124_cl_dvfs_init(void)
+{
+       fill_reg_map();
+       tegra_cl_dvfs_device.dev.platform_data = &vcm30_t124_cl_dvfs_data;
+       platform_device_register(&tegra_cl_dvfs_device);
+
+       return 0;
+}
+#endif
+
 /* MAX15569 switching regulator for vdd_gpu */
 static struct regulator_consumer_supply max15569_vddgpu_supply[] = {
        REGULATOR_SUPPLY("vdd_gpu", NULL),
@@ -213,6 +264,25 @@ static struct i2c_board_info __initdata max15569_vddgpu_boardinfo[] = {
 
 static int __init vcm30_t124_max77663_regulator_init(void)
 {
+       int sku_rev;
+       sku_rev = tegra_board_get_skurev("61859");
+
+       tegra_pmc_pmu_interrupt_polarity(true);
+
+#ifdef CONFIG_ARCH_TEGRA_HAS_CL_DVFS
+       vcm30_t124_cl_dvfs_init();
+#endif
+
+       /* C01 boards have tegra gpio for gpu_pwr_req and
+        *   boards before C01 have PMU gpio for gpu_pwr_req
+        */
+       if (sku_rev >= 300) {
+               max15569_vddgpu_pdata.ena_gpio = TEGRA_GPIO_PR2;
+       } else {
+               max77663_pdata.num_gpio_cfgs = ARRAY_SIZE(max77663_gpio_cfgs);
+               max77663_pdata.gpio_cfgs = max77663_gpio_cfgs;
+       }
+
        i2c_register_board_info(4, max77663_regulators,
                                ARRAY_SIZE(max77663_regulators));
 
@@ -355,7 +425,8 @@ int __init vcm30_t124_soctherm_init(void)
 
        vcm30_t124_soctherm_data.tshut_pmu_trip_data = &tpdata_max77663;
 
-       tegra_add_cpu_vmax_trips(vcm30_t124_soctherm_data.therm[THERM_CPU].trips,
+       tegra_add_cpu_clk_switch_trips(
+                       vcm30_t124_soctherm_data.therm[THERM_CPU].trips,
                        &vcm30_t124_soctherm_data.therm[THERM_CPU].num_trips);
        /*tegra_add_vc_trips(vcm30_t124_soctherm_data.therm[THERM_CPU].trips,
                        &vcm30_t124_soctherm_data.therm[THERM_CPU].num_trips);