aboutsummaryrefslogtreecommitdiff
path: root/board/samsung
diff options
context:
space:
mode:
authorSimon Glass2017-05-18 20:09:31 -0600
committerSimon Glass2017-06-01 07:03:12 -0600
commitf6e76202d4f11c8e38e2cec6111a8e2f99e83fcc (patch)
tree6634a0daa8298ac1da3548e15c6102d624076bea /board/samsung
parent1704308eb63bca0425c524438a7a2992689e2982 (diff)
samsung: Move pmic header out of config file
We should not be including a PMIC header file in the board config. Move it to a C file. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board/samsung')
-rw-r--r--board/samsung/common/misc.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index dc4dead20bc..b18eed2facb 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -18,6 +18,19 @@
#include <asm/gpio.h>
#include <linux/input.h>
#include <dm.h>
+/*
+ * Use #ifdef to work around conflicting headers while we wait for this to be
+ * converted to driver model.
+ */
+#ifdef CONFIG_DM_PMIC_MAX77686
+#include <power/max77686_pmic.h>
+#endif
+#ifdef CONFIG_DM_PMIC_MAX8998
+#include <power/max8998_pmic.h>
+#endif
+#ifdef CONFIG_PMIC_MAX8997
+#include <power/max8997_pmic.h>
+#endif
#include <power/pmic.h>
#include <mmc.h>