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>

diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index dc4dead20bc7f2529ffc633881c4d1e11524111c..b18eed2facbc83d2f9e046dea0f684674978959b 100644 (file)
--- 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>
 

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 6c75626e8249ba127bcda9b1df4d2fc7b2474609..0265684e6737de59aad3b256d939f8517d1e92c2 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -176,7 +176,6 @@ int universal_spi_read(void);
 
 /* Download menu - definitions for check keys */
 #ifndef __ASSEMBLY__
-#include <power/max8998_pmic.h>
 
 #define KEY_PWR_PMIC_NAME              "MAX8998_PMIC"
 #define KEY_PWR_STATUS_REG             MAX8998_REG_STATUS1

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 6806cd9565034fb02929a6edf3b12608693ef4f7..e08bbc49ae916402a73cf1f78dd71f458f2a90c7 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -188,7 +188,6 @@
 
 /* Download menu - definitions for check keys */
 #ifndef __ASSEMBLY__
-#include <power/max8997_pmic.h>
 
 #define KEY_PWR_PMIC_NAME              "MAX8997_PMIC"
 #define KEY_PWR_STATUS_REG             MAX8997_REG_STATUS1

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 6a4604ce938c56c2beff3448374e13d29c58e8be..927d48255cd9c896a367ee30edcf09634eb5be10 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -169,7 +169,6 @@
 
 /* Download menu - definitions for check keys */
 #ifndef __ASSEMBLY__
-#include <power/max77686_pmic.h>
 
 #define KEY_PWR_PMIC_NAME              "MAX77686_PMIC"
 #define KEY_PWR_STATUS_REG             MAX77686_REG_PMIC_STATUS1