From: Arun Bharadwaj Date: Tue, 28 Apr 2015 23:55:30 +0000 (-0700) Subject: overo: Fix regression introduced in a6b541b X-Git-Tag: v2015.07-rc2~260 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2a3c25d24240d5e3ee660f0875e755a457b5117e;p=oweals%2Fu-boot.git overo: Fix regression introduced in a6b541b U-Boot has been broken on Overo boards since commit a6b541b09022acb6f7c2754100ae26bd44eed1d9. This is because the gd pointer is not set early enough anymore, such that the i2c_set_bus_num in get_board_revision can safely execute. This results in a console hang at SPL and the boot does not proceed. This piece of code is anyway necessary only for really old Overo boards with revision numbers <= 2410 and not required for the newer boards. For these older boards, u-boot v2014.10 still works fine. Signed-off-by: Arun Bharadwaj --- diff --git a/board/overo/common.c b/board/overo/common.c index bdfa5caf50..f6f6792d09 100644 --- a/board/overo/common.c +++ b/board/overo/common.c @@ -310,20 +310,6 @@ int get_board_revision(void) { int revision; -#ifdef CONFIG_SYS_I2C_OMAP34XX - unsigned char data; - - /* board revisions <= R2410 connect 4030 irq_1 to gpio112 */ - /* these boards should return a revision number of 0 */ - /* the code below forces a 4030 RTC irq to ensure that gpio112 is low */ - i2c_set_bus_num(TWL4030_I2C_BUS); - data = 0x01; - i2c_write(0x4B, 0x29, 1, &data, 1); - data = 0x0c; - i2c_write(0x4B, 0x2b, 1, &data, 1); - i2c_read(0x4B, 0x2a, 1, &data, 1); -#endif - if (!gpio_request(112, "") && !gpio_request(113, "") && !gpio_request(115, "")) {