diff options
| -rw-r--r-- | src/mainboard/google/rush_ryu/mainboard.c | 57 |
1 files changed, 21 insertions, 36 deletions
diff --git a/src/mainboard/google/rush_ryu/mainboard.c b/src/mainboard/google/rush_ryu/mainboard.c index 140ca5f63e..93ffca9adc 100644 --- a/src/mainboard/google/rush_ryu/mainboard.c +++ b/src/mainboard/google/rush_ryu/mainboard.c @@ -20,61 +20,46 @@ #include <device/device.h> #include <boot/coreboot_tables.h> +#include <soc/addressmap.h> #include <soc/clock.h> +#include <soc/padconfig.h> #include <soc/nvidia/tegra132/clk_rst.h> -#include <soc/nvidia/tegra132/pinmux.h> -#include <soc/addressmap.h> static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE; +static const struct pad_config mmcpads[] = { + /* MMC4 (eMMC) */ + PAD_CFG_SFIO(SDMMC4_CLK, PINMUX_INPUT_ENABLE|PINMUX_PULL_DOWN, SDMMC4), + PAD_CFG_SFIO(SDMMC4_CMD, PINMUX_INPUT_ENABLE|PINMUX_PULL_UP, SDMMC4), + PAD_CFG_SFIO(SDMMC4_DAT0, PINMUX_INPUT_ENABLE|PINMUX_PULL_UP, SDMMC4), + PAD_CFG_SFIO(SDMMC4_DAT1, PINMUX_INPUT_ENABLE|PINMUX_PULL_UP, SDMMC4), + PAD_CFG_SFIO(SDMMC4_DAT2, PINMUX_INPUT_ENABLE|PINMUX_PULL_UP, SDMMC4), + PAD_CFG_SFIO(SDMMC4_DAT3, PINMUX_INPUT_ENABLE|PINMUX_PULL_UP, SDMMC4), + PAD_CFG_SFIO(SDMMC4_DAT4, PINMUX_INPUT_ENABLE|PINMUX_PULL_UP, SDMMC4), + PAD_CFG_SFIO(SDMMC4_DAT5, PINMUX_INPUT_ENABLE|PINMUX_PULL_UP, SDMMC4), + PAD_CFG_SFIO(SDMMC4_DAT6, PINMUX_INPUT_ENABLE|PINMUX_PULL_UP, SDMMC4), + PAD_CFG_SFIO(SDMMC4_DAT7, PINMUX_INPUT_ENABLE|PINMUX_PULL_UP, SDMMC4), +}; + static void init_mmc(void) { + clock_enable_clear_reset(CLK_L_SDMMC4, 0, 0, 0, 0, 0); clock_configure_source(sdmmc4, PLLP, 48000); - uint32_t pin_up = PINMUX_PULL_UP | PINMUX_INPUT_ENABLE, - pin_none = PINMUX_PULL_NONE | PINMUX_INPUT_ENABLE; - - // MMC4 (eMMC) - pinmux_set_config(PINMUX_SDMMC4_CLK_INDEX, - PINMUX_SDMMC4_CLK_FUNC_SDMMC4 | pin_none); - pinmux_set_config(PINMUX_SDMMC4_CMD_INDEX, - PINMUX_SDMMC4_CMD_FUNC_SDMMC4 | pin_up); - pinmux_set_config(PINMUX_SDMMC4_DAT0_INDEX, - PINMUX_SDMMC4_DAT0_FUNC_SDMMC4 | pin_up); - pinmux_set_config(PINMUX_SDMMC4_DAT1_INDEX, - PINMUX_SDMMC4_DAT1_FUNC_SDMMC4 | pin_up); - pinmux_set_config(PINMUX_SDMMC4_DAT2_INDEX, - PINMUX_SDMMC4_DAT2_FUNC_SDMMC4 | pin_up); - pinmux_set_config(PINMUX_SDMMC4_DAT3_INDEX, - PINMUX_SDMMC4_DAT3_FUNC_SDMMC4 | pin_up); - pinmux_set_config(PINMUX_SDMMC4_DAT4_INDEX, - PINMUX_SDMMC4_DAT4_FUNC_SDMMC4 | pin_up); - pinmux_set_config(PINMUX_SDMMC4_DAT5_INDEX, - PINMUX_SDMMC4_DAT5_FUNC_SDMMC4 | pin_up); - pinmux_set_config(PINMUX_SDMMC4_DAT6_INDEX, - PINMUX_SDMMC4_DAT6_FUNC_SDMMC4 | pin_up); - pinmux_set_config(PINMUX_SDMMC4_DAT7_INDEX, - PINMUX_SDMMC4_DAT7_FUNC_SDMMC4 | pin_up); -} - -static void setup_ec_i2c(void) -{ + soc_configure_pads(mmcpads, ARRAY_SIZE(mmcpads)); } static void mainboard_init(device_t dev) { - clock_enable_clear_reset(CLK_L_SDMMC4, 0, 0, 0, 0, 0); - init_mmc(); - setup_ec_i2c(); } static void mainboard_enable(device_t dev) { - dev->ops->init = &mainboard_init; + dev->ops->init = &mainboard_init; } struct chip_operations mainboard_ops = { - .name = "rush_ryu", - .enable_dev = mainboard_enable, + .name = "rush_ryu", + .enable_dev = mainboard_enable, }; |