diff options
| author | Tom Rini <trini@ti.com> | 2012-10-17 09:03:59 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-17 09:03:59 -0700 |
| commit | 953cfd2878216daf80bda4c0d4a829e2d76b7cbe (patch) | |
| tree | 90f1fdb1e91528c40d7d269999793abd3e7c67e4 /board | |
| parent | d1ff690612415470a681787c029803952142043d (diff) | |
| parent | 54b99e51ab580eb6373f93994fe8f8a8edeefcf8 (diff) | |
| download | talos-obmc-uboot-953cfd2878216daf80bda4c0d4a829e2d76b7cbe.tar.gz talos-obmc-uboot-953cfd2878216daf80bda4c0d4a829e2d76b7cbe.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'board')
| -rw-r--r-- | board/kmc/kzm9g/kzm9g.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c index 525c97aea6..54f25e097c 100644 --- a/board/kmc/kzm9g/kzm9g.c +++ b/board/kmc/kzm9g/kzm9g.c @@ -43,6 +43,7 @@ DECLARE_GLOBAL_DATA_PTR; #define SMSTPCR1_CMT0 (1 << 24) #define SMSTPCR1_I2C0 (1 << 16) #define SMSTPCR3_USB (1 << 22) +#define SMSTPCR3_I2C1 (1 << 23) #define PORT32CR (0xE6051020) #define PORT33CR (0xE6051021) @@ -287,8 +288,8 @@ int board_early_init_f(void) clrbits_le32(&cpg->smstpcr1, (SMSTPCR1_CMT0|SMSTPCR1_I2C0)); clrbits_le32(&cpg_srcr->srcr1, (SMSTPCR1_CMT0|SMSTPCR1_I2C0)); - clrbits_le32(&cpg->smstpcr3, SMSTPCR3_USB); - clrbits_le32(&cpg_srcr->srcr3, SMSTPCR3_USB); + clrbits_le32(&cpg->smstpcr3, (SMSTPCR3_USB|SMSTPCR3_I2C1)); + clrbits_le32(&cpg_srcr->srcr3, (SMSTPCR3_USB|SMSTPCR3_I2C1)); writel(VCLKCR1_D, &cpg->vclkcr1); /* Setup SCIF4 / workaround */ @@ -343,6 +344,8 @@ int board_init(void) gpio_direction_output(GPIO_PORT15, 1); /* I2C */ + gpio_request(GPIO_FN_PORT237_I2C_SCL2, NULL); + gpio_request(GPIO_FN_PORT236_I2C_SDA2, NULL); gpio_request(GPIO_FN_PORT27_I2C_SCL3, NULL); gpio_request(GPIO_FN_PORT28_I2C_SDA3, NULL); |
