summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2006-03-30 17:00:39 +0200
committerMarkus Klotzbücher <mk@pollux.denx.de>2006-03-30 17:00:39 +0200
commit9e7b5ce61b2641e726a38505ffc077642bff44fa (patch)
tree23acd24f5a4ac2a26c6777f2297b8a4a782df3e4
parentf2841d377060cb2c3bedfcdfda6aab3066d6c4f1 (diff)
downloadu-boot-imx-9e7b5ce61b2641e726a38505ffc077642bff44fa.zip
u-boot-imx-9e7b5ce61b2641e726a38505ffc077642bff44fa.tar.gz
u-boot-imx-9e7b5ce61b2641e726a38505ffc077642bff44fa.tar.bz2
delta board: one more DA9030 fix.
-rw-r--r--board/delta/delta.c29
-rw-r--r--include/configs/delta.h1
2 files changed, 19 insertions, 11 deletions
diff --git a/board/delta/delta.c b/board/delta/delta.c
index 78d1f7f..d00d72d 100644
--- a/board/delta/delta.c
+++ b/board/delta/delta.c
@@ -79,27 +79,34 @@ int dram_init (void)
return 0;
}
-/* initialize the DA9030 Power Controller */
-static void init_DA9030()
+void i2c_init_board()
{
- uchar addr = (uchar) DA9030_I2C_ADDR, val = 0;
+ CKENB |= (CKENB_4_I2C);
/* setup I2C GPIO's */
GPIO32 = 0x801; /* SCL = Alt. Fkt. 1 */
GPIO33 = 0x801; /* SDA = Alt. Fkt. 1 */
+}
- /* rising Edge on EXTON */
- GPIO17 = 0xc800; /* enable pullup */
+/* initialize the DA9030 Power Controller */
+static void init_DA9030()
+{
+ uchar addr = (uchar) DA9030_I2C_ADDR, val = 0;
+
+ CKENB |= CKENB_7_GPIO;
+ udelay(100);
+
+ /* Rising Edge on EXTON to reset DA9030 */
+ GPIO17 = 0x8800; /* configure GPIO17, no pullup, -down */
GPDR0 |= (1<<17); /* GPIO17 is output */
GSDR0 = (1<<17);
GPCR0 = (1<<17); /* drive GPIO17 low */
- udelay(5);
GPSR0 = (1<<17); /* drive GPIO17 high */
+
#if CFG_DA9030_EXTON_DELAY
udelay((unsigned long) CFG_DA9030_EXTON_DELAY); /* wait for DA9030 */
#endif
GPCR0 = (1<<17); /* drive GPIO17 low */
- GPIO17 = 0x8800; /* disable pullup */
/* reset the watchdog and go active (0xec) */
val = (SYS_CONTROL_A_HWRES_ENABLE |
@@ -114,14 +121,14 @@ static void init_DA9030()
i2c_reg_write(addr, REG_CONTROL_1_97, 0xfd); /* disable LDO1, enable LDO6 */
i2c_reg_write(addr, LDO2_3, 0xd1); /* LDO2 =1,9V, LDO3=3,1V */
i2c_reg_write(addr, LDO4_5, 0xcc); /* LDO2 =1,9V, LDO3=3,1V */
- i2c_reg_write(addr, LDO6_SIMCP, 0x3e); /* LDO6=3,2V, SIMCP = 5V support */
+ i2c_reg_write(addr, LDO6_SIMCP, 0x3e); /* LDO6=3,2V, SIMCP = 5V support */
i2c_reg_write(addr, LDO7_8, 0xc9); /* LDO7=2,7V, LDO8=3,0V */
i2c_reg_write(addr, LDO9_12, 0xec); /* LDO9=3,0V, LDO12=3,2V */
- i2c_reg_write(addr, BUCK, 0x0c); /* Buck=1.2V */
+ i2c_reg_write(addr, BUCK, 0x0c); /* Buck=1.2V */
i2c_reg_write(addr, REG_CONTROL_2_98, 0x7f); /* All LDO'S on 8,9,10,11,12,14 */
- i2c_reg_write(addr, LDO_10_11, 0xcc); /* LDO10=3.0V LDO11=3.0V */
+ i2c_reg_write(addr, LDO_10_11, 0xcc); /* LDO10=3.0V LDO11=3.0V */
i2c_reg_write(addr, LDO_15, 0xae); /* LDO15=1.8V, dislock first 3bit */
- i2c_reg_write(addr, LDO_14_16, 0x05); /* LDO14=2.8V, LDO16=NB */
+ i2c_reg_write(addr, LDO_14_16, 0x05); /* LDO14=2.8V, LDO16=NB */
i2c_reg_write(addr, LDO_18_19, 0x9c); /* LDO18=3.0V, LDO19=2.7V */
i2c_reg_write(addr, LDO_17_SIMCP0, 0x2c); /* LDO17=3.0V, SIMCP=3V support */
i2c_reg_write(addr, BUCK2_DVC1, 0x9a); /* Buck2=1.5V plus Update support of 520 MHz */
diff --git a/include/configs/delta.h b/include/configs/delta.h
index 053a8f7..5edea95 100644
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -63,6 +63,7 @@
#define CFG_I2C_SLAVE 1 /* I2C controllers address */
#define DA9030_I2C_ADDR 0x49 /* I2C address of DA9030 */
#define CFG_DA9030_EXTON_DELAY 100000 /* wait x us after DA9030 reset via EXTON */
+#define CFG_I2C_INIT_BOARD 1
/* #define CONFIG_HW_WATCHDOG 1 /\* Required for hitting the DA9030 WD *\/ */
/*