[coreboot-gerrit] New patch to review for coreboot: c0737cc ryu: use named bus numbers instead of literals

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8997

-gerrit

commit c0737cc79bd7971b5b378fe15b35df5b50cd85ca
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Thu Aug 21 14:54:45 2014 -0500

    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 <pgeorgi at chromium.org>
    Original-Commit-Id: f4375a8e47f572d618044f65603fb9288832f936
    Original-Change-Id: I817a56e879ecc96474128d624dc46c12ebc5c7a8
    Original-Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/213492
    Original-Reviewed-by: Furquan Shaikh <furquan at chromium.org>
---
 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 ffcffd3..52a49a6 100644
--- a/src/mainboard/google/rush_ryu/bootblock.c
+++ b/src/mainboard/google/rush_ryu/bootblock.c
@@ -27,7 +27,6 @@
 #include <soc/padconfig.h>
 #include <soc/nvidia/tegra/i2c.h>
 #include <soc/nvidia/tegra132/clk_rst.h>
-#include <soc/nvidia/tegra132/spi.h>	/* 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 d461872..088357f 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)