Revert "max89xx: rename max8998 to max89xx"

This reverts commit 3c05ed032a44a347d2edb60ff73014f4fbaafb1c.

diff --git a/board/samsung/universal_c110/universal.c b/board/samsung/universal_c110/universal.c
index 328d7e9..8d85e2c 100644 (file)
--- a/board/samsung/universal_c110/universal.c
+++ b/board/samsung/universal_c110/universal.c
@@ -45,7 +45,7 @@
 #include <spi.h>
 #include <bmp_layout.h>
 #include <ramoops.h>
-#include <max89xx.h>
+#include <max8998.h>
 
 #include "animation_frames.h"
 #include "gpio_setting.h"
@@ -2571,7 +2571,7 @@ int misc_init_r(void)
        check_keypad();
 
        /* check max8998 */
-       max89xx_init(I2C_PMIC);
+       max8998_init(I2C_PMIC);
        init_pmic();
 
 #ifdef CONFIG_S5PC1XXFB

diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 495ae83..a5223c2 100644 (file)
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -35,7 +35,7 @@
 #include <asm/arch/clk.h>
 #include <ramoops.h>
 #include <info_action.h>
-#include <max89xx.h>
+#include <max8998.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -1230,7 +1230,7 @@ int misc_init_r(void)
 #endif
 
 #ifdef CONFIG_CMD_PMIC
-       max89xx_init(I2C_5);
+       max8998_init(I2C_5);
        run_command("pmic ldo 4 off", 0);       /* adc off */
 #endif
 

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index ee6ff46..bef4131 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -36,7 +36,7 @@ COBJS-$(CONFIG_FSL_PMIC) += fsl_pmic.o
 COBJS-$(CONFIG_PDSP188x) += pdsp188x.o
 COBJS-$(CONFIG_CMD_RAMOOPS) += ramoops.o
 COBJS-$(CONFIG_CMD_MBR) += mbr.o
-COBJS-$(CONFIG_CMD_PMIC) += max89xx.o
+COBJS-$(CONFIG_CMD_PMIC) += max8998.o
 COBJS-$(CONFIG_INFO_ACTION) += info_action.o
 
 COBJS  := $(COBJS-y)

diff --git a/drivers/misc/max89xx.c b/drivers/misc/max8998.c
similarity index 99%
rename from drivers/misc/max89xx.c
rename to drivers/misc/max8998.c
index 4bd66a0..1efc877 100644 (file)
--- a/drivers/misc/max89xx.c
+++ b/drivers/misc/max8998.c
@@ -11,7 +11,7 @@
 
 unsigned int pmic_bus;
 
-void max89xx_init(int bus_num)
+void max8998_init(int bus_num)
 {
        pmic_bus = bus_num;
 }

diff --git a/include/max89xx.h b/include/max8998.h
similarity index 66%
rename from include/max89xx.h
rename to include/max8998.h
index bc88b3b..c61e628 100644 (file)
--- a/include/max89xx.h
+++ b/include/max8998.h
@@ -1,9 +1,9 @@
 /*
- * Command for max89xx serise pmic
+ * Command for max8998 / lp3974 pmic
  *
  * Copyright (C) 2011 Samsung Electrnoics
  * Minkyu Kang <mk7.kang@samsung.com>
  * Kyungmin Park <kyungmin.park@samsung.com>
  */
 
-void max89xx_init(int bus_num);
+void max8998_init(int bus_num);