[coreboot-gerrit] Patch set updated for coreboot: 3848837 tegra132: add I2C6 controller to funit library

[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/8940

-gerrit

commit 3848837fcc8ba696b8808463c70d42717b4f8504
Author: Tom Warren <twarren at nvidia.com>
Date:   Fri Aug 15 12:39:25 2014 -0700

    tegra132: add I2C6 controller to funit library
    
    BUG=None
    BRANCH=None
    TEST=Built rush and ryu, ran on rush into recovery mode.
    
    I2C6 is in the SOR domain, so a lot of further init is
    needed before it can be used. A follow-on patch will do this.
    
    Change-Id: I5701bfcf1d0bb8c6edd3d885b1b7dd14e67ba73a
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 69908f2489d1a918bb109d43e713932214741b46
    Original-Change-Id: I1160a182ee6e2b2b56479384efc6a9063590448f
    Original-Signed-off-by: Tom Warren <twarren at nvidia.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/212671
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
---
 src/soc/nvidia/tegra132/clk_rst.h              | 6 ++++--
 src/soc/nvidia/tegra132/funitcfg.c             | 1 +
 src/soc/nvidia/tegra132/include/soc/funitcfg.h | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/soc/nvidia/tegra132/clk_rst.h b/src/soc/nvidia/tegra132/clk_rst.h
index 04a65d3..d0f1e34 100644
--- a/src/soc/nvidia/tegra132/clk_rst.h
+++ b/src/soc/nvidia/tegra132/clk_rst.h
@@ -273,7 +273,7 @@ struct  __attribute__ ((__packed__)) clk_rst_ctlr {
 	u32 spare_reg0;			/* _SPARE_REG0,             0x55c */
 	u32 _rsv32[4];                  /*                    0x560-0x56c */
 	u32 plld2_ss_cfg;               /* _PLLD2_SS_CFG            0x570 */
-	u32 _rsv32_1[7];			/*                      0x574-58c */
+	u32 _rsv32_1[7];		/*                      0x574-58c */
 	u32 plldp_base;			/* _PLLDP_BASE,             0x590 */
 	u32 plldp_misc;			/* _PLLDP_MISC,             0x594 */
 	u32 plldp_ss_cfg;		/* _PLLDP_SS_CFG,           0x598 */
@@ -296,8 +296,10 @@ struct  __attribute__ ((__packed__)) clk_rst_ctlr {
 	u32 clk_src_amx0;		/* _CLK_SOURCE_AMX0         0x63c */
 	u32 clk_src_emc_latency;	/* _CLK_SOURCE_EMC_LATENCY  0x640 */
 	u32 clk_src_soc_therm;		/* _CLK_SOURCE_SOC_THERM    0x644 */
+	u32 _rsv33[5];			/*                      0x648-658 */
+	u32 clk_src_i2c6;		/* _CLK_SOURCE_I2C6,        0x65c */
 };
-check_member(clk_rst_ctlr, clk_src_soc_therm, 0x644);
+check_member(clk_rst_ctlr, clk_src_i2c6, 0x65C);
 
 #define TEGRA_DEV_L			0
 #define TEGRA_DEV_H			1
diff --git a/src/soc/nvidia/tegra132/funitcfg.c b/src/soc/nvidia/tegra132/funitcfg.c
index 9111f25..205e376 100644
--- a/src/soc/nvidia/tegra132/funitcfg.c
+++ b/src/soc/nvidia/tegra132/funitcfg.c
@@ -88,6 +88,7 @@ static const struct funit_cfg_data funit_data[] =  {
 	FUNIT_DATA(I2C2, i2c2, H),
 	FUNIT_DATA(I2C3, i2c3, U),
 	FUNIT_DATA(I2C5, i2c5, H),
+	FUNIT_DATA(I2C6, i2c6, X),
 	FUNIT_DATA(SDMMC3, sdmmc3, U),
 	FUNIT_DATA(SDMMC4, sdmmc4, L),
 	FUNIT_DATA_USB(USBD, L),
diff --git a/src/soc/nvidia/tegra132/include/soc/funitcfg.h b/src/soc/nvidia/tegra132/include/soc/funitcfg.h
index 7e9bdc0..9c7dd9b 100644
--- a/src/soc/nvidia/tegra132/include/soc/funitcfg.h
+++ b/src/soc/nvidia/tegra132/include/soc/funitcfg.h
@@ -33,6 +33,7 @@ enum {
 	FUNIT_INDEX(I2C2),
 	FUNIT_INDEX(I2C3),
 	FUNIT_INDEX(I2C5),
+	FUNIT_INDEX(I2C6),
 	FUNIT_INDEX(SDMMC3),
 	FUNIT_INDEX(SDMMC4),
 	FUNIT_INDEX(USBD),