From 175c636c38b921030022635567c97a33300e3af5 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 21 Aug 2014 14:54:45 -0500 Subject: [PATCH] ryu: use named bus numbers instead of literals Use the bus number enumerations from funit to make the pad names and bus numbers consistent and clearer. BUG=chrome-os-partner:31106 BRANCH=None TEST=Built and booted to kernel. Change-Id: If84ed825537f598c033dcacbcba759e0fe4e90ec Signed-off-by: Patrick Georgi Original-Commit-Id: f4375a8e47f572d618044f65603fb9288832f936 Original-Change-Id: I817a56e879ecc96474128d624dc46c12ebc5c7a8 Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://chromium-review.googlesource.com/213492 Original-Reviewed-by: Furquan Shaikh Reviewed-on: http://review.coreboot.org/8997 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/google/rush_ryu/bootblock.c | 7 ++----- src/mainboard/google/rush_ryu/romstage.c | 6 +++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/mainboard/google/rush_ryu/bootblock.c b/src/mainboard/google/rush_ryu/bootblock.c index ffcffd3634..52a49a68da 100644 --- a/src/mainboard/google/rush_ryu/bootblock.c +++ b/src/mainboard/google/rush_ryu/bootblock.c @@ -27,7 +27,6 @@ #include #include #include -#include /* FIXME: move back to soc code? */ #include "pmic.h" @@ -91,8 +90,6 @@ void bootblock_mainboard_init(void) soc_configure_funits(funits, ARRAY_SIZE(funits)); soc_configure_pads(padcfgs, ARRAY_SIZE(padcfgs)); - i2c_init(4); - pmic_init(4); - - tegra_spi_init(4); + i2c_init(I2CPWR_BUS); + pmic_init(I2CPWR_BUS); } diff --git a/src/mainboard/google/rush_ryu/romstage.c b/src/mainboard/google/rush_ryu/romstage.c index d461872cf6..088357f4f2 100644 --- a/src/mainboard/google/rush_ryu/romstage.c +++ b/src/mainboard/google/rush_ryu/romstage.c @@ -58,11 +58,11 @@ void romstage_mainboard_init(void) soc_configure_i2c6pad(); /* TPM */ - i2c_init(2); + i2c_init(I2C3_BUS); /* EC */ - i2c_init(1); + i2c_init(I2C2_BUS); /* I2C6 bus (audio, etc.) */ - i2c_init(5); + i2c_init(I2C6_BUS); } void mainboard_configure_pmc(void)