diff options
author | Tomas Novotny <tomas@novotny.cz> | 2014-12-10 18:53:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 20:41:15 -0500 |
commit | f4199f8557774cfa38682c89c37388fa30367767 (patch) | |
tree | 8871062433aec3dadbfa4e3747a98ffc9282d2e8 /drivers/rtc | |
parent | 920f91e50c5bfcbc5fe68f46dc72a34a96e0ff16 (diff) |
rtc: ds1307: add support for mcp7940x chips
MCP7940x is same RTC as MCP7941x. The difference is that MCP7941x chips
contain additional EEPROM on a different i2c address.
DS1307 driver already supports MCP7941x, so just add a new i2c device id
and rename functions and defines accordingly.
Signed-off-by: Tomas Novotny <tomas@novotny.cz>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-ds1307.c | 127 |
1 files changed, 64 insertions, 63 deletions
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index bb43cf703efc..4ffabb322a9a 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c | |||
@@ -35,7 +35,7 @@ enum ds_type { | |||
35 | ds_1388, | 35 | ds_1388, |
36 | ds_3231, | 36 | ds_3231, |
37 | m41t00, | 37 | m41t00, |
38 | mcp7941x, | 38 | mcp794xx, |
39 | rx_8025, | 39 | rx_8025, |
40 | last_ds_type /* always last */ | 40 | last_ds_type /* always last */ |
41 | /* rs5c372 too? different address... */ | 41 | /* rs5c372 too? different address... */ |
@@ -46,7 +46,7 @@ enum ds_type { | |||
46 | #define DS1307_REG_SECS 0x00 /* 00-59 */ | 46 | #define DS1307_REG_SECS 0x00 /* 00-59 */ |
47 | # define DS1307_BIT_CH 0x80 | 47 | # define DS1307_BIT_CH 0x80 |
48 | # define DS1340_BIT_nEOSC 0x80 | 48 | # define DS1340_BIT_nEOSC 0x80 |
49 | # define MCP7941X_BIT_ST 0x80 | 49 | # define MCP794XX_BIT_ST 0x80 |
50 | #define DS1307_REG_MIN 0x01 /* 00-59 */ | 50 | #define DS1307_REG_MIN 0x01 /* 00-59 */ |
51 | #define DS1307_REG_HOUR 0x02 /* 00-23, or 1-12{am,pm} */ | 51 | #define DS1307_REG_HOUR 0x02 /* 00-23, or 1-12{am,pm} */ |
52 | # define DS1307_BIT_12HR 0x40 /* in REG_HOUR */ | 52 | # define DS1307_BIT_12HR 0x40 /* in REG_HOUR */ |
@@ -54,7 +54,7 @@ enum ds_type { | |||
54 | # define DS1340_BIT_CENTURY_EN 0x80 /* in REG_HOUR */ | 54 | # define DS1340_BIT_CENTURY_EN 0x80 /* in REG_HOUR */ |
55 | # define DS1340_BIT_CENTURY 0x40 /* in REG_HOUR */ | 55 | # define DS1340_BIT_CENTURY 0x40 /* in REG_HOUR */ |
56 | #define DS1307_REG_WDAY 0x03 /* 01-07 */ | 56 | #define DS1307_REG_WDAY 0x03 /* 01-07 */ |
57 | # define MCP7941X_BIT_VBATEN 0x08 | 57 | # define MCP794XX_BIT_VBATEN 0x08 |
58 | #define DS1307_REG_MDAY 0x04 /* 01-31 */ | 58 | #define DS1307_REG_MDAY 0x04 /* 01-31 */ |
59 | #define DS1307_REG_MONTH 0x05 /* 01-12 */ | 59 | #define DS1307_REG_MONTH 0x05 /* 01-12 */ |
60 | # define DS1337_BIT_CENTURY 0x80 /* in REG_MONTH */ | 60 | # define DS1337_BIT_CENTURY 0x80 /* in REG_MONTH */ |
@@ -159,7 +159,7 @@ static struct chip_desc chips[last_ds_type] = { | |||
159 | [ds_3231] = { | 159 | [ds_3231] = { |
160 | .alarm = 1, | 160 | .alarm = 1, |
161 | }, | 161 | }, |
162 | [mcp7941x] = { | 162 | [mcp794xx] = { |
163 | .alarm = 1, | 163 | .alarm = 1, |
164 | /* this is battery backed SRAM */ | 164 | /* this is battery backed SRAM */ |
165 | .nvram_offset = 0x20, | 165 | .nvram_offset = 0x20, |
@@ -176,7 +176,8 @@ static const struct i2c_device_id ds1307_id[] = { | |||
176 | { "ds1340", ds_1340 }, | 176 | { "ds1340", ds_1340 }, |
177 | { "ds3231", ds_3231 }, | 177 | { "ds3231", ds_3231 }, |
178 | { "m41t00", m41t00 }, | 178 | { "m41t00", m41t00 }, |
179 | { "mcp7941x", mcp7941x }, | 179 | { "mcp7940x", mcp794xx }, |
180 | { "mcp7941x", mcp794xx }, | ||
180 | { "pt7c4338", ds_1307 }, | 181 | { "pt7c4338", ds_1307 }, |
181 | { "rx8025", rx_8025 }, | 182 | { "rx8025", rx_8025 }, |
182 | { } | 183 | { } |
@@ -439,14 +440,14 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t) | |||
439 | buf[DS1307_REG_HOUR] |= DS1340_BIT_CENTURY_EN | 440 | buf[DS1307_REG_HOUR] |= DS1340_BIT_CENTURY_EN |
440 | | DS1340_BIT_CENTURY; | 441 | | DS1340_BIT_CENTURY; |
441 | break; | 442 | break; |
442 | case mcp7941x: | 443 | case mcp794xx: |
443 | /* | 444 | /* |
444 | * these bits were cleared when preparing the date/time | 445 | * these bits were cleared when preparing the date/time |
445 | * values and need to be set again before writing the | 446 | * values and need to be set again before writing the |
446 | * buffer out to the device. | 447 | * buffer out to the device. |
447 | */ | 448 | */ |
448 | buf[DS1307_REG_SECS] |= MCP7941X_BIT_ST; | 449 | buf[DS1307_REG_SECS] |= MCP794XX_BIT_ST; |
449 | buf[DS1307_REG_WDAY] |= MCP7941X_BIT_VBATEN; | 450 | buf[DS1307_REG_WDAY] |= MCP794XX_BIT_VBATEN; |
450 | break; | 451 | break; |
451 | default: | 452 | default: |
452 | break; | 453 | break; |
@@ -614,26 +615,26 @@ static const struct rtc_class_ops ds13xx_rtc_ops = { | |||
614 | /*----------------------------------------------------------------------*/ | 615 | /*----------------------------------------------------------------------*/ |
615 | 616 | ||
616 | /* | 617 | /* |
617 | * Alarm support for mcp7941x devices. | 618 | * Alarm support for mcp794xx devices. |
618 | */ | 619 | */ |
619 | 620 | ||
620 | #define MCP7941X_REG_CONTROL 0x07 | 621 | #define MCP794XX_REG_CONTROL 0x07 |
621 | # define MCP7941X_BIT_ALM0_EN 0x10 | 622 | # define MCP794XX_BIT_ALM0_EN 0x10 |
622 | # define MCP7941X_BIT_ALM1_EN 0x20 | 623 | # define MCP794XX_BIT_ALM1_EN 0x20 |
623 | #define MCP7941X_REG_ALARM0_BASE 0x0a | 624 | #define MCP794XX_REG_ALARM0_BASE 0x0a |
624 | #define MCP7941X_REG_ALARM0_CTRL 0x0d | 625 | #define MCP794XX_REG_ALARM0_CTRL 0x0d |
625 | #define MCP7941X_REG_ALARM1_BASE 0x11 | 626 | #define MCP794XX_REG_ALARM1_BASE 0x11 |
626 | #define MCP7941X_REG_ALARM1_CTRL 0x14 | 627 | #define MCP794XX_REG_ALARM1_CTRL 0x14 |
627 | # define MCP7941X_BIT_ALMX_IF (1 << 3) | 628 | # define MCP794XX_BIT_ALMX_IF (1 << 3) |
628 | # define MCP7941X_BIT_ALMX_C0 (1 << 4) | 629 | # define MCP794XX_BIT_ALMX_C0 (1 << 4) |
629 | # define MCP7941X_BIT_ALMX_C1 (1 << 5) | 630 | # define MCP794XX_BIT_ALMX_C1 (1 << 5) |
630 | # define MCP7941X_BIT_ALMX_C2 (1 << 6) | 631 | # define MCP794XX_BIT_ALMX_C2 (1 << 6) |
631 | # define MCP7941X_BIT_ALMX_POL (1 << 7) | 632 | # define MCP794XX_BIT_ALMX_POL (1 << 7) |
632 | # define MCP7941X_MSK_ALMX_MATCH (MCP7941X_BIT_ALMX_C0 | \ | 633 | # define MCP794XX_MSK_ALMX_MATCH (MCP794XX_BIT_ALMX_C0 | \ |
633 | MCP7941X_BIT_ALMX_C1 | \ | 634 | MCP794XX_BIT_ALMX_C1 | \ |
634 | MCP7941X_BIT_ALMX_C2) | 635 | MCP794XX_BIT_ALMX_C2) |
635 | 636 | ||
636 | static void mcp7941x_work(struct work_struct *work) | 637 | static void mcp794xx_work(struct work_struct *work) |
637 | { | 638 | { |
638 | struct ds1307 *ds1307 = container_of(work, struct ds1307, work); | 639 | struct ds1307 *ds1307 = container_of(work, struct ds1307, work); |
639 | struct i2c_client *client = ds1307->client; | 640 | struct i2c_client *client = ds1307->client; |
@@ -642,22 +643,22 @@ static void mcp7941x_work(struct work_struct *work) | |||
642 | mutex_lock(&ds1307->rtc->ops_lock); | 643 | mutex_lock(&ds1307->rtc->ops_lock); |
643 | 644 | ||
644 | /* Check and clear alarm 0 interrupt flag. */ | 645 | /* Check and clear alarm 0 interrupt flag. */ |
645 | reg = i2c_smbus_read_byte_data(client, MCP7941X_REG_ALARM0_CTRL); | 646 | reg = i2c_smbus_read_byte_data(client, MCP794XX_REG_ALARM0_CTRL); |
646 | if (reg < 0) | 647 | if (reg < 0) |
647 | goto out; | 648 | goto out; |
648 | if (!(reg & MCP7941X_BIT_ALMX_IF)) | 649 | if (!(reg & MCP794XX_BIT_ALMX_IF)) |
649 | goto out; | 650 | goto out; |
650 | reg &= ~MCP7941X_BIT_ALMX_IF; | 651 | reg &= ~MCP794XX_BIT_ALMX_IF; |
651 | ret = i2c_smbus_write_byte_data(client, MCP7941X_REG_ALARM0_CTRL, reg); | 652 | ret = i2c_smbus_write_byte_data(client, MCP794XX_REG_ALARM0_CTRL, reg); |
652 | if (ret < 0) | 653 | if (ret < 0) |
653 | goto out; | 654 | goto out; |
654 | 655 | ||
655 | /* Disable alarm 0. */ | 656 | /* Disable alarm 0. */ |
656 | reg = i2c_smbus_read_byte_data(client, MCP7941X_REG_CONTROL); | 657 | reg = i2c_smbus_read_byte_data(client, MCP794XX_REG_CONTROL); |
657 | if (reg < 0) | 658 | if (reg < 0) |
658 | goto out; | 659 | goto out; |
659 | reg &= ~MCP7941X_BIT_ALM0_EN; | 660 | reg &= ~MCP794XX_BIT_ALM0_EN; |
660 | ret = i2c_smbus_write_byte_data(client, MCP7941X_REG_CONTROL, reg); | 661 | ret = i2c_smbus_write_byte_data(client, MCP794XX_REG_CONTROL, reg); |
661 | if (ret < 0) | 662 | if (ret < 0) |
662 | goto out; | 663 | goto out; |
663 | 664 | ||
@@ -669,7 +670,7 @@ out: | |||
669 | mutex_unlock(&ds1307->rtc->ops_lock); | 670 | mutex_unlock(&ds1307->rtc->ops_lock); |
670 | } | 671 | } |
671 | 672 | ||
672 | static int mcp7941x_read_alarm(struct device *dev, struct rtc_wkalrm *t) | 673 | static int mcp794xx_read_alarm(struct device *dev, struct rtc_wkalrm *t) |
673 | { | 674 | { |
674 | struct i2c_client *client = to_i2c_client(dev); | 675 | struct i2c_client *client = to_i2c_client(dev); |
675 | struct ds1307 *ds1307 = i2c_get_clientdata(client); | 676 | struct ds1307 *ds1307 = i2c_get_clientdata(client); |
@@ -680,11 +681,11 @@ static int mcp7941x_read_alarm(struct device *dev, struct rtc_wkalrm *t) | |||
680 | return -EINVAL; | 681 | return -EINVAL; |
681 | 682 | ||
682 | /* Read control and alarm 0 registers. */ | 683 | /* Read control and alarm 0 registers. */ |
683 | ret = ds1307->read_block_data(client, MCP7941X_REG_CONTROL, 10, regs); | 684 | ret = ds1307->read_block_data(client, MCP794XX_REG_CONTROL, 10, regs); |
684 | if (ret < 0) | 685 | if (ret < 0) |
685 | return ret; | 686 | return ret; |
686 | 687 | ||
687 | t->enabled = !!(regs[0] & MCP7941X_BIT_ALM0_EN); | 688 | t->enabled = !!(regs[0] & MCP794XX_BIT_ALM0_EN); |
688 | 689 | ||
689 | /* Report alarm 0 time assuming 24-hour and day-of-month modes. */ | 690 | /* Report alarm 0 time assuming 24-hour and day-of-month modes. */ |
690 | t->time.tm_sec = bcd2bin(ds1307->regs[3] & 0x7f); | 691 | t->time.tm_sec = bcd2bin(ds1307->regs[3] & 0x7f); |
@@ -701,14 +702,14 @@ static int mcp7941x_read_alarm(struct device *dev, struct rtc_wkalrm *t) | |||
701 | "enabled=%d polarity=%d irq=%d match=%d\n", __func__, | 702 | "enabled=%d polarity=%d irq=%d match=%d\n", __func__, |
702 | t->time.tm_sec, t->time.tm_min, t->time.tm_hour, | 703 | t->time.tm_sec, t->time.tm_min, t->time.tm_hour, |
703 | t->time.tm_wday, t->time.tm_mday, t->time.tm_mon, t->enabled, | 704 | t->time.tm_wday, t->time.tm_mday, t->time.tm_mon, t->enabled, |
704 | !!(ds1307->regs[6] & MCP7941X_BIT_ALMX_POL), | 705 | !!(ds1307->regs[6] & MCP794XX_BIT_ALMX_POL), |
705 | !!(ds1307->regs[6] & MCP7941X_BIT_ALMX_IF), | 706 | !!(ds1307->regs[6] & MCP794XX_BIT_ALMX_IF), |
706 | (ds1307->regs[6] & MCP7941X_MSK_ALMX_MATCH) >> 4); | 707 | (ds1307->regs[6] & MCP794XX_MSK_ALMX_MATCH) >> 4); |
707 | 708 | ||
708 | return 0; | 709 | return 0; |
709 | } | 710 | } |
710 | 711 | ||
711 | static int mcp7941x_set_alarm(struct device *dev, struct rtc_wkalrm *t) | 712 | static int mcp794xx_set_alarm(struct device *dev, struct rtc_wkalrm *t) |
712 | { | 713 | { |
713 | struct i2c_client *client = to_i2c_client(dev); | 714 | struct i2c_client *client = to_i2c_client(dev); |
714 | struct ds1307 *ds1307 = i2c_get_clientdata(client); | 715 | struct ds1307 *ds1307 = i2c_get_clientdata(client); |
@@ -725,7 +726,7 @@ static int mcp7941x_set_alarm(struct device *dev, struct rtc_wkalrm *t) | |||
725 | t->enabled, t->pending); | 726 | t->enabled, t->pending); |
726 | 727 | ||
727 | /* Read control and alarm 0 registers. */ | 728 | /* Read control and alarm 0 registers. */ |
728 | ret = ds1307->read_block_data(client, MCP7941X_REG_CONTROL, 10, regs); | 729 | ret = ds1307->read_block_data(client, MCP794XX_REG_CONTROL, 10, regs); |
729 | if (ret < 0) | 730 | if (ret < 0) |
730 | return ret; | 731 | return ret; |
731 | 732 | ||
@@ -738,23 +739,23 @@ static int mcp7941x_set_alarm(struct device *dev, struct rtc_wkalrm *t) | |||
738 | regs[8] = bin2bcd(t->time.tm_mon) + 1; | 739 | regs[8] = bin2bcd(t->time.tm_mon) + 1; |
739 | 740 | ||
740 | /* Clear the alarm 0 interrupt flag. */ | 741 | /* Clear the alarm 0 interrupt flag. */ |
741 | regs[6] &= ~MCP7941X_BIT_ALMX_IF; | 742 | regs[6] &= ~MCP794XX_BIT_ALMX_IF; |
742 | /* Set alarm match: second, minute, hour, day, date, month. */ | 743 | /* Set alarm match: second, minute, hour, day, date, month. */ |
743 | regs[6] |= MCP7941X_MSK_ALMX_MATCH; | 744 | regs[6] |= MCP794XX_MSK_ALMX_MATCH; |
744 | 745 | ||
745 | if (t->enabled) | 746 | if (t->enabled) |
746 | regs[0] |= MCP7941X_BIT_ALM0_EN; | 747 | regs[0] |= MCP794XX_BIT_ALM0_EN; |
747 | else | 748 | else |
748 | regs[0] &= ~MCP7941X_BIT_ALM0_EN; | 749 | regs[0] &= ~MCP794XX_BIT_ALM0_EN; |
749 | 750 | ||
750 | ret = ds1307->write_block_data(client, MCP7941X_REG_CONTROL, 10, regs); | 751 | ret = ds1307->write_block_data(client, MCP794XX_REG_CONTROL, 10, regs); |
751 | if (ret < 0) | 752 | if (ret < 0) |
752 | return ret; | 753 | return ret; |
753 | 754 | ||
754 | return 0; | 755 | return 0; |
755 | } | 756 | } |
756 | 757 | ||
757 | static int mcp7941x_alarm_irq_enable(struct device *dev, unsigned int enabled) | 758 | static int mcp794xx_alarm_irq_enable(struct device *dev, unsigned int enabled) |
758 | { | 759 | { |
759 | struct i2c_client *client = to_i2c_client(dev); | 760 | struct i2c_client *client = to_i2c_client(dev); |
760 | struct ds1307 *ds1307 = i2c_get_clientdata(client); | 761 | struct ds1307 *ds1307 = i2c_get_clientdata(client); |
@@ -763,24 +764,24 @@ static int mcp7941x_alarm_irq_enable(struct device *dev, unsigned int enabled) | |||
763 | if (!test_bit(HAS_ALARM, &ds1307->flags)) | 764 | if (!test_bit(HAS_ALARM, &ds1307->flags)) |
764 | return -EINVAL; | 765 | return -EINVAL; |
765 | 766 | ||
766 | reg = i2c_smbus_read_byte_data(client, MCP7941X_REG_CONTROL); | 767 | reg = i2c_smbus_read_byte_data(client, MCP794XX_REG_CONTROL); |
767 | if (reg < 0) | 768 | if (reg < 0) |
768 | return reg; | 769 | return reg; |
769 | 770 | ||
770 | if (enabled) | 771 | if (enabled) |
771 | reg |= MCP7941X_BIT_ALM0_EN; | 772 | reg |= MCP794XX_BIT_ALM0_EN; |
772 | else | 773 | else |
773 | reg &= ~MCP7941X_BIT_ALM0_EN; | 774 | reg &= ~MCP794XX_BIT_ALM0_EN; |
774 | 775 | ||
775 | return i2c_smbus_write_byte_data(client, MCP7941X_REG_CONTROL, reg); | 776 | return i2c_smbus_write_byte_data(client, MCP794XX_REG_CONTROL, reg); |
776 | } | 777 | } |
777 | 778 | ||
778 | static const struct rtc_class_ops mcp7941x_rtc_ops = { | 779 | static const struct rtc_class_ops mcp794xx_rtc_ops = { |
779 | .read_time = ds1307_get_time, | 780 | .read_time = ds1307_get_time, |
780 | .set_time = ds1307_set_time, | 781 | .set_time = ds1307_set_time, |
781 | .read_alarm = mcp7941x_read_alarm, | 782 | .read_alarm = mcp794xx_read_alarm, |
782 | .set_alarm = mcp7941x_set_alarm, | 783 | .set_alarm = mcp794xx_set_alarm, |
783 | .alarm_irq_enable = mcp7941x_alarm_irq_enable, | 784 | .alarm_irq_enable = mcp794xx_alarm_irq_enable, |
784 | }; | 785 | }; |
785 | 786 | ||
786 | /*----------------------------------------------------------------------*/ | 787 | /*----------------------------------------------------------------------*/ |
@@ -1049,10 +1050,10 @@ static int ds1307_probe(struct i2c_client *client, | |||
1049 | case ds_1388: | 1050 | case ds_1388: |
1050 | ds1307->offset = 1; /* Seconds starts at 1 */ | 1051 | ds1307->offset = 1; /* Seconds starts at 1 */ |
1051 | break; | 1052 | break; |
1052 | case mcp7941x: | 1053 | case mcp794xx: |
1053 | rtc_ops = &mcp7941x_rtc_ops; | 1054 | rtc_ops = &mcp794xx_rtc_ops; |
1054 | if (ds1307->client->irq > 0 && chip->alarm) { | 1055 | if (ds1307->client->irq > 0 && chip->alarm) { |
1055 | INIT_WORK(&ds1307->work, mcp7941x_work); | 1056 | INIT_WORK(&ds1307->work, mcp794xx_work); |
1056 | want_irq = true; | 1057 | want_irq = true; |
1057 | } | 1058 | } |
1058 | break; | 1059 | break; |
@@ -1117,18 +1118,18 @@ read_rtc: | |||
1117 | dev_warn(&client->dev, "SET TIME!\n"); | 1118 | dev_warn(&client->dev, "SET TIME!\n"); |
1118 | } | 1119 | } |
1119 | break; | 1120 | break; |
1120 | case mcp7941x: | 1121 | case mcp794xx: |
1121 | /* make sure that the backup battery is enabled */ | 1122 | /* make sure that the backup battery is enabled */ |
1122 | if (!(ds1307->regs[DS1307_REG_WDAY] & MCP7941X_BIT_VBATEN)) { | 1123 | if (!(ds1307->regs[DS1307_REG_WDAY] & MCP794XX_BIT_VBATEN)) { |
1123 | i2c_smbus_write_byte_data(client, DS1307_REG_WDAY, | 1124 | i2c_smbus_write_byte_data(client, DS1307_REG_WDAY, |
1124 | ds1307->regs[DS1307_REG_WDAY] | 1125 | ds1307->regs[DS1307_REG_WDAY] |
1125 | | MCP7941X_BIT_VBATEN); | 1126 | | MCP794XX_BIT_VBATEN); |
1126 | } | 1127 | } |
1127 | 1128 | ||
1128 | /* clock halted? turn it on, so clock can tick. */ | 1129 | /* clock halted? turn it on, so clock can tick. */ |
1129 | if (!(tmp & MCP7941X_BIT_ST)) { | 1130 | if (!(tmp & MCP794XX_BIT_ST)) { |
1130 | i2c_smbus_write_byte_data(client, DS1307_REG_SECS, | 1131 | i2c_smbus_write_byte_data(client, DS1307_REG_SECS, |
1131 | MCP7941X_BIT_ST); | 1132 | MCP794XX_BIT_ST); |
1132 | dev_warn(&client->dev, "SET TIME!\n"); | 1133 | dev_warn(&client->dev, "SET TIME!\n"); |
1133 | goto read_rtc; | 1134 | goto read_rtc; |
1134 | } | 1135 | } |