projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx31pdk.h
diff --git
a/include/configs/mx31pdk.h
b/include/configs/mx31pdk.h
index
6572676
..
138a941
100644
(file)
--- a/
include/configs/mx31pdk.h
+++ b/
include/configs/mx31pdk.h
@@
-69,9
+69,9
@@
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
/* PMIC Controller */
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
/* PMIC Controller */
-#define CONFIG_P
MIC
-#define CONFIG_P
MIC
_SPI
-#define CONFIG_P
MIC
_FSL
+#define CONFIG_P
OWER
+#define CONFIG_P
OWER
_SPI
+#define CONFIG_P
OWER
_FSL
#define CONFIG_FSL_PMIC_BUS 1
#define CONFIG_FSL_PMIC_CS 2
#define CONFIG_FSL_PMIC_CLK 1000000
#define CONFIG_FSL_PMIC_BUS 1
#define CONFIG_FSL_PMIC_CS 2
#define CONFIG_FSL_PMIC_CLK 1000000