diff options
| author | Furquan Shaikh <furquan@google.com> | 2014-08-09 02:04:39 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-03-26 00:26:52 +0100 |
| commit | d5904c46a091bb58e5ec07287ccb141b319e5ffc (patch) | |
| tree | 452d120881888ef154f6b67f129ab1334c15f4dd /src/mainboard/google/rush/mainboard.c | |
| parent | c41dfb0626eb06616c5d632f7f72c9af29fad331 (diff) | |
| download | coreboot-d5904c46a091bb58e5ec07287ccb141b319e5ffc.tar.xz | |
rush: Convert rush initialization to use funitcfg api
Use funitcfg api for bootblock, romstage as well as ramstage
initialization in rush.
BUG=chrome-os-partner:31251
BRANCH=None
TEST=Compiles successfully and boots till last known good point.
Change-Id: I243597de9ec13904a2bb58a04b402f9545424760
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 0618ea6828bae3e700b85b79b185aec28568b8ae
Original-Change-Id: I8f5801c1c214f05ef9d2ba976838605da2d8b914
Original-Signed-off-by: Furquan Shaikh <furquan@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/211766
Original-Reviewed-by: Tom Warren <twarren@nvidia.com>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Tested-by: Furquan Shaikh <furquan@chromium.org>
Original-Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: http://review.coreboot.org/8922
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard/google/rush/mainboard.c')
| -rw-r--r-- | src/mainboard/google/rush/mainboard.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/mainboard/google/rush/mainboard.c b/src/mainboard/google/rush/mainboard.c index 8364513f15..c4b0b441c4 100644 --- a/src/mainboard/google/rush/mainboard.c +++ b/src/mainboard/google/rush/mainboard.c @@ -25,10 +25,9 @@ #include <soc/nvidia/tegra132/spi.h> #include <soc/addressmap.h> #include <soc/padconfig.h> +#include <soc/funitcfg.h> -static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE; - -static const struct pad_config padcfgs[] = { +static const struct pad_config sdmmc3_pad[] = { /* MMC3(SDCARD) */ PAD_CFG_SFIO(SDMMC3_CLK, PINMUX_INPUT_ENABLE, SDMMC3), PAD_CFG_SFIO(SDMMC3_CMD, PINMUX_INPUT_ENABLE | PINMUX_PULL_UP, SDMMC3), @@ -43,6 +42,9 @@ static const struct pad_config padcfgs[] = { /* Disable SD card reader power so it can be reset even on warm boot. Payloads must enable power before accessing SD card slots. */ PAD_CFG_GPIO_OUT0(KB_ROW0, PINMUX_PULL_NONE), +}; + +static const struct pad_config sdmmc4_pad[] = { /* MMC4 (eMMC) */ PAD_CFG_SFIO(SDMMC4_CLK, PINMUX_INPUT_ENABLE, SDMMC4), PAD_CFG_SFIO(SDMMC4_CMD, PINMUX_INPUT_ENABLE | PINMUX_PULL_UP, SDMMC4), @@ -56,13 +58,10 @@ static const struct pad_config padcfgs[] = { PAD_CFG_SFIO(SDMMC4_DAT7, PINMUX_INPUT_ENABLE | PINMUX_PULL_UP, SDMMC4), }; -static void configure_clocks(void) -{ - /* MMC */ - clock_enable_clear_reset(CLK_L_SDMMC4, 0, CLK_U_SDMMC3, 0, 0, 0); - clock_configure_source(sdmmc3, PLLP, 48000); - clock_configure_source(sdmmc4, PLLP, 48000); -} +static const struct funit_cfg funitcfgs[] = { + FUNIT_CFG(SDMMC3, PLLP, 48000, sdmmc3_pad, ARRAY_SIZE(sdmmc3_pad)), + FUNIT_CFG(SDMMC4, PLLP, 48000, sdmmc4_pad, ARRAY_SIZE(sdmmc4_pad)), +}; static void setup_ec_spi(void) { @@ -73,9 +72,7 @@ static void setup_ec_spi(void) static void mainboard_init(device_t dev) { - configure_clocks(); - - soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs)); + soc_configure_funits(funitcfgs, ARRAY_SIZE(funitcfgs)); setup_ec_spi(); } |