summaryrefslogtreecommitdiff
path: root/board/ti
diff options
context:
space:
mode:
authorAlexander Kochetkov <al.kochet@gmail.com>2014-09-29 21:46:48 +0400
committerTom Rini <trini@ti.com>2014-10-10 09:44:43 -0400
commit04e2a13336f0e507ef416bbede3be92b79c46594 (patch)
tree535caa19b473e0718f605e485e69dde274951284 /board/ti
parentaf55e35d33894295cf0f2f94c050f67d05b50944 (diff)
downloadu-boot-imx-04e2a13336f0e507ef416bbede3be92b79c46594.zip
u-boot-imx-04e2a13336f0e507ef416bbede3be92b79c46594.tar.gz
u-boot-imx-04e2a13336f0e507ef416bbede3be92b79c46594.tar.bz2
beagleboard: Remove side effects of i2c2 pullup resisters initialization code
Fix typo of commit d4e53f063dd25e071444b87303573e7440deeb89. i2c2 pullup resisters are controlled by bit 0 of CONTROL_PROG_IO1. It's value after reset is 0x00100001. In order to clear bit 0, original code write 0xfffffffe to CONTROL_PROG_IO1 and toggle almost all default values. Original code affect following: * disable i2c1 pullup resisters * increase far end load setting for many modules * setup invalid SC/LB combination Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com> CC: Tom Rini <trini@ti.com> CC: Steve Kipisz <s-kipisz2@ti.com>
Diffstat (limited to 'board/ti')
-rw-r--r--board/ti/beagle/beagle.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 0674afd..94b99bf 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -317,9 +317,12 @@ int misc_init_r(void)
struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE;
struct control_prog_io *prog_io_base = (struct control_prog_io *)OMAP34XX_CTRL_BASE;
bool generate_fake_mac = false;
+ u32 value;
/* Enable i2c2 pullup resisters */
- writel(~(PRG_I2C2_PULLUPRESX), &prog_io_base->io1);
+ value = readl(&prog_io_base->io1);
+ value &= ~(PRG_I2C2_PULLUPRESX);
+ writel(value, &prog_io_base->io1);
switch (get_board_revision()) {
case REVISION_AXBX: