Bläddra i källkod

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>
Rajeshwari Shinde 12 år sedan
förälder
incheckning
857765e9aa
3 ändrade filer med 12 tillägg och 5 borttagningar
  1. 1 0
      drivers/power/pmic/Makefile
  2. 11 5
      drivers/power/pmic/pmic_max77686.c
  3. 0 0
      include/power/max77686_pmic.h

+ 1 - 0
drivers/power/pmic/Makefile

@@ -28,6 +28,7 @@ LIB	:= $(obj)libpmic.o
 COBJS-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
 COBJS-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
 COBJS-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
 COBJS-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
 COBJS-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
 COBJS-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
+COBJS-$(CONFIG_POWER_MAX77686) += pmic_max77686.o
 
 
 COBJS	:= $(COBJS-y)
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 SRCS	:= $(COBJS:.o=.c)

+ 11 - 5
drivers/misc/pmic_max77686.c → drivers/power/pmic/pmic_max77686.c

@@ -22,13 +22,19 @@
  */
  */
 
 
 #include <common.h>
 #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";
 	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");
 	puts("Board PMIC init\n");
 	p->name = name;
 	p->name = name;
@@ -36,7 +42,7 @@ int pmic_init(void)
 	p->number_of_regs = PMIC_NUM_OF_REGS;
 	p->number_of_regs = PMIC_NUM_OF_REGS;
 	p->hw.i2c.addr = MAX77686_I2C_ADDR;
 	p->hw.i2c.addr = MAX77686_I2C_ADDR;
 	p->hw.i2c.tx_num = 1;
 	p->hw.i2c.tx_num = 1;
-	p->bus = I2C_PMIC;
+	p->bus = bus;
 
 
 	return 0;
 	return 0;
 }
 }

+ 0 - 0
include/max77686_pmic.h → include/power/max77686_pmic.h