Skip to contentSkip to conversation

board:trats1:trats2: fix adapter number

PATCH New Piotr Wilczek 2 participants 3 messages Dec 18, 2013 – Dec 31, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 board:trats1:trats2: fix adapter number

This fix is necessary after increased by one the number of adapters in s3c24x0 driver.

Tested on Trats and Trats2.

---
 board/samsung/trats/trats.c   |    2 +-
 board/samsung/trats2/trats2.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
board/samsung/trats/trats.c +1 -1
index 8aba51c..640a193 100644
@@ -295,7 +295,7 @@ int power_init_board(void)
 	 */
 	ret = pmic_init(I2C_5);
 	ret |= pmic_init_max8997();
-	ret |= power_fg_init(I2C_8);
+	ret |= power_fg_init(I2C_9);
 	ret |= power_muic_init(I2C_5);
 	ret |= power_bat_init(0);
 	if (ret)
board/samsung/trats2/trats2.c +3 -3
index 147de17..be15357 100644
@@ -195,9 +195,9 @@ int power_init_board(void)
 #endif
 	pmic_init(I2C_7);		/* I2C adapter 7 - bus name s3c24x0_7 */
 	pmic_init_max77686();
-	pmic_init_max77693(I2C_9);	/* I2C adapter 9 - bus name soft1 */
-	power_muic_init(I2C_9);		/* I2C adapter 9 - bus name soft1 */
-	power_fg_init(I2C_8);		/* I2C adapter 8 - bus name soft0 */
+	pmic_init_max77693(I2C_10);	/* I2C adapter 10 - bus name soft1 */
+	power_muic_init(I2C_10);	/* I2C adapter 10 - bus name soft1 */
+	power_fg_init(I2C_9);		/* I2C adapter 9 - bus name soft0 */
 	power_bat_init(0);
 
 	p_chrg = pmic_get("MAX77693_PMIC");
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 board:trats1:trats2: fix adapter number

Dear Minkyu Kang,

Quoted 12 lines

-----Original Message-----
From: Piotr Wilczek [mailto:p.wilczek at samsung.com]
Sent: Wednesday, December 18, 2013 3:44 PM
To: u-boot at lists.denx.de
Cc: Minkyu Kang; Kyungmin Park; Piotr Wilczek; Lukasz Majewski
Subject: [PATCH] board:trats1:trats2: fix adapter number

This fix is necessary after increased by one the number of adapters in s3c24x0 driver.

Tested on Trats and Trats2.

Quoted 9 lines
---
 board/samsung/trats/trats.c   |    2 +-
 board/samsung/trats2/trats2.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Please consider this patch and the following one:
http://patchwork.ozlabs.org/patch/303558/
as vary important fix for 2014.01 release.

Thank you,
Piotr Wilczek

#2 lore raw

PATCH 1/1 board:trats1:trats2: fix adapter number

In reply to Piotr Wilczek
Quoted 35 lines · Piotr Wilczek

This fix is necessary after increased by one the number of adapters in s3c24x0 driver.

Tested on Trats and Trats2.

---
 board/samsung/trats/trats.c   |    2 +-
 board/samsung/trats2/trats2.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
board/samsung/trats/trats.c +1 -1
index 8aba51c..640a193 100644
@@ -295,7 +295,7 @@ int power_init_board(void)
 	 */
 	ret = pmic_init(I2C_5);
 	ret |= pmic_init_max8997();
-	ret |= power_fg_init(I2C_8);
+	ret |= power_fg_init(I2C_9);
 	ret |= power_muic_init(I2C_5);
 	ret |= power_bat_init(0);
 	if (ret)
board/samsung/trats2/trats2.c +0 -0
index 147de17..be15357 100644
@@ -195,9 +195,9 @@ int power_init_board(void)
 #endif
 	pmic_init(I2C_7);		/* I2C adapter 7 - bus name s3c24x0_7 */

board/samsung/trats2/trats2.c int power_init_board(void) · line 203

Quoted 10 lines
board/samsung/trats2/trats2.c +3 -3
 	pmic_init_max77686();
-	pmic_init_max77693(I2C_9);	/* I2C adapter 9 - bus name soft1 */
-	power_muic_init(I2C_9);		/* I2C adapter 9 - bus name soft1 */
-	power_fg_init(I2C_8);		/* I2C adapter 8 - bus name soft0 */
+	pmic_init_max77693(I2C_10);	/* I2C adapter 10 - bus name soft1 */
+	power_muic_init(I2C_10);	/* I2C adapter 10 - bus name soft1 */
+	power_fg_init(I2C_9);		/* I2C adapter 9 - bus name soft0 */
 	power_bat_init(0);
 
 	p_chrg = pmic_get("MAX77693_PMIC");

applied to u-boot-samsung.

Thanks,
Minkyu Kang.