mfd: mt6397: Rename macros to something more readable

[linux-2.6-microblaze.git] / drivers / mfd / mt6397-core.c

diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 337bccc..c070862 100644 (file)
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -10,17 +10,17 @@
 #include <linux/of_irq.h>
 #include <linux/regmap.h>
 #include <linux/mfd/core.h>
-#include <linux/mfd/mt6397/core.h>
 #include <linux/mfd/mt6323/core.h>
-#include <linux/mfd/mt6397/registers.h>
+#include <linux/mfd/mt6397/core.h>
 #include <linux/mfd/mt6323/registers.h>
+#include <linux/mfd/mt6397/registers.h>
 
 #define MT6397_RTC_BASE                0xe000
 #define MT6397_RTC_SIZE                0x3e
 
-#define MT6323_CID_CODE                0x23
-#define MT6391_CID_CODE                0x91
-#define MT6397_CID_CODE                0x97
+#define MT6323_CHIP_ID         0x23
+#define MT6391_CHIP_ID         0x91
+#define MT6397_CHIP_ID         0x97
 
 static const struct resource mt6397_rtc_resources[] = {
        {
@@ -290,7 +290,7 @@ static int mt6397_probe(struct platform_device *pdev)
                return pmic->irq;
 
        switch (id & 0xff) {
-       case MT6323_CID_CODE:
+       case MT6323_CHIP_ID:
                pmic->int_con[0] = MT6323_INT_CON0;
                pmic->int_con[1] = MT6323_INT_CON1;
                pmic->int_status[0] = MT6323_INT_STATUS0;
@@ -304,8 +304,8 @@ static int mt6397_probe(struct platform_device *pdev)
                                           0, pmic->irq_domain);
                break;
 
-       case MT6397_CID_CODE:
-       case MT6391_CID_CODE:
+       case MT6391_CHIP_ID:
+       case MT6397_CHIP_ID:
                pmic->int_con[0] = MT6397_INT_CON0;
                pmic->int_con[1] = MT6397_INT_CON1;
                pmic->int_status[0] = MT6397_INT_STATUS0;