From 857765e9aaeb9b80ae29e4d4e4916979d07040ba Mon Sep 17 00:00:00 2001 From: Rajeshwari Shinde Date: Mon, 10 Dec 2012 01:55:47 +0000 Subject: [PATCH] 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 Reviewed-by: Lukasz Majewski Acked-by: Lukasz Majewski Signed-off-by: Minkyu Kang --- drivers/power/pmic/Makefile | 1 + drivers/{misc => power/pmic}/pmic_max77686.c | 16 +++++++++++----- include/{ => power}/max77686_pmic.h | 0 3 files changed, 12 insertions(+), 5 deletions(-) rename drivers/{misc => power/pmic}/pmic_max77686.c (82%) rename include/{ => power}/max77686_pmic.h (100%) 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 similarity index 82% rename from drivers/misc/pmic_max77686.c rename to 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 -#include -#include +#include +#include +#include -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 similarity index 100% rename from include/max77686_pmic.h rename to include/power/max77686_pmic.h -- 2.39.5