[coreboot-gerrit] Patch set updated for coreboot: e766fec tegra132: Replace use of clk_rst with CLK_RST_REG
Patrick Georgi (pgeorgi@google.com)
gerrit at coreboot.org
Fri Mar 27 12:44:41 CET 2015
Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9105
-gerrit
commit e766fec5296e6e314b0c7257b919eeb10d66a707
Author: Furquan Shaikh <furquan at google.com>
Date: Tue Sep 30 19:49:01 2014 -0700
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 <pgeorgi at chromium.org>
Original-Commit-Id: 030081fe85fc9609fdf2003cf51b7350e08f0429
Original-Change-Id: I880ae5c396c33006f6b184cca7f171e4373f4016
Original-Signed-off-by: Furquan Shaikh <furquan at google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/220720
Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
Original-Tested-by: Furquan Shaikh <furquan at chromium.org>
Original-Commit-Queue: Furquan Shaikh <furquan at chromium.org>
---
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 20a66a7..7afe7b5 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 887e2bb..e4fbd19 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 e2933f3..4edcdb7 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))
More information about the coreboot-gerrit
mailing list