board/BuR/common: move I2C initialization from common part to board-specific

PATCH New Hannes Petermaier 2 participants 4 messages Mar 19, 2015 – Mar 28, 2015

lore

Share & tools

lore

Hannes Petermaier

author

2015-03-19 09:43 UTC #0 lore raw

PATCH 1/2 board/BuR/common: move I2C initialization from common part to board-specific

From: Hannes Petermaier <[email protected]>

At this time I2C and responsible pin-mux is setup during PMIC initialziation within common.c, this is possible because today PMIC is always connected on I2C0.

In Future this will be changed, PMIC isn't anymore connected to bus0 in call cases.

So we do following:
- rename enable_i2c_pin_mux0 to enable_i2c_pin_mux to be generic for enabling pin-mux on different or more busses.
- move the call to i2c_pin_mux and i2c_init from common.c to the specific board.c

Signed-off-by Hannes Petermaier <[email protected]>

---

 board/BuR/common/bur_common.h |    2 +-
 board/BuR/common/common.c     |    4 ----
 board/BuR/kwb/board.c         |    3 ++-
 board/BuR/kwb/mux.c           |    2 +-
 board/BuR/tseries/board.c     |    4 ++++
 board/BuR/tseries/mux.c       |    2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

board/BuR/common/bur_common.h +1 -1

index 39afbba..3061e4c 100644
@@ -19,7 +19,7 @@ void br_summaryscreen(void);
 void blink(u32 blinks, u32 intervall, u32 pin);
 void pmicsetup(u32 mpupll);
 void enable_uart0_pin_mux(void);
-void enable_i2c0_pin_mux(void);
+void enable_i2c_pin_mux(void);
 void enable_board_pin_mux(void);
 int board_eth_init(bd_t *bis);

board/BuR/common/common.c +0 -4

index 5ff8a7e..91834eb 100644
@@ -461,10 +461,6 @@ void pmicsetup(u32 mpupll)
 	int mpu_vdd;
 	int usb_cur_lim;
 
-	/* setup I2C */
-	enable_i2c0_pin_mux();
-	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
-
 	if (i2c_probe(TPS65217_CHIP_PM)) {
 		puts("PMIC (0x24) not found! skip further initalization.\n");
 		return;

board/BuR/kwb/board.c +2 -1

index 892311e..6eed7e0 100644
@@ -124,7 +124,8 @@ void am33xx_spl_board_init(void)
 	gpio_direction_output(LCD_PWR, 0);
 
 	/* setup I2C */
-	enable_i2c0_pin_mux();
+	enable_i2c_pin_mux();
+	i2c_set_bus_num(0);
 	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 
 	/* power-ON  3V3 via Resetcontroller */

board/BuR/kwb/mux.c +1 -1

index 9f89b5e..2b1d8d3 100644
@@ -180,7 +180,7 @@ void enable_uart0_pin_mux(void)
 	configure_module_pin_mux(uart0_pin_mux);
 }
 
-void enable_i2c0_pin_mux(void)
+void enable_i2c_pin_mux(void)
 {
 	configure_module_pin_mux(i2c0_pin_mux);
 }

board/BuR/tseries/board.c +4 -0

index 9402aa4..89e989f 100644
@@ -123,6 +123,10 @@ void am33xx_spl_board_init(void)
 	/* setup LCD-Pixel Clock */
 	writel(0x2, &cmdpll->clklcdcpixelclk);	/* clock comes from perPLL M2 */
 
+	/* setup I2C */
+	enable_i2c_pin_mux();
+	i2c_set_bus_num(0);
+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 	pmicsetup(0);
 }

board/BuR/tseries/mux.c +1 -1

index 2c87a63..ac7e885 100644
@@ -226,7 +226,7 @@ void enable_uart0_pin_mux(void)
 	configure_module_pin_mux(uart0_pin_mux);
 }
 
-void enable_i2c0_pin_mux(void)
+void enable_i2c_pin_mux(void)
 {
 	configure_module_pin_mux(i2c0_pin_mux);
 }

Signature · 1 line

1.7.9.5

Hannes Petermaier

author

2015-03-19 09:43 UTC #1 lore raw

PATCH 2/2 board/BuR/common: remove unused function 'blink'

From: Hannes Petermaier <[email protected]>

since we have possibility to write out on lcd whats going on, we don't need the gpio blink functionality anymore.

Signed-off-by Hannes Petermaier <[email protected]>

---

 board/BuR/common/bur_common.h |    1 -
 board/BuR/common/common.c     |   14 --------------
 2 files changed, 15 deletions(-)

board/BuR/common/bur_common.h +0 -1

index 3061e4c..e4896fb 100644
@@ -16,7 +16,6 @@
 
 int load_lcdtiming(struct am335x_lcdpanel *panel);
 void br_summaryscreen(void);
-void blink(u32 blinks, u32 intervall, u32 pin);
 void pmicsetup(u32 mpupll);
 void enable_uart0_pin_mux(void);
 void enable_i2c_pin_mux(void);

board/BuR/common/common.c +0 ~~-14~~

index 91834eb..ccaa9c6 100644
@@ -441,20 +441,6 @@ void lcd_enable(void)
 #error "LCD-support with a suitable FB-Driver is mandatory !"
 #endif /* CONFIG_LCD */
 
-void blink(u32 blinks, u32 intervall, u32 pin)
-{
-	gpio_direction_output(pin, 0);
-	int val = 0;
-
-	do {
-		val ^= 0x01;
-		gpio_set_value(pin, val);
-		mdelay(intervall);
-	} while (blinks--);
-
-	gpio_set_value(pin, 0);
-}
-
 #ifdef CONFIG_SPL_BUILD
 void pmicsetup(u32 mpupll)
 {

Signature · 1 line

1.7.9.5

Tom Rini

2015-03-28 18:09 UTC #2 lore raw

PATCH 2/2 board/BuR/common: remove unused function 'blink'

Quoted 8 lines · Hannes Petermaier

From: Hannes Petermaier <[email protected]>
since we have possibility to write out on lcd whats going on, we don't need the gpio blink functionality anymore.
Signed-off-by Hannes Petermaier <[email protected]>
Signed-off-by Hannes Petermaier <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150328/fddc9cb7/attachment.sig>

Tom Rini

2015-03-28 18:09 UTC #3 lore raw

PATCH 1/2 board/BuR/common: move I2C initialization from common part to board-specific

In reply to Hannes Petermaier

Quoted 9 lines · Hannes Petermaier

From: Hannes Petermaier <[email protected]>
At this time I2C and responsible pin-mux is setup during PMIC initialziation within common.c, this is possible because today PMIC is always connected on I2C0.
In Future this will be changed, PMIC isn't anymore connected to bus0 in call cases.

Quoted 8 lines

So we do following:
- rename enable_i2c_pin_mux0 to enable_i2c_pin_mux to be generic for enabling pin-mux on different or more busses.
- move the call to i2c_pin_mux and i2c_init from common.c to the specific board.c
Signed-off-by Hannes Petermaier <[email protected]>
Signed-off-by Hannes Petermaier <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150328/0c9abf1a/attachment.sig>