Merge branch 'master' of git://git.denx.de/u-boot into master

[u-boot] / include / configs / vision2.h

diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 848df88e7dfdd5e4220ff4a3db93ac9d1f7fefc7..226d04901f5fd58a6a395770efb02d6d713a04df 100644 (file)
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -87,9 +87,9 @@
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 
 /* PMIC Controller */
-#define CONFIG_PMIC
-#define CONFIG_PMIC_SPI
-#define CONFIG_PMIC_FSL
+#define CONFIG_POWER
+#define CONFIG_POWER_SPI
+#define CONFIG_POWER_FSL
 #define CONFIG_FSL_PMIC_BUS    0
 #define CONFIG_FSL_PMIC_CS     0
 #define CONFIG_FSL_PMIC_CLK    2500000
@@ -196,6 +196,7 @@
 /* 166 MHz DDR RAM */
 #define CONFIG_SYS_DDR_CLKSEL          0
 #define CONFIG_SYS_CLKTL_CBCDR         0x19239100
+#define CONFIG_SYS_MAIN_PWR_ON
 
 #define CONFIG_SYS_NO_FLASH