evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clk: msm: cobalt: Update the vdd-level-cobalt header file

Browse source 
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 <deveshj@codeaurora.org>
This commit is contained in:
Devesh Jhunjhunwala 2016-03-10 14:54:26 -08:00 • committed by David Keitel
parent e1ef9e8d79
commit ccdfa0f245
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/clk/msm/clock-gpu-cobalt.c
View file

@ -30,7 +30,7 @@
#include <dt-bindings/clock/msm-clocks-cobalt.h>
#include <dt-bindings/clock/msm-clocks-hwio-cobalt.h>
#include "vdd-level-californium.h"
#include "vdd-level-cobalt.h"
static void __iomem *virt_base;

2
drivers/clk/msm/clock-mmss-cobalt.c
View file

@ -29,7 +29,7 @@
#include <dt-bindings/clock/msm-clocks-cobalt.h>
#include <dt-bindings/clock/msm-clocks-hwio-cobalt.h>
#include "vdd-level-californium.h"
#include "vdd-level-cobalt.h"
static void __iomem *virt_base;

22
drivers/clk/msm/vdd-level-cobalt.h
View file

@ -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 */