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 <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 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)