A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "clk: qcom: define vdd_levels enum and vdd_corner[] map"

Browse source
This commit is contained in:
qctecmdr 2019-09-05 16:51:13 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1ee5b61154
3 changed files with 49 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/clk/qcom/clk-regmap-divider.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* Copyright (c) 2014, 2016-2019, The Linux Foundation. All rights reserved.
*/
#include <linux/kernel.h>
@ -35,8 +35,10 @@ static long div_round_rate(struct clk_hw *hw, unsigned long rate,
{
struct clk_regmap_div *divider = to_clk_regmap_div(hw);
return divider_round_rate(hw, rate, prate, NULL, divider->width,
CLK_DIVIDER_ROUND_CLOSEST);
return divider_round_rate(hw, rate, prate, divider->table,
divider->width,
CLK_DIVIDER_ROUND_CLOSEST |
divider->flags);
}
static int div_set_rate(struct clk_hw *hw, unsigned long rate,
@ -46,8 +48,9 @@ static int div_set_rate(struct clk_hw *hw, unsigned long rate,
struct clk_regmap *clkr = &divider->clkr;
u32 div;
div = divider_get_val(rate, parent_rate, NULL, divider->width,
CLK_DIVIDER_ROUND_CLOSEST);
div = divider_get_val(rate, parent_rate, divider->table,
divider->width, CLK_DIVIDER_ROUND_CLOSEST |
divider->flags);
return regmap_update_bits(clkr->regmap, divider->reg,
(BIT(divider->width) - 1) << divider->shift,
@ -65,8 +68,9 @@ static unsigned long div_recalc_rate(struct clk_hw *hw,
div >>= divider->shift;
div &= BIT(divider->width) - 1;
return divider_recalc_rate(hw, parent_rate, div, NULL,
CLK_DIVIDER_ROUND_CLOSEST, divider->width);
return divider_recalc_rate(hw, parent_rate, div, divider->table,
CLK_DIVIDER_ROUND_CLOSEST | divider->flags,
divider->width);
}
const struct clk_ops clk_regmap_div_ops = {

12
drivers/clk/qcom/clk-regmap-divider.h
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2014, The Linux Foundation. All rights reserved.
* Copyright (c) 2014, 2016-2019, The Linux Foundation. All rights reserved.
*/
#ifndef __QCOM_CLK_REGMAP_DIVIDER_H__
@ -10,10 +10,12 @@
#include "clk-regmap.h"
struct clk_regmap_div {
u32 reg;
u32 shift;
u32 width;
struct clk_regmap clkr;
u32 reg;
u32 shift;
u32 width;
u32 flags;
const struct clk_div_table *table;
struct clk_regmap clkr;
};
extern const struct clk_ops clk_regmap_div_ops;

31
drivers/clk/qcom/vdd-level.h Normal file
View file

@ -0,0 +1,31 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/* Copyright (c) 2019, The Linux Foundation. All rights reserved. */
#ifndef __DRIVERS_CLK_QCOM_VDD_LEVEL_H
#define __DRIVERS_CLK_QCOM_VDD_LEVEL_H
#include <linux/regulator/consumer.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
enum vdd_levels {
VDD_NONE,
VDD_MIN, /* MIN_SVS */
VDD_LOWER, /* LOW_SVS / SVS2 */
VDD_LOW, /* SVS */
VDD_LOW_L1, /* SVS_L1 */
VDD_NOMINAL, /* NOM */
VDD_HIGH, /* TURBO */
VDD_NUM,
};
static int vdd_corner[] = {
[VDD_NONE] = 0,
[VDD_MIN] = RPMH_REGULATOR_LEVEL_MIN_SVS,
[VDD_LOWER] = RPMH_REGULATOR_LEVEL_LOW_SVS,
[VDD_LOW] = RPMH_REGULATOR_LEVEL_SVS,
[VDD_LOW_L1] = RPMH_REGULATOR_LEVEL_SVS_L1,
[VDD_NOMINAL] = RPMH_REGULATOR_LEVEL_NOM,
[VDD_HIGH] = RPMH_REGULATOR_LEVEL_TURBO,
};
#endif