From f6e76202d4f11c8e38e2cec6111a8e2f99e83fcc Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 18 May 2017 20:09:31 -0600
Subject: 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>
---
 board/samsung/common/misc.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'board/samsung/common/misc.c')

diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index dc4dead20b..b18eed2fac 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>
 
-- 
cgit v1.2.1