From c2115e3f383a0c5046f49497e1c48791b21d17d1 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 30 Sep 2014 19:49:01 -0700 Subject: tegra132: 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: I6487162454159a81b31fe0d6d39c2bdbed3f859a Signed-off-by: Patrick Georgi Original-Commit-Id: 030081fe85fc9609fdf2003cf51b7350e08f0429 Original-Change-Id: I880ae5c396c33006f6b184cca7f171e4373f4016 Original-Signed-off-by: Furquan Shaikh Original-Reviewed-on: https://chromium-review.googlesource.com/220720 Original-Reviewed-by: Aaron Durbin Original-Tested-by: Furquan Shaikh Original-Commit-Queue: Furquan Shaikh Reviewed-on: http://review.coreboot.org/9105 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- 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 20a66a7b91..7afe7b556d 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) { // enable pinmux clamp inputs diff --git a/src/soc/nvidia/tegra132/i2c6.c b/src/soc/nvidia/tegra132/i2c6.c index 887e2bb4b5..e4fbd19f4e 100644 --- a/src/soc/nvidia/tegra132/i2c6.c +++ b/src/soc/nvidia/tegra132/i2c6.c @@ -31,7 +31,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 51e4f5f80c..d93e7b657f 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)) -- cgit v1.2.3