From ccdfa0f245814b5b848ef69b075ea921d090e2f1 Mon Sep 17 00:00:00 2001 From: Devesh Jhunjhunwala Date: Thu, 10 Mar 2016 14:54:26 -0800 Subject: [PATCH] clk: msm: cobalt: Update the vdd-level-cobalt header file Rename the vdd-level header file included from vdd-level-californium to vdd-level-cobalt, which is the correct name. Also update the header file to include the FMAX mappings needed for the cobalt GPUCC driver. Signed-off-by: Devesh Jhunjhunwala --- drivers/clk/msm/clock-gpu-cobalt.c | 2 +- drivers/clk/msm/clock-mmss-cobalt.c | 2 +- drivers/clk/msm/vdd-level-cobalt.h | 22 +++++++++++++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/clk/msm/clock-gpu-cobalt.c b/drivers/clk/msm/clock-gpu-cobalt.c index c98943e5ff37..c74ea4efb64c 100644 --- a/drivers/clk/msm/clock-gpu-cobalt.c +++ b/drivers/clk/msm/clock-gpu-cobalt.c @@ -30,7 +30,7 @@ #include #include -#include "vdd-level-californium.h" +#include "vdd-level-cobalt.h" static void __iomem *virt_base; diff --git a/drivers/clk/msm/clock-mmss-cobalt.c b/drivers/clk/msm/clock-mmss-cobalt.c index e6fac6e550f4..11f909fa008f 100644 --- a/drivers/clk/msm/clock-mmss-cobalt.c +++ b/drivers/clk/msm/clock-mmss-cobalt.c @@ -29,7 +29,7 @@ #include #include -#include "vdd-level-californium.h" +#include "vdd-level-cobalt.h" static void __iomem *virt_base; diff --git a/drivers/clk/msm/vdd-level-cobalt.h b/drivers/clk/msm/vdd-level-cobalt.h index 1413f63da341..e9c3e0adec6b 100644 --- a/drivers/clk/msm/vdd-level-cobalt.h +++ b/drivers/clk/msm/vdd-level-cobalt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2015-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 @@ -31,6 +31,7 @@ [VDD_DIG_##l2] = (f2), \ }, \ .num_fmax = VDD_DIG_NUM + #define VDD_DIG_FMAX_MAP3(l1, f1, l2, f2, l3, f3) \ .vdd_class = &vdd_dig, \ .fmax = (unsigned long[VDD_DIG_NUM]) { \ @@ -57,8 +58,26 @@ }, \ .num_fmax = VDD_DIG_NUM +#define VDD_GPU_PLL_FMAX_MAP2(l1, f1, l2, f2) \ + .vdd_class = &vdd_gpucc_mx, \ + .fmax = (unsigned long[VDD_DIG_NUM]) { \ + [VDD_DIG_##l1] = (f1), \ + [VDD_DIG_##l2] = (f2), \ + }, \ + .num_fmax = VDD_DIG_NUM + +#define VDD_GPU_PLL_FMAX_MAP3(l1, f1, l2, f2, l3, f3) \ + .vdd_class = &vdd_gpucc_mx, \ + .fmax = (unsigned long[VDD_DIG_NUM]) { \ + [VDD_DIG_##l1] = (f1), \ + [VDD_DIG_##l2] = (f2), \ + [VDD_DIG_##l3] = (f3), \ + }, \ + .num_fmax = VDD_DIG_NUM + enum vdd_dig_levels { VDD_DIG_NONE, + VDD_DIG_MIN, /* MIN SVS */ VDD_DIG_LOWER, /* SVS2 */ VDD_DIG_LOW, /* SVS */ VDD_DIG_NOMINAL, /* NOM */ @@ -68,6 +87,7 @@ enum vdd_dig_levels { static int vdd_corner[] = { 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 */