diff options
| author | Rajeshwari Shinde <rajeshwari.s@samsung.com> | 2012-12-10 01:55:47 +0000 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2012-12-11 12:59:55 +0900 |
| commit | 857765e9aaeb9b80ae29e4d4e4916979d07040ba (patch) | |
| tree | 58e86742ac43ef27c5e8f50c73c57f8eada27b0c | |
| parent | 48e91caefe572117d68c7b7bc194225e51555950 (diff) | |
POWER: MAX77686: Modified as per the latest Implementation
Moved the pmic_max77686.c max77686_pmic.h to drivers/power
and made required changes accordingly
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| -rw-r--r-- | drivers/power/pmic/Makefile | 1 | ||||
| -rw-r--r-- | drivers/power/pmic/pmic_max77686.c (renamed from drivers/misc/pmic_max77686.c) | 16 | ||||
| -rw-r--r-- | include/power/max77686_pmic.h (renamed from include/max77686_pmic.h) | 0 |
3 files changed, 12 insertions, 5 deletions
diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile index e19a9a8195..14d426f560 100644 --- a/drivers/power/pmic/Makefile +++ b/drivers/power/pmic/Makefile @@ -28,6 +28,7 @@ LIB := $(obj)libpmic.o COBJS-$(CONFIG_POWER_MAX8998) += pmic_max8998.o COBJS-$(CONFIG_POWER_MAX8997) += pmic_max8997.o COBJS-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o +COBJS-$(CONFIG_POWER_MAX77686) += pmic_max77686.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/misc/pmic_max77686.c b/drivers/power/pmic/pmic_max77686.c index 36f7f4dde7..fce0183afd 100644 --- a/drivers/misc/pmic_max77686.c +++ b/drivers/power/pmic/pmic_max77686.c @@ -22,13 +22,19 @@ */ #include <common.h> -#include <pmic.h> -#include <max77686_pmic.h> +#include <power/pmic.h> +#include <power/max77686_pmic.h> +#include <errno.h> -int pmic_init(void) +int pmic_init(unsigned char bus) { - struct pmic *p = get_pmic(); static const char name[] = "MAX77686_PMIC"; + struct pmic *p = pmic_alloc(); + + if (!p) { + printf("%s: POWER allocation error!\n", __func__); + return -ENOMEM; + } puts("Board PMIC init\n"); p->name = name; @@ -36,7 +42,7 @@ int pmic_init(void) p->number_of_regs = PMIC_NUM_OF_REGS; p->hw.i2c.addr = MAX77686_I2C_ADDR; p->hw.i2c.tx_num = 1; - p->bus = I2C_PMIC; + p->bus = bus; return 0; } diff --git a/include/max77686_pmic.h b/include/power/max77686_pmic.h index d949aced09..d949aced09 100644 --- a/include/max77686_pmic.h +++ b/include/power/max77686_pmic.h |