summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajeshwari Shinde <rajeshwari.s@samsung.com>2012-12-10 01:55:48 +0000
committerMinkyu Kang <mk7.kang@samsung.com>2012-12-11 12:59:59 +0900
commit211e8438cf61df1e2a53b6b979a8e4224158d5dc (patch)
treea9f068c55d2c10bcea3c80ea25e6df3c6f138092
parent857765e9aaeb9b80ae29e4d4e4916979d07040ba (diff)
SMDK5250: Enable pmic MAX77686
Enabled pmic MAX77686 for SMDK5250. Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com> Acked-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r--board/samsung/smdk5250/smdk5250.c15
-rw-r--r--include/configs/smdk5250.h8
2 files changed, 15 insertions, 8 deletions
diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
index 4c50342e5c..9c926d6ecf 100644
--- a/board/samsung/smdk5250/smdk5250.c
+++ b/board/samsung/smdk5250/smdk5250.c
@@ -30,7 +30,7 @@
#include <asm/arch/mmc.h>
#include <asm/arch/pinmux.h>
#include <asm/arch/sromc.h>
-#include <pmic.h>
+#include <power/pmic.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -65,9 +65,6 @@ static int smc9115_pre_init(void)
int board_init(void)
{
gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL);
-#if defined(CONFIG_PMIC)
- pmic_init();
-#endif
#ifdef CONFIG_EXYNOS_SPI
spi_init();
#endif
@@ -87,6 +84,16 @@ int dram_init(void)
return 0;
}
+#if defined(CONFIG_POWER)
+int power_init_board(void)
+{
+ if (pmic_init(I2C_PMIC))
+ return -1;
+ else
+ return 0;
+}
+#endif
+
void dram_init_banksize(void)
{
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index e412da8c9d..df00305bdf 100644
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -65,7 +65,7 @@
#define INFORM1_OFFSET 0x804
/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20))
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (4 << 20))
/* select serial console configuration */
#define CONFIG_SERIAL3 /* use SERIAL 3 */
@@ -209,9 +209,9 @@
#define CONFIG_SYS_I2C_SLAVE 0x0
/* PMIC */
-#define CONFIG_PMIC
-#define CONFIG_PMIC_I2C
-#define CONFIG_PMIC_MAX77686
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_MAX77686
/* SPI */
#define CONFIG_ENV_IS_IN_SPI_FLASH