Unified · Split
| @@ -10,17 +10,17 @@ · 9 unmodified lines | ||
| 10 | 10 | #include <linux/of_irq.h> |
| 11 | 11 | #include <linux/regmap.h> |
| 12 | 12 | #include <linux/mfd/core.h> |
| 13 | −#include <linux/mfd/mt6397/core.h> | |
| 14 | 13 | #include <linux/mfd/mt6323/core.h> |
| 15 | −#include <linux/mfd/mt6397/registers.h> | |
| 14 | +#include <linux/mfd/mt6397/core.h> | |
| 16 | 15 | #include <linux/mfd/mt6323/registers.h> |
| 16 | +#include <linux/mfd/mt6397/registers.h> | |
| 17 | 17 | |
| 18 | 18 | #define MT6397_RTC_BASE 0xe000 |
| 19 | 19 | #define MT6397_RTC_SIZE 0x3e |
| 20 | 20 | |
| 21 | −#define MT6323_CID_CODE 0x23 | |
| 22 | −#define MT6391_CID_CODE 0x91 | |
| 23 | −#define MT6397_CID_CODE 0x97 | |
| 21 | +#define MT6323_CHIP_ID 0x23 | |
| 22 | +#define MT6391_CHIP_ID 0x91 | |
| 23 | +#define MT6397_CHIP_ID 0x97 | |
| 24 | 24 | |
| 25 | 25 | static const struct resource mt6397_rtc_resources[] = { |
| 26 | 26 | { |
| @@ -290,7 +290,7 @@ static int mt6397_probe(struct platform_device *pdev) · 263 unmodified lines | ||
| 290 | 290 | return pmic->irq; |
| 291 | 291 | |
| 292 | 292 | switch (id & 0xff) { |
| 293 | − case MT6323_CID_CODE: | |
| 293 | + case MT6323_CHIP_ID: | |
| 294 | 294 | pmic->int_con[0] = MT6323_INT_CON0; |
| 295 | 295 | pmic->int_con[1] = MT6323_INT_CON1; |
| 296 | 296 | pmic->int_status[0] = MT6323_INT_STATUS0; |
| @@ -304,8 +304,8 @@ static int mt6397_probe(struct platform_device *pdev) · 7 unmodified lines | ||
| 304 | 304 | 0, pmic->irq_domain); |
| 305 | 305 | break; |
| 306 | 306 | |
| 307 | − case MT6397_CID_CODE: | |
| 308 | − case MT6391_CID_CODE: | |
| 307 | + case MT6391_CHIP_ID: | |
| 308 | + case MT6397_CHIP_ID: | |
| 309 | 309 | pmic->int_con[0] = MT6397_INT_CON0; |
| 310 | 310 | pmic->int_con[1] = MT6397_INT_CON1; |
| 311 | 311 | pmic->int_status[0] = MT6397_INT_STATUS0; |