diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-18 20:09:31 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-06-01 07:03:12 -0600 |
| commit | f6e76202d4f11c8e38e2cec6111a8e2f99e83fcc (patch) | |
| tree | 6634a0daa8298ac1da3548e15c6102d624076bea | |
| parent | 1704308eb63bca0425c524438a7a2992689e2982 (diff) | |
| download | u-boot-f6e76202d4f11c8e38e2cec6111a8e2f99e83fcc.zip u-boot-f6e76202d4f11c8e38e2cec6111a8e2f99e83fcc.tar.gz u-boot-f6e76202d4f11c8e38e2cec6111a8e2f99e83fcc.tar.bz2 | |
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>
| -rw-r--r-- | board/samsung/common/misc.c | 13 | ||||
| -rw-r--r-- | include/configs/s5pc210_universal.h | 1 | ||||
| -rw-r--r-- | include/configs/trats.h | 1 | ||||
| -rw-r--r-- | include/configs/trats2.h | 1 |
4 files changed, 13 insertions, 3 deletions
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index dc4dead..b18eed2 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> diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 6c75626..0265684 100644 --- 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 6806cd9..e08bbc4 100644 --- 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 6a4604c..927d482 100644 --- 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 |