|
@@ -240,31 +240,6 @@ struct tegra_soctherm {
|
|
|
struct dentry *debugfs_dir;
|
|
|
};
|
|
|
|
|
|
-/**
|
|
|
- * clk_writel() - writes a value to a CAR register
|
|
|
- * @ts: pointer to a struct tegra_soctherm
|
|
|
- * @v: the value to write
|
|
|
- * @reg: the register offset
|
|
|
- *
|
|
|
- * Writes @v to @reg. No return value.
|
|
|
- */
|
|
|
-static inline void clk_writel(struct tegra_soctherm *ts, u32 value, u32 reg)
|
|
|
-{
|
|
|
- writel(value, (ts->clk_regs + reg));
|
|
|
-}
|
|
|
-
|
|
|
-/**
|
|
|
- * clk_readl() - reads specified register from CAR IP block
|
|
|
- * @ts: pointer to a struct tegra_soctherm
|
|
|
- * @reg: register address to be read
|
|
|
- *
|
|
|
- * Return: the value of the register
|
|
|
- */
|
|
|
-static inline u32 clk_readl(struct tegra_soctherm *ts, u32 reg)
|
|
|
-{
|
|
|
- return readl(ts->clk_regs + reg);
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* ccroc_writel() - writes a value to a CCROC register
|
|
|
* @ts: pointer to a struct tegra_soctherm
|
|
@@ -1207,9 +1182,9 @@ static void tegra_soctherm_throttle(struct device *dev)
|
|
|
} else {
|
|
|
writel(v, ts->regs + THROT_GLOBAL_CFG);
|
|
|
|
|
|
- v = clk_readl(ts, CAR_SUPER_CCLKG_DIVIDER);
|
|
|
+ v = readl(ts->clk_regs + CAR_SUPER_CCLKG_DIVIDER);
|
|
|
v = REG_SET_MASK(v, CDIVG_USE_THERM_CONTROLS_MASK, 1);
|
|
|
- clk_writel(ts, v, CAR_SUPER_CCLKG_DIVIDER);
|
|
|
+ writel(v, ts->clk_regs + CAR_SUPER_CCLKG_DIVIDER);
|
|
|
}
|
|
|
|
|
|
/* initialize stats collection */
|