diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-08 10:00:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-08 10:00:46 -0400 |
| commit | 8da19df5b504f1cbe79e13f859bc229c042aded5 (patch) | |
| tree | 004759c6f07482af3f62ad086f1b1e10e16bb2ae /board | |
| parent | 8f48cf9f1758a2c5cef05381401184959af64a69 (diff) | |
| parent | d78ecc733988d07a87c97f7f1c19171c437a8712 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'board')
| -rw-r--r-- | board/CZ.NIC/turris_omnia/turris_omnia.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index da663cf1bb..160d30cd79 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -321,7 +321,11 @@ int board_early_init_f(void) writel(OMNIA_GPP_OUT_ENA_LOW, MVEBU_GPIO0_BASE + 0x04); writel(OMNIA_GPP_OUT_ENA_MID, MVEBU_GPIO1_BASE + 0x04); - /* Disable I2C debug mode blocking 0x64 I2C address */ + /* + * Disable I2C debug mode blocking 0x64 I2C address. + * Note: that would be redundant once Turris Omnia migrates to DM_I2C, + * because the mvtwsi driver includes equivalent code. + */ i2c_debug_reg = readl(MVEBU_TWSI_BASE + MVTWSI_ARMADA_DEBUG_REG); i2c_debug_reg &= ~(1<<18); writel(i2c_debug_reg, MVEBU_TWSI_BASE + MVTWSI_ARMADA_DEBUG_REG); |