From 030081fe85fc9609fdf2003cf51b7350e08f0429 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 30 Sep 2014 19:49:01 -0700 Subject: [PATCH] t132: Replace use of clk_rst with CLK_RST_REG Also, get rid of unused clk_rst variables. BUG=None BRANCH=None TEST=Compiles successfully Change-Id: I880ae5c396c33006f6b184cca7f171e4373f4016 Signed-off-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/220720 Reviewed-by: Aaron Durbin Tested-by: Furquan Shaikh Commit-Queue: Furquan Shaikh --- src/soc/nvidia/tegra132/bootblock.c | 2 -- src/soc/nvidia/tegra132/i2c6.c | 1 - src/soc/nvidia/tegra132/include/soc/clock.h | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/soc/nvidia/tegra132/bootblock.c b/src/soc/nvidia/tegra132/bootblock.c index 2b3164ab70..fef1d35f85 100644 --- a/src/soc/nvidia/tegra132/bootblock.c +++ b/src/soc/nvidia/tegra132/bootblock.c @@ -34,8 +34,6 @@ void __attribute__((weak)) bootblock_mainboard_early_init(void) /* Empty default implementation. */ } -static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE; - void main(void) { void *entry; diff --git a/src/soc/nvidia/tegra132/i2c6.c b/src/soc/nvidia/tegra132/i2c6.c index 047ef88134..9e9a5dc1be 100644 --- a/src/soc/nvidia/tegra132/i2c6.c +++ b/src/soc/nvidia/tegra132/i2c6.c @@ -30,7 +30,6 @@ #define DPAUX_HYBRID_PADCTL 0x545C0124 static struct tegra_pmc_regs * const pmc = (void *)TEGRA_PMC_BASE; -static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE; static int partition_clamp_on(int id) { diff --git a/src/soc/nvidia/tegra132/include/soc/clock.h b/src/soc/nvidia/tegra132/include/soc/clock.h index e2933f3090..4edcdb78c6 100644 --- a/src/soc/nvidia/tegra132/include/soc/clock.h +++ b/src/soc/nvidia/tegra132/include/soc/clock.h @@ -290,7 +290,7 @@ static inline void _clock_set_div(u32 *reg, const char *name, u32 div, #define CLK_DIV_MASK_I2C 0xffff #define clock_configure_source(device, src, freq) \ - _clock_set_div(&clk_rst->clk_src_##device, #device, \ + _clock_set_div(CLK_RST_REG(clk_src_##device), #device, \ get_clk_div(TEGRA_##src##_KHZ, freq), CLK_DIV_MASK, \ CLK_SRC_DEV_ID(device, src))