diff for duplicates of <20160808115707.GP5243@dell> diff --git a/a/1.txt b/N1/1.txt index 7d505ac..b21191b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,11 +3,11 @@ On Fri, 08 Jul 2016, Alexandre Belloni wrote: > On 08/07/2016 at 22:33:38 +0800, Chen-Yu Tsai wrote : > > X-Powers AC100 is a codec / RTC combo chip. This driver supports > > the RTC sub-device. -> >=20 +> > > > The RTC block also has clock outputs and non-volatile storage. > > Non-volatile storage wthin the RTC hardware is not supported. > > Clock output support is added in the next patch. -> >=20 +> > > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> @@ -15,33 +15,32 @@ Applied, thanks. > > --- > > Changes since v4: -> >=20 +> > > > - None. -> >=20 +> > > > Changes since v3: -> >=20 +> > > > - Moved month/year conversion offsets inline with reg[] assignments > > - Used platform_get_irq instead of of_get_irq > > - Dropped separate mutex and use rtc->ops_lock in interrupt handler > > - Dropped of_irq.h from includes > > - Added of_device_id and .of_match_table -> >=20 +> > > > Changes since v2: -> >=20 +> > > > - Fixed off-by-1 errors in register mask macros > > - Fixed copy-paste error in set_alarm function > > - Drop uie_unsupported, since the alarm works now > > - Fixed up copyright notice > > - Changed license to GPL v2, matching mfd driver -> >=20 +> > > > --- > > drivers/rtc/Kconfig | 10 ++ > > drivers/rtc/Makefile | 1 + -> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++= -++++++++ +> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 336 insertions(+) > > create mode 100644 drivers/rtc/rtc-ac100.c -> >=20 +> > > > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig > > index 18639e0cb6e2..b9d7cbb6bd76 100644 > > --- a/drivers/rtc/Kconfig @@ -49,7 +48,7 @@ Applied, thanks. > > @@ -183,6 +183,16 @@ config RTC_DRV_ABX80X > > This driver can also be built as a module. If so, the module > > will be called rtc-abx80x. -> > =20 +> > > > +config RTC_DRV_AC100 > > + tristate "X-Powers AC100" > > + depends on MFD_AC100 @@ -67,14 +66,14 @@ Applied, thanks. > > index ea2833723fa9..b07c28779573 100644 > > --- a/drivers/rtc/Makefile > > +++ b/drivers/rtc/Makefile -> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100) +=3D rtc-ab3100.o -> > obj-$(CONFIG_RTC_DRV_AB8500) +=3D rtc-ab8500.o -> > obj-$(CONFIG_RTC_DRV_ABB5ZES3) +=3D rtc-ab-b5ze-s3.o -> > obj-$(CONFIG_RTC_DRV_ABX80X) +=3D rtc-abx80x.o -> > +obj-$(CONFIG_RTC_DRV_AC100) +=3D rtc-ac100.o -> > obj-$(CONFIG_RTC_DRV_ARMADA38X) +=3D rtc-armada38x.o -> > obj-$(CONFIG_RTC_DRV_AS3722) +=3D rtc-as3722.o -> > obj-$(CONFIG_RTC_DRV_ASM9260) +=3D rtc-asm9260.o +> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100) += rtc-ab3100.o +> > obj-$(CONFIG_RTC_DRV_AB8500) += rtc-ab8500.o +> > obj-$(CONFIG_RTC_DRV_ABB5ZES3) += rtc-ab-b5ze-s3.o +> > obj-$(CONFIG_RTC_DRV_ABX80X) += rtc-abx80x.o +> > +obj-$(CONFIG_RTC_DRV_AC100) += rtc-ac100.o +> > obj-$(CONFIG_RTC_DRV_ARMADA38X) += rtc-armada38x.o +> > obj-$(CONFIG_RTC_DRV_AS3722) += rtc-as3722.o +> > obj-$(CONFIG_RTC_DRV_ASM9260) += rtc-asm9260.o > > diff --git a/drivers/rtc/rtc-ac100.c b/drivers/rtc/rtc-ac100.c > > new file mode 100644 > > index 000000000000..5a9ca89d04c7 @@ -88,17 +87,13 @@ Applied, thanks. > > + * > > + * Chen-Yu Tsai <wens@csie.org> > > + * -> > + * This program is free software; you can redistribute it and/or modif= -y +> > + * This program is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License version 2 as > > + * published by the Free Software Foundation. > > + * -> > + * This program is distributed in the hope that it will be useful, but= - WITHOUT -> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY = -or -> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licen= -se for +> > + * This program is distributed in the hope that it will be useful, but WITHOUT +> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > > + * more details. > > + */ > > + @@ -143,14 +138,11 @@ se for > > +#define AC100_ALM_UPD_TRIGGER BIT(15) > > + > > +/* -> > + * The year parameter passed to the driver is usually an offset relati= -ve to -> > + * the year 1900. This macro is used to convert this offset to another= - one +> > + * The year parameter passed to the driver is usually an offset relative to +> > + * the year 1900. This macro is used to convert this offset to another one > > + * relative to the minimum year allowed by the hardware. > > + * -> > + * The year range is 1970 - 2069. This range is selected to match Allw= -inner's +> > + * The year range is 1970 - 2069. This range is selected to match Allwinner's > > + * driver. > > + */ > > +#define AC100_YEAR_MIN 1970 @@ -165,40 +157,38 @@ inner's > > + unsigned long alarm; > > +}; > > + -> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc= -_tm) +> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc_tm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; > > + u16 reg[7]; > > + int ret; > > + -> > + ret =3D regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7); +> > + ret = regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7); > > + if (ret) > > + return ret; > > + -> > + rtc_tm->tm_sec =3D bcd2bin(reg[0] & AC100_RTC_SEC_MASK); -> > + rtc_tm->tm_min =3D bcd2bin(reg[1] & AC100_RTC_MIN_MASK); -> > + rtc_tm->tm_hour =3D bcd2bin(reg[2] & AC100_RTC_HOU_MASK); -> > + rtc_tm->tm_wday =3D bcd2bin(reg[3] & AC100_RTC_WEE_MASK); -> > + rtc_tm->tm_mday =3D bcd2bin(reg[4] & AC100_RTC_DAY_MASK); -> > + rtc_tm->tm_mon =3D bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1; -> > + rtc_tm->tm_year =3D bcd2bin(reg[6] & AC100_RTC_YEA_MASK) + +> > + rtc_tm->tm_sec = bcd2bin(reg[0] & AC100_RTC_SEC_MASK); +> > + rtc_tm->tm_min = bcd2bin(reg[1] & AC100_RTC_MIN_MASK); +> > + rtc_tm->tm_hour = bcd2bin(reg[2] & AC100_RTC_HOU_MASK); +> > + rtc_tm->tm_wday = bcd2bin(reg[3] & AC100_RTC_WEE_MASK); +> > + rtc_tm->tm_mday = bcd2bin(reg[4] & AC100_RTC_DAY_MASK); +> > + rtc_tm->tm_mon = bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1; +> > + rtc_tm->tm_year = bcd2bin(reg[6] & AC100_RTC_YEA_MASK) + > > + AC100_YEAR_OFF; > > + > > + return rtc_valid_tm(rtc_tm); > > +} > > + -> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc= -_tm) +> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; > > + int year; > > + u16 reg[8]; > > + > > + /* our RTC has a limited year range... */ -> > + year =3D rtc_tm->tm_year - AC100_YEAR_OFF; +> > + year = rtc_tm->tm_year - AC100_YEAR_OFF; > > + if (year < 0 || year > (AC100_YEAR_MAX - 1900)) { > > + dev_err(dev, "rtc only supports year in range %d - %d\n", > > + AC100_YEAR_MIN, AC100_YEAR_MAX); @@ -206,79 +196,76 @@ _tm) > > + } > > + > > + /* convert to BCD */ -> > + reg[0] =3D bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK; -> > + reg[1] =3D bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK; -> > + reg[2] =3D bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK; -> > + reg[3] =3D bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK; -> > + reg[4] =3D bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK; -> > + reg[5] =3D bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK; -> > + reg[6] =3D bin2bcd(year) & AC100_RTC_YEA_MASK; +> > + reg[0] = bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK; +> > + reg[1] = bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK; +> > + reg[2] = bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK; +> > + reg[3] = bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK; +> > + reg[4] = bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK; +> > + reg[5] = bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK; +> > + reg[6] = bin2bcd(year) & AC100_RTC_YEA_MASK; > > + /* trigger write */ -> > + reg[7] =3D AC100_RTC_UPD_TRIGGER; +> > + reg[7] = AC100_RTC_UPD_TRIGGER; > > + > > + /* Is it a leap year? */ > > + if (is_leap_year(year + AC100_YEAR_OFF + 1900)) -> > + reg[6] |=3D AC100_RTC_YEA_LEAP; +> > + reg[6] |= AC100_RTC_YEA_LEAP; > > + > > + return regmap_bulk_write(regmap, AC100_RTC_SEC, reg, 8); > > +} > > + -> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int= - en) +> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int en) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; > > + unsigned int val; > > + -> > + val =3D en ? AC100_ALM_INT_ENABLE : 0; +> > + val = en ? AC100_ALM_INT_ENABLE : 0; > > + > > + return regmap_write(regmap, AC100_ALM_INT_ENA, val); > > +} > > + -> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *= -alrm) +> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *alrm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; -> > + struct rtc_time *alrm_tm =3D &alrm->time; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; +> > + struct rtc_time *alrm_tm = &alrm->time; > > + u16 reg[7]; > > + unsigned int val; > > + int ret; > > + -> > + ret =3D regmap_read(regmap, AC100_ALM_INT_ENA, &val); +> > + ret = regmap_read(regmap, AC100_ALM_INT_ENA, &val); > > + if (ret) > > + return ret; > > + -> > + alrm->enabled =3D !!(val & AC100_ALM_INT_ENABLE); +> > + alrm->enabled = !!(val & AC100_ALM_INT_ENABLE); > > + -> > + ret =3D regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7); +> > + ret = regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7); > > + if (ret) > > + return ret; > > + -> > + alrm_tm->tm_sec =3D bcd2bin(reg[0] & AC100_ALM_SEC_MASK); -> > + alrm_tm->tm_min =3D bcd2bin(reg[1] & AC100_ALM_MIN_MASK); -> > + alrm_tm->tm_hour =3D bcd2bin(reg[2] & AC100_ALM_HOU_MASK); -> > + alrm_tm->tm_wday =3D bcd2bin(reg[3] & AC100_ALM_WEE_MASK); -> > + alrm_tm->tm_mday =3D bcd2bin(reg[4] & AC100_ALM_DAY_MASK); -> > + alrm_tm->tm_mon =3D bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1; -> > + alrm_tm->tm_year =3D bcd2bin(reg[6] & AC100_ALM_YEA_MASK) + +> > + alrm_tm->tm_sec = bcd2bin(reg[0] & AC100_ALM_SEC_MASK); +> > + alrm_tm->tm_min = bcd2bin(reg[1] & AC100_ALM_MIN_MASK); +> > + alrm_tm->tm_hour = bcd2bin(reg[2] & AC100_ALM_HOU_MASK); +> > + alrm_tm->tm_wday = bcd2bin(reg[3] & AC100_ALM_WEE_MASK); +> > + alrm_tm->tm_mday = bcd2bin(reg[4] & AC100_ALM_DAY_MASK); +> > + alrm_tm->tm_mon = bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1; +> > + alrm_tm->tm_year = bcd2bin(reg[6] & AC100_ALM_YEA_MASK) + > > + AC100_YEAR_OFF; > > + > > + return 0; > > +} > > + -> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *= -alrm) +> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; -> > + struct rtc_time *alrm_tm =3D &alrm->time; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; +> > + struct rtc_time *alrm_tm = &alrm->time; > > + u16 reg[8]; > > + int year; > > + int ret; > > + > > + /* our alarm has a limited year range... */ -> > + year =3D alrm_tm->tm_year - AC100_YEAR_OFF; +> > + year = alrm_tm->tm_year - AC100_YEAR_OFF; > > + if (year < 0 || year > (AC100_YEAR_MAX - 1900)) { > > + dev_err(dev, "alarm only supports year in range %d - %d\n", > > + AC100_YEAR_MIN, AC100_YEAR_MAX); @@ -286,24 +273,24 @@ alrm) > > + } > > + > > + /* convert to BCD */ -> > + reg[0] =3D (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) | +> > + reg[0] = (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[1] =3D (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) | +> > + reg[1] = (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[2] =3D (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) | +> > + reg[2] = (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) | > > + AC100_ALM_ENABLE_FLAG; > > + /* Do not enable weekday alarm */ -> > + reg[3] =3D bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK; -> > + reg[4] =3D (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) | +> > + reg[3] = bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK; +> > + reg[4] = (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[5] =3D (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) | +> > + reg[5] = (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[6] =3D (bin2bcd(year) & AC100_ALM_YEA_MASK) | +> > + reg[6] = (bin2bcd(year) & AC100_ALM_YEA_MASK) | > > + AC100_ALM_ENABLE_FLAG; > > + /* trigger write */ -> > + reg[7] =3D AC100_ALM_UPD_TRIGGER; +> > + reg[7] = AC100_ALM_UPD_TRIGGER; > > + -> > + ret =3D regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8); +> > + ret = regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8); > > + if (ret) > > + return ret; > > + @@ -312,15 +299,15 @@ alrm) > > + > > +static irqreturn_t ac100_rtc_irq(int irq, void *data) > > +{ -> > + struct ac100_rtc_dev *chip =3D data; -> > + struct regmap *regmap =3D chip->regmap; -> > + unsigned int val =3D 0; +> > + struct ac100_rtc_dev *chip = data; +> > + struct regmap *regmap = chip->regmap; +> > + unsigned int val = 0; > > + int ret; > > + > > + mutex_lock(&chip->rtc->ops_lock); > > + > > + /* read status */ -> > + ret =3D regmap_read(regmap, AC100_ALM_INT_STA, &val); +> > + ret = regmap_read(regmap, AC100_ALM_INT_STA, &val); > > + if (ret) > > + goto out; > > + @@ -329,12 +316,12 @@ alrm) > > + rtc_update_irq(chip->rtc, 1, RTC_AF | RTC_IRQF); > > + > > + /* clear status */ -> > + ret =3D regmap_write(regmap, AC100_ALM_INT_STA, val); +> > + ret = regmap_write(regmap, AC100_ALM_INT_STA, val); > > + if (ret) > > + goto out; > > + > > + /* disable interrupt */ -> > + ret =3D ac100_rtc_alarm_irq_enable(chip->dev, 0); +> > + ret = ac100_rtc_alarm_irq_enable(chip->dev, 0); > > + if (ret) > > + goto out; > > + } @@ -344,32 +331,32 @@ alrm) > > + return IRQ_HANDLED; > > +} > > + -> > +static const struct rtc_class_ops ac100_rtc_ops =3D { -> > + .read_time =3D ac100_rtc_get_time, -> > + .set_time =3D ac100_rtc_set_time, -> > + .read_alarm =3D ac100_rtc_get_alarm, -> > + .set_alarm =3D ac100_rtc_set_alarm, -> > + .alarm_irq_enable =3D ac100_rtc_alarm_irq_enable, +> > +static const struct rtc_class_ops ac100_rtc_ops = { +> > + .read_time = ac100_rtc_get_time, +> > + .set_time = ac100_rtc_set_time, +> > + .read_alarm = ac100_rtc_get_alarm, +> > + .set_alarm = ac100_rtc_set_alarm, +> > + .alarm_irq_enable = ac100_rtc_alarm_irq_enable, > > +}; > > + > > +static int ac100_rtc_probe(struct platform_device *pdev) > > +{ -> > + struct ac100_dev *ac100 =3D dev_get_drvdata(pdev->dev.parent); +> > + struct ac100_dev *ac100 = dev_get_drvdata(pdev->dev.parent); > > + struct ac100_rtc_dev *chip; > > + int ret; > > + -> > + chip =3D devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL); +> > + chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL); > > + platform_set_drvdata(pdev, chip); -> > + chip->dev =3D &pdev->dev; -> > + chip->regmap =3D ac100->regmap; +> > + chip->dev = &pdev->dev; +> > + chip->regmap = ac100->regmap; > > + -> > + chip->irq =3D platform_get_irq(pdev, 0); +> > + chip->irq = platform_get_irq(pdev, 0); > > + if (chip->irq < 0) { > > + dev_err(&pdev->dev, "No IRQ resource\n"); > > + return chip->irq; > > + } > > + -> > + ret =3D devm_request_threaded_irq(&pdev->dev, chip->irq, NULL, +> > + ret = devm_request_threaded_irq(&pdev->dev, chip->irq, NULL, > > + ac100_rtc_irq, > > + IRQF_SHARED | IRQF_ONESHOT, > > + dev_name(&pdev->dev), chip); @@ -379,8 +366,7 @@ alrm) > > + } > > + > > + /* always use 24 hour mode */ -> > + regmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR= -, +> > + regmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR, > > + AC100_RTC_CTRL_24HOUR); > > + > > + /* disable counter alarm interrupt */ @@ -389,7 +375,7 @@ alrm) > > + /* clear counter alarm pending interrupts */ > > + regmap_write(chip->regmap, AC100_ALM_INT_STA, AC100_ALM_INT_ENABLE); > > + -> > + chip->rtc =3D devm_rtc_device_register(&pdev->dev, "rtc-ac100", +> > + chip->rtc = devm_rtc_device_register(&pdev->dev, "rtc-ac100", > > + &ac100_rtc_ops, THIS_MODULE); > > + if (IS_ERR(chip->rtc)) { > > + dev_err(&pdev->dev, "unable to register device\n"); @@ -401,17 +387,17 @@ alrm) > > + return 0; > > +} > > + -> > +static const struct of_device_id ac100_rtc_match[] =3D { -> > + { .compatible =3D "x-powers,ac100-rtc" }, +> > +static const struct of_device_id ac100_rtc_match[] = { +> > + { .compatible = "x-powers,ac100-rtc" }, > > + { }, > > +}; > > +MODULE_DEVICE_TABLE(of, ac100_rtc_match); > > + -> > +static struct platform_driver ac100_rtc_driver =3D { -> > + .probe =3D ac100_rtc_probe, -> > + .driver =3D { -> > + .name =3D "ac100-rtc", -> > + .of_match_table =3D of_match_ptr(ac100_rtc_match), +> > +static struct platform_driver ac100_rtc_driver = { +> > + .probe = ac100_rtc_probe, +> > + .driver = { +> > + .name = "ac100-rtc", +> > + .of_match_table = of_match_ptr(ac100_rtc_match), > > + }, > > +}; > > +module_platform_driver(ac100_rtc_driver); @@ -419,22 +405,10 @@ alrm) > > +MODULE_DESCRIPTION("X-Powers AC100 RTC driver"); > > +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>"); > > +MODULE_LICENSE("GPL v2"); ->=20 +> ---=20 +-- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org =E2=94=82 Open source software for ARM SoCs +Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog - ---=20 -You received this message because you are subscribed to "rtc-linux". -Membership options at http://groups.google.com/group/rtc-linux . -Please read http://groups.google.com/group/rtc-linux/web/checklist -before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. -For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N1/content_digest index 3cfaf36..809b9af 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,10 @@ "ref\01467988422-17934-1-git-send-email-wens@csie.org\0" "ref\01467988422-17934-4-git-send-email-wens@csie.org\0" "ref\020160708162152.GM22202@piout.net\0" - "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH v5 3/7] rtc: ac100: Add RTC driver for X-Powers AC100\0" + "From\0lee.jones@linaro.org (Lee Jones)\0" + "Subject\0[PATCH v5 3/7] rtc: ac100: Add RTC driver for X-Powers AC100\0" "Date\0Mon, 8 Aug 2016 12:57:07 +0100\0" - "To\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" - "Cc\0Chen-Yu Tsai <wens@csie.org>" - Alessandro Zummo <a.zummo@towertech.it> - Maxime Ripard <maxime.ripard@free-electrons.com> - linux-kernel@vger.kernel.org - rtc-linux@googlegroups.com - devicetree@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, 08 Jul 2016, Alexandre Belloni wrote:\n" @@ -19,11 +12,11 @@ "> On 08/07/2016 at 22:33:38 +0800, Chen-Yu Tsai wrote :\n" "> > X-Powers AC100 is a codec / RTC combo chip. This driver supports\n" "> > the RTC sub-device.\n" - "> >=20\n" + "> > \n" "> > The RTC block also has clock outputs and non-volatile storage.\n" "> > Non-volatile storage wthin the RTC hardware is not supported.\n" "> > Clock output support is added in the next patch.\n" - "> >=20\n" + "> > \n" "> > Signed-off-by: Chen-Yu Tsai <wens@csie.org>\n" "> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n" "\n" @@ -31,33 +24,32 @@ "\n" "> > ---\n" "> > Changes since v4:\n" - "> >=20\n" + "> > \n" "> > - None.\n" - "> >=20\n" + "> > \n" "> > Changes since v3:\n" - "> >=20\n" + "> > \n" "> > - Moved month/year conversion offsets inline with reg[] assignments\n" "> > - Used platform_get_irq instead of of_get_irq\n" "> > - Dropped separate mutex and use rtc->ops_lock in interrupt handler\n" "> > - Dropped of_irq.h from includes\n" "> > - Added of_device_id and .of_match_table\n" - "> >=20\n" + "> > \n" "> > Changes since v2:\n" - "> >=20\n" + "> > \n" "> > - Fixed off-by-1 errors in register mask macros\n" "> > - Fixed copy-paste error in set_alarm function\n" "> > - Drop uie_unsupported, since the alarm works now\n" "> > - Fixed up copyright notice\n" "> > - Changed license to GPL v2, matching mfd driver\n" - "> >=20\n" + "> > \n" "> > ---\n" "> > drivers/rtc/Kconfig | 10 ++\n" "> > drivers/rtc/Makefile | 1 +\n" - "> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++=\n" - "++++++++\n" + "> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++++\n" "> > 3 files changed, 336 insertions(+)\n" "> > create mode 100644 drivers/rtc/rtc-ac100.c\n" - "> >=20\n" + "> > \n" "> > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig\n" "> > index 18639e0cb6e2..b9d7cbb6bd76 100644\n" "> > --- a/drivers/rtc/Kconfig\n" @@ -65,7 +57,7 @@ "> > @@ -183,6 +183,16 @@ config RTC_DRV_ABX80X\n" "> > \t This driver can also be built as a module. If so, the module\n" "> > \t will be called rtc-abx80x.\n" - "> > =20\n" + "> > \n" "> > +config RTC_DRV_AC100\n" "> > +\ttristate \"X-Powers AC100\"\n" "> > +\tdepends on MFD_AC100\n" @@ -83,14 +75,14 @@ "> > index ea2833723fa9..b07c28779573 100644\n" "> > --- a/drivers/rtc/Makefile\n" "> > +++ b/drivers/rtc/Makefile\n" - "> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100)\t+=3D rtc-ab3100.o\n" - "> > obj-$(CONFIG_RTC_DRV_AB8500)\t+=3D rtc-ab8500.o\n" - "> > obj-$(CONFIG_RTC_DRV_ABB5ZES3)\t+=3D rtc-ab-b5ze-s3.o\n" - "> > obj-$(CONFIG_RTC_DRV_ABX80X)\t+=3D rtc-abx80x.o\n" - "> > +obj-$(CONFIG_RTC_DRV_AC100)\t+=3D rtc-ac100.o\n" - "> > obj-$(CONFIG_RTC_DRV_ARMADA38X)\t+=3D rtc-armada38x.o\n" - "> > obj-$(CONFIG_RTC_DRV_AS3722)\t+=3D rtc-as3722.o\n" - "> > obj-$(CONFIG_RTC_DRV_ASM9260)\t+=3D rtc-asm9260.o\n" + "> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100)\t+= rtc-ab3100.o\n" + "> > obj-$(CONFIG_RTC_DRV_AB8500)\t+= rtc-ab8500.o\n" + "> > obj-$(CONFIG_RTC_DRV_ABB5ZES3)\t+= rtc-ab-b5ze-s3.o\n" + "> > obj-$(CONFIG_RTC_DRV_ABX80X)\t+= rtc-abx80x.o\n" + "> > +obj-$(CONFIG_RTC_DRV_AC100)\t+= rtc-ac100.o\n" + "> > obj-$(CONFIG_RTC_DRV_ARMADA38X)\t+= rtc-armada38x.o\n" + "> > obj-$(CONFIG_RTC_DRV_AS3722)\t+= rtc-as3722.o\n" + "> > obj-$(CONFIG_RTC_DRV_ASM9260)\t+= rtc-asm9260.o\n" "> > diff --git a/drivers/rtc/rtc-ac100.c b/drivers/rtc/rtc-ac100.c\n" "> > new file mode 100644\n" "> > index 000000000000..5a9ca89d04c7\n" @@ -104,17 +96,13 @@ "> > + *\n" "> > + * Chen-Yu Tsai <wens@csie.org>\n" "> > + *\n" - "> > + * This program is free software; you can redistribute it and/or modif=\n" - "y\n" + "> > + * This program is free software; you can redistribute it and/or modify\n" "> > + * it under the terms of the GNU General Public License version 2 as\n" "> > + * published by the Free Software Foundation.\n" "> > + *\n" - "> > + * This program is distributed in the hope that it will be useful, but=\n" - " WITHOUT\n" - "> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY =\n" - "or\n" - "> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licen=\n" - "se for\n" + "> > + * This program is distributed in the hope that it will be useful, but WITHOUT\n" + "> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n" + "> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\n" "> > + * more details.\n" "> > + */\n" "> > +\n" @@ -159,14 +147,11 @@ "> > +#define AC100_ALM_UPD_TRIGGER\tBIT(15)\n" "> > +\n" "> > +/*\n" - "> > + * The year parameter passed to the driver is usually an offset relati=\n" - "ve to\n" - "> > + * the year 1900. This macro is used to convert this offset to another=\n" - " one\n" + "> > + * The year parameter passed to the driver is usually an offset relative to\n" + "> > + * the year 1900. This macro is used to convert this offset to another one\n" "> > + * relative to the minimum year allowed by the hardware.\n" "> > + *\n" - "> > + * The year range is 1970 - 2069. This range is selected to match Allw=\n" - "inner's\n" + "> > + * The year range is 1970 - 2069. This range is selected to match Allwinner's\n" "> > + * driver.\n" "> > + */\n" "> > +#define AC100_YEAR_MIN\t\t\t\t1970\n" @@ -181,40 +166,38 @@ "> > +\tunsigned long alarm;\n" "> > +};\n" "> > +\n" - "> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc=\n" - "_tm)\n" + "> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc_tm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" "> > +\tu16 reg[7];\n" "> > +\tint ret;\n" "> > +\n" - "> > +\tret =3D regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7);\n" + "> > +\tret = regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" - "> > +\trtc_tm->tm_sec =3D bcd2bin(reg[0] & AC100_RTC_SEC_MASK);\n" - "> > +\trtc_tm->tm_min =3D bcd2bin(reg[1] & AC100_RTC_MIN_MASK);\n" - "> > +\trtc_tm->tm_hour =3D bcd2bin(reg[2] & AC100_RTC_HOU_MASK);\n" - "> > +\trtc_tm->tm_wday =3D bcd2bin(reg[3] & AC100_RTC_WEE_MASK);\n" - "> > +\trtc_tm->tm_mday =3D bcd2bin(reg[4] & AC100_RTC_DAY_MASK);\n" - "> > +\trtc_tm->tm_mon =3D bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1;\n" - "> > +\trtc_tm->tm_year =3D bcd2bin(reg[6] & AC100_RTC_YEA_MASK) +\n" + "> > +\trtc_tm->tm_sec = bcd2bin(reg[0] & AC100_RTC_SEC_MASK);\n" + "> > +\trtc_tm->tm_min = bcd2bin(reg[1] & AC100_RTC_MIN_MASK);\n" + "> > +\trtc_tm->tm_hour = bcd2bin(reg[2] & AC100_RTC_HOU_MASK);\n" + "> > +\trtc_tm->tm_wday = bcd2bin(reg[3] & AC100_RTC_WEE_MASK);\n" + "> > +\trtc_tm->tm_mday = bcd2bin(reg[4] & AC100_RTC_DAY_MASK);\n" + "> > +\trtc_tm->tm_mon = bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1;\n" + "> > +\trtc_tm->tm_year = bcd2bin(reg[6] & AC100_RTC_YEA_MASK) +\n" "> > +\t\t\t AC100_YEAR_OFF;\n" "> > +\n" "> > +\treturn rtc_valid_tm(rtc_tm);\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc=\n" - "_tm)\n" + "> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" "> > +\tint year;\n" "> > +\tu16 reg[8];\n" "> > +\n" "> > +\t/* our RTC has a limited year range... */\n" - "> > +\tyear =3D rtc_tm->tm_year - AC100_YEAR_OFF;\n" + "> > +\tyear = rtc_tm->tm_year - AC100_YEAR_OFF;\n" "> > +\tif (year < 0 || year > (AC100_YEAR_MAX - 1900)) {\n" "> > +\t\tdev_err(dev, \"rtc only supports year in range %d - %d\\n\",\n" "> > +\t\t\tAC100_YEAR_MIN, AC100_YEAR_MAX);\n" @@ -222,79 +205,76 @@ "> > +\t}\n" "> > +\n" "> > +\t/* convert to BCD */\n" - "> > +\treg[0] =3D bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK;\n" - "> > +\treg[1] =3D bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK;\n" - "> > +\treg[2] =3D bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK;\n" - "> > +\treg[3] =3D bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK;\n" - "> > +\treg[4] =3D bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK;\n" - "> > +\treg[5] =3D bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK;\n" - "> > +\treg[6] =3D bin2bcd(year)\t\t & AC100_RTC_YEA_MASK;\n" + "> > +\treg[0] = bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK;\n" + "> > +\treg[1] = bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK;\n" + "> > +\treg[2] = bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK;\n" + "> > +\treg[3] = bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK;\n" + "> > +\treg[4] = bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK;\n" + "> > +\treg[5] = bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK;\n" + "> > +\treg[6] = bin2bcd(year)\t\t & AC100_RTC_YEA_MASK;\n" "> > +\t/* trigger write */\n" - "> > +\treg[7] =3D AC100_RTC_UPD_TRIGGER;\n" + "> > +\treg[7] = AC100_RTC_UPD_TRIGGER;\n" "> > +\n" "> > +\t/* Is it a leap year? */\n" "> > +\tif (is_leap_year(year + AC100_YEAR_OFF + 1900))\n" - "> > +\t\treg[6] |=3D AC100_RTC_YEA_LEAP;\n" + "> > +\t\treg[6] |= AC100_RTC_YEA_LEAP;\n" "> > +\n" "> > +\treturn regmap_bulk_write(regmap, AC100_RTC_SEC, reg, 8);\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int=\n" - " en)\n" + "> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int en)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" "> > +\tunsigned int val;\n" "> > +\n" - "> > +\tval =3D en ? AC100_ALM_INT_ENABLE : 0;\n" + "> > +\tval = en ? AC100_ALM_INT_ENABLE : 0;\n" "> > +\n" "> > +\treturn regmap_write(regmap, AC100_ALM_INT_ENA, val);\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *=\n" - "alrm)\n" + "> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *alrm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" - "> > +\tstruct rtc_time *alrm_tm =3D &alrm->time;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" + "> > +\tstruct rtc_time *alrm_tm = &alrm->time;\n" "> > +\tu16 reg[7];\n" "> > +\tunsigned int val;\n" "> > +\tint ret;\n" "> > +\n" - "> > +\tret =3D regmap_read(regmap, AC100_ALM_INT_ENA, &val);\n" + "> > +\tret = regmap_read(regmap, AC100_ALM_INT_ENA, &val);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" - "> > +\talrm->enabled =3D !!(val & AC100_ALM_INT_ENABLE);\n" + "> > +\talrm->enabled = !!(val & AC100_ALM_INT_ENABLE);\n" "> > +\n" - "> > +\tret =3D regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7);\n" + "> > +\tret = regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" - "> > +\talrm_tm->tm_sec =3D bcd2bin(reg[0] & AC100_ALM_SEC_MASK);\n" - "> > +\talrm_tm->tm_min =3D bcd2bin(reg[1] & AC100_ALM_MIN_MASK);\n" - "> > +\talrm_tm->tm_hour =3D bcd2bin(reg[2] & AC100_ALM_HOU_MASK);\n" - "> > +\talrm_tm->tm_wday =3D bcd2bin(reg[3] & AC100_ALM_WEE_MASK);\n" - "> > +\talrm_tm->tm_mday =3D bcd2bin(reg[4] & AC100_ALM_DAY_MASK);\n" - "> > +\talrm_tm->tm_mon =3D bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1;\n" - "> > +\talrm_tm->tm_year =3D bcd2bin(reg[6] & AC100_ALM_YEA_MASK) +\n" + "> > +\talrm_tm->tm_sec = bcd2bin(reg[0] & AC100_ALM_SEC_MASK);\n" + "> > +\talrm_tm->tm_min = bcd2bin(reg[1] & AC100_ALM_MIN_MASK);\n" + "> > +\talrm_tm->tm_hour = bcd2bin(reg[2] & AC100_ALM_HOU_MASK);\n" + "> > +\talrm_tm->tm_wday = bcd2bin(reg[3] & AC100_ALM_WEE_MASK);\n" + "> > +\talrm_tm->tm_mday = bcd2bin(reg[4] & AC100_ALM_DAY_MASK);\n" + "> > +\talrm_tm->tm_mon = bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1;\n" + "> > +\talrm_tm->tm_year = bcd2bin(reg[6] & AC100_ALM_YEA_MASK) +\n" "> > +\t\t\t AC100_YEAR_OFF;\n" "> > +\n" "> > +\treturn 0;\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *=\n" - "alrm)\n" + "> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" - "> > +\tstruct rtc_time *alrm_tm =3D &alrm->time;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" + "> > +\tstruct rtc_time *alrm_tm = &alrm->time;\n" "> > +\tu16 reg[8];\n" "> > +\tint year;\n" "> > +\tint ret;\n" "> > +\n" "> > +\t/* our alarm has a limited year range... */\n" - "> > +\tyear =3D alrm_tm->tm_year - AC100_YEAR_OFF;\n" + "> > +\tyear = alrm_tm->tm_year - AC100_YEAR_OFF;\n" "> > +\tif (year < 0 || year > (AC100_YEAR_MAX - 1900)) {\n" "> > +\t\tdev_err(dev, \"alarm only supports year in range %d - %d\\n\",\n" "> > +\t\t\tAC100_YEAR_MIN, AC100_YEAR_MAX);\n" @@ -302,24 +282,24 @@ "> > +\t}\n" "> > +\n" "> > +\t/* convert to BCD */\n" - "> > +\treg[0] =3D (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) |\n" + "> > +\treg[0] = (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[1] =3D (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) |\n" + "> > +\treg[1] = (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[2] =3D (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) |\n" + "> > +\treg[2] = (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" "> > +\t/* Do not enable weekday alarm */\n" - "> > +\treg[3] =3D bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK;\n" - "> > +\treg[4] =3D (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) |\n" + "> > +\treg[3] = bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK;\n" + "> > +\treg[4] = (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[5] =3D (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) |\n" + "> > +\treg[5] = (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[6] =3D (bin2bcd(year) & AC100_ALM_YEA_MASK) |\n" + "> > +\treg[6] = (bin2bcd(year) & AC100_ALM_YEA_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" "> > +\t/* trigger write */\n" - "> > +\treg[7] =3D AC100_ALM_UPD_TRIGGER;\n" + "> > +\treg[7] = AC100_ALM_UPD_TRIGGER;\n" "> > +\n" - "> > +\tret =3D regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8);\n" + "> > +\tret = regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" @@ -328,15 +308,15 @@ "> > +\n" "> > +static irqreturn_t ac100_rtc_irq(int irq, void *data)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D data;\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" - "> > +\tunsigned int val =3D 0;\n" + "> > +\tstruct ac100_rtc_dev *chip = data;\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" + "> > +\tunsigned int val = 0;\n" "> > +\tint ret;\n" "> > +\n" "> > +\tmutex_lock(&chip->rtc->ops_lock);\n" "> > +\n" "> > +\t/* read status */\n" - "> > +\tret =3D regmap_read(regmap, AC100_ALM_INT_STA, &val);\n" + "> > +\tret = regmap_read(regmap, AC100_ALM_INT_STA, &val);\n" "> > +\tif (ret)\n" "> > +\t\tgoto out;\n" "> > +\n" @@ -345,12 +325,12 @@ "> > +\t\trtc_update_irq(chip->rtc, 1, RTC_AF | RTC_IRQF);\n" "> > +\n" "> > +\t\t/* clear status */\n" - "> > +\t\tret =3D regmap_write(regmap, AC100_ALM_INT_STA, val);\n" + "> > +\t\tret = regmap_write(regmap, AC100_ALM_INT_STA, val);\n" "> > +\t\tif (ret)\n" "> > +\t\t\tgoto out;\n" "> > +\n" "> > +\t\t/* disable interrupt */\n" - "> > +\t\tret =3D ac100_rtc_alarm_irq_enable(chip->dev, 0);\n" + "> > +\t\tret = ac100_rtc_alarm_irq_enable(chip->dev, 0);\n" "> > +\t\tif (ret)\n" "> > +\t\t\tgoto out;\n" "> > +\t}\n" @@ -360,32 +340,32 @@ "> > +\treturn IRQ_HANDLED;\n" "> > +}\n" "> > +\n" - "> > +static const struct rtc_class_ops ac100_rtc_ops =3D {\n" - "> > +\t.read_time\t =3D ac100_rtc_get_time,\n" - "> > +\t.set_time\t =3D ac100_rtc_set_time,\n" - "> > +\t.read_alarm\t =3D ac100_rtc_get_alarm,\n" - "> > +\t.set_alarm\t =3D ac100_rtc_set_alarm,\n" - "> > +\t.alarm_irq_enable =3D ac100_rtc_alarm_irq_enable,\n" + "> > +static const struct rtc_class_ops ac100_rtc_ops = {\n" + "> > +\t.read_time\t = ac100_rtc_get_time,\n" + "> > +\t.set_time\t = ac100_rtc_set_time,\n" + "> > +\t.read_alarm\t = ac100_rtc_get_alarm,\n" + "> > +\t.set_alarm\t = ac100_rtc_set_alarm,\n" + "> > +\t.alarm_irq_enable = ac100_rtc_alarm_irq_enable,\n" "> > +};\n" "> > +\n" "> > +static int ac100_rtc_probe(struct platform_device *pdev)\n" "> > +{\n" - "> > +\tstruct ac100_dev *ac100 =3D dev_get_drvdata(pdev->dev.parent);\n" + "> > +\tstruct ac100_dev *ac100 = dev_get_drvdata(pdev->dev.parent);\n" "> > +\tstruct ac100_rtc_dev *chip;\n" "> > +\tint ret;\n" "> > +\n" - "> > +\tchip =3D devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);\n" + "> > +\tchip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);\n" "> > +\tplatform_set_drvdata(pdev, chip);\n" - "> > +\tchip->dev =3D &pdev->dev;\n" - "> > +\tchip->regmap =3D ac100->regmap;\n" + "> > +\tchip->dev = &pdev->dev;\n" + "> > +\tchip->regmap = ac100->regmap;\n" "> > +\n" - "> > +\tchip->irq =3D platform_get_irq(pdev, 0);\n" + "> > +\tchip->irq = platform_get_irq(pdev, 0);\n" "> > +\tif (chip->irq < 0) {\n" "> > +\t\tdev_err(&pdev->dev, \"No IRQ resource\\n\");\n" "> > +\t\treturn chip->irq;\n" "> > +\t}\n" "> > +\n" - "> > +\tret =3D devm_request_threaded_irq(&pdev->dev, chip->irq, NULL,\n" + "> > +\tret = devm_request_threaded_irq(&pdev->dev, chip->irq, NULL,\n" "> > +\t\t\t\t\tac100_rtc_irq,\n" "> > +\t\t\t\t\tIRQF_SHARED | IRQF_ONESHOT,\n" "> > +\t\t\t\t\tdev_name(&pdev->dev), chip);\n" @@ -395,8 +375,7 @@ "> > +\t}\n" "> > +\n" "> > +\t/* always use 24 hour mode */\n" - "> > +\tregmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR=\n" - ",\n" + "> > +\tregmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR,\n" "> > +\t\t\t AC100_RTC_CTRL_24HOUR);\n" "> > +\n" "> > +\t/* disable counter alarm interrupt */\n" @@ -405,7 +384,7 @@ "> > +\t/* clear counter alarm pending interrupts */\n" "> > +\tregmap_write(chip->regmap, AC100_ALM_INT_STA, AC100_ALM_INT_ENABLE);\n" "> > +\n" - "> > +\tchip->rtc =3D devm_rtc_device_register(&pdev->dev, \"rtc-ac100\",\n" + "> > +\tchip->rtc = devm_rtc_device_register(&pdev->dev, \"rtc-ac100\",\n" "> > +\t\t\t\t\t &ac100_rtc_ops, THIS_MODULE);\n" "> > +\tif (IS_ERR(chip->rtc)) {\n" "> > +\t\tdev_err(&pdev->dev, \"unable to register device\\n\");\n" @@ -417,17 +396,17 @@ "> > +\treturn 0;\n" "> > +}\n" "> > +\n" - "> > +static const struct of_device_id ac100_rtc_match[] =3D {\n" - "> > +\t{ .compatible =3D \"x-powers,ac100-rtc\" },\n" + "> > +static const struct of_device_id ac100_rtc_match[] = {\n" + "> > +\t{ .compatible = \"x-powers,ac100-rtc\" },\n" "> > +\t{ },\n" "> > +};\n" "> > +MODULE_DEVICE_TABLE(of, ac100_rtc_match);\n" "> > +\n" - "> > +static struct platform_driver ac100_rtc_driver =3D {\n" - "> > +\t.probe\t\t=3D ac100_rtc_probe,\n" - "> > +\t.driver\t\t=3D {\n" - "> > +\t\t.name\t\t=3D \"ac100-rtc\",\n" - "> > +\t\t.of_match_table\t=3D of_match_ptr(ac100_rtc_match),\n" + "> > +static struct platform_driver ac100_rtc_driver = {\n" + "> > +\t.probe\t\t= ac100_rtc_probe,\n" + "> > +\t.driver\t\t= {\n" + "> > +\t\t.name\t\t= \"ac100-rtc\",\n" + "> > +\t\t.of_match_table\t= of_match_ptr(ac100_rtc_match),\n" "> > +\t},\n" "> > +};\n" "> > +module_platform_driver(ac100_rtc_driver);\n" @@ -435,24 +414,12 @@ "> > +MODULE_DESCRIPTION(\"X-Powers AC100 RTC driver\");\n" "> > +MODULE_AUTHOR(\"Chen-Yu Tsai <wens@csie.org>\");\n" "> > +MODULE_LICENSE(\"GPL v2\");\n" - ">=20\n" + "> \n" "\n" - "--=20\n" + "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" - "Follow Linaro: Facebook | Twitter | Blog\n" - "\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "Linaro.org ? Open source software for ARM SoCs\n" + Follow Linaro: Facebook | Twitter | Blog -788f500da3dd81aab883d296f993acda476dab2da9405e8cad9c6af51f32f0c6 +bbc7b778c6be544938b2d595bfda35385f4fb7ec6f0c40f7fb81f4f079e7f6ff
diff --git a/a/1.txt b/N2/1.txt index 7d505ac..3f27bc9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,45 +3,44 @@ On Fri, 08 Jul 2016, Alexandre Belloni wrote: > On 08/07/2016 at 22:33:38 +0800, Chen-Yu Tsai wrote : > > X-Powers AC100 is a codec / RTC combo chip. This driver supports > > the RTC sub-device. -> >=20 +> > > > The RTC block also has clock outputs and non-volatile storage. > > Non-volatile storage wthin the RTC hardware is not supported. > > Clock output support is added in the next patch. -> >=20 -> > Signed-off-by: Chen-Yu Tsai <wens@csie.org> -> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> +> > +> > Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> +> Acked-by: Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Applied, thanks. > > --- > > Changes since v4: -> >=20 +> > > > - None. -> >=20 +> > > > Changes since v3: -> >=20 +> > > > - Moved month/year conversion offsets inline with reg[] assignments > > - Used platform_get_irq instead of of_get_irq > > - Dropped separate mutex and use rtc->ops_lock in interrupt handler > > - Dropped of_irq.h from includes > > - Added of_device_id and .of_match_table -> >=20 +> > > > Changes since v2: -> >=20 +> > > > - Fixed off-by-1 errors in register mask macros > > - Fixed copy-paste error in set_alarm function > > - Drop uie_unsupported, since the alarm works now > > - Fixed up copyright notice > > - Changed license to GPL v2, matching mfd driver -> >=20 +> > > > --- > > drivers/rtc/Kconfig | 10 ++ > > drivers/rtc/Makefile | 1 + -> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++= -++++++++ +> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 336 insertions(+) > > create mode 100644 drivers/rtc/rtc-ac100.c -> >=20 +> > > > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig > > index 18639e0cb6e2..b9d7cbb6bd76 100644 > > --- a/drivers/rtc/Kconfig @@ -49,7 +48,7 @@ Applied, thanks. > > @@ -183,6 +183,16 @@ config RTC_DRV_ABX80X > > This driver can also be built as a module. If so, the module > > will be called rtc-abx80x. -> > =20 +> > > > +config RTC_DRV_AC100 > > + tristate "X-Powers AC100" > > + depends on MFD_AC100 @@ -67,14 +66,14 @@ Applied, thanks. > > index ea2833723fa9..b07c28779573 100644 > > --- a/drivers/rtc/Makefile > > +++ b/drivers/rtc/Makefile -> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100) +=3D rtc-ab3100.o -> > obj-$(CONFIG_RTC_DRV_AB8500) +=3D rtc-ab8500.o -> > obj-$(CONFIG_RTC_DRV_ABB5ZES3) +=3D rtc-ab-b5ze-s3.o -> > obj-$(CONFIG_RTC_DRV_ABX80X) +=3D rtc-abx80x.o -> > +obj-$(CONFIG_RTC_DRV_AC100) +=3D rtc-ac100.o -> > obj-$(CONFIG_RTC_DRV_ARMADA38X) +=3D rtc-armada38x.o -> > obj-$(CONFIG_RTC_DRV_AS3722) +=3D rtc-as3722.o -> > obj-$(CONFIG_RTC_DRV_ASM9260) +=3D rtc-asm9260.o +> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100) += rtc-ab3100.o +> > obj-$(CONFIG_RTC_DRV_AB8500) += rtc-ab8500.o +> > obj-$(CONFIG_RTC_DRV_ABB5ZES3) += rtc-ab-b5ze-s3.o +> > obj-$(CONFIG_RTC_DRV_ABX80X) += rtc-abx80x.o +> > +obj-$(CONFIG_RTC_DRV_AC100) += rtc-ac100.o +> > obj-$(CONFIG_RTC_DRV_ARMADA38X) += rtc-armada38x.o +> > obj-$(CONFIG_RTC_DRV_AS3722) += rtc-as3722.o +> > obj-$(CONFIG_RTC_DRV_ASM9260) += rtc-asm9260.o > > diff --git a/drivers/rtc/rtc-ac100.c b/drivers/rtc/rtc-ac100.c > > new file mode 100644 > > index 000000000000..5a9ca89d04c7 @@ -86,19 +85,15 @@ Applied, thanks. > > + * > > + * Copyright (c) 2016 Chen-Yu Tsai > > + * -> > + * Chen-Yu Tsai <wens@csie.org> +> > + * Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> > > + * -> > + * This program is free software; you can redistribute it and/or modif= -y +> > + * This program is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License version 2 as > > + * published by the Free Software Foundation. > > + * -> > + * This program is distributed in the hope that it will be useful, but= - WITHOUT -> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY = -or -> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licen= -se for +> > + * This program is distributed in the hope that it will be useful, but WITHOUT +> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > > + * more details. > > + */ > > + @@ -143,14 +138,11 @@ se for > > +#define AC100_ALM_UPD_TRIGGER BIT(15) > > + > > +/* -> > + * The year parameter passed to the driver is usually an offset relati= -ve to -> > + * the year 1900. This macro is used to convert this offset to another= - one +> > + * The year parameter passed to the driver is usually an offset relative to +> > + * the year 1900. This macro is used to convert this offset to another one > > + * relative to the minimum year allowed by the hardware. > > + * -> > + * The year range is 1970 - 2069. This range is selected to match Allw= -inner's +> > + * The year range is 1970 - 2069. This range is selected to match Allwinner's > > + * driver. > > + */ > > +#define AC100_YEAR_MIN 1970 @@ -165,40 +157,38 @@ inner's > > + unsigned long alarm; > > +}; > > + -> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc= -_tm) +> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc_tm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; > > + u16 reg[7]; > > + int ret; > > + -> > + ret =3D regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7); +> > + ret = regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7); > > + if (ret) > > + return ret; > > + -> > + rtc_tm->tm_sec =3D bcd2bin(reg[0] & AC100_RTC_SEC_MASK); -> > + rtc_tm->tm_min =3D bcd2bin(reg[1] & AC100_RTC_MIN_MASK); -> > + rtc_tm->tm_hour =3D bcd2bin(reg[2] & AC100_RTC_HOU_MASK); -> > + rtc_tm->tm_wday =3D bcd2bin(reg[3] & AC100_RTC_WEE_MASK); -> > + rtc_tm->tm_mday =3D bcd2bin(reg[4] & AC100_RTC_DAY_MASK); -> > + rtc_tm->tm_mon =3D bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1; -> > + rtc_tm->tm_year =3D bcd2bin(reg[6] & AC100_RTC_YEA_MASK) + +> > + rtc_tm->tm_sec = bcd2bin(reg[0] & AC100_RTC_SEC_MASK); +> > + rtc_tm->tm_min = bcd2bin(reg[1] & AC100_RTC_MIN_MASK); +> > + rtc_tm->tm_hour = bcd2bin(reg[2] & AC100_RTC_HOU_MASK); +> > + rtc_tm->tm_wday = bcd2bin(reg[3] & AC100_RTC_WEE_MASK); +> > + rtc_tm->tm_mday = bcd2bin(reg[4] & AC100_RTC_DAY_MASK); +> > + rtc_tm->tm_mon = bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1; +> > + rtc_tm->tm_year = bcd2bin(reg[6] & AC100_RTC_YEA_MASK) + > > + AC100_YEAR_OFF; > > + > > + return rtc_valid_tm(rtc_tm); > > +} > > + -> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc= -_tm) +> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; > > + int year; > > + u16 reg[8]; > > + > > + /* our RTC has a limited year range... */ -> > + year =3D rtc_tm->tm_year - AC100_YEAR_OFF; +> > + year = rtc_tm->tm_year - AC100_YEAR_OFF; > > + if (year < 0 || year > (AC100_YEAR_MAX - 1900)) { > > + dev_err(dev, "rtc only supports year in range %d - %d\n", > > + AC100_YEAR_MIN, AC100_YEAR_MAX); @@ -206,79 +196,76 @@ _tm) > > + } > > + > > + /* convert to BCD */ -> > + reg[0] =3D bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK; -> > + reg[1] =3D bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK; -> > + reg[2] =3D bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK; -> > + reg[3] =3D bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK; -> > + reg[4] =3D bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK; -> > + reg[5] =3D bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK; -> > + reg[6] =3D bin2bcd(year) & AC100_RTC_YEA_MASK; +> > + reg[0] = bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK; +> > + reg[1] = bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK; +> > + reg[2] = bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK; +> > + reg[3] = bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK; +> > + reg[4] = bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK; +> > + reg[5] = bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK; +> > + reg[6] = bin2bcd(year) & AC100_RTC_YEA_MASK; > > + /* trigger write */ -> > + reg[7] =3D AC100_RTC_UPD_TRIGGER; +> > + reg[7] = AC100_RTC_UPD_TRIGGER; > > + > > + /* Is it a leap year? */ > > + if (is_leap_year(year + AC100_YEAR_OFF + 1900)) -> > + reg[6] |=3D AC100_RTC_YEA_LEAP; +> > + reg[6] |= AC100_RTC_YEA_LEAP; > > + > > + return regmap_bulk_write(regmap, AC100_RTC_SEC, reg, 8); > > +} > > + -> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int= - en) +> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int en) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; > > + unsigned int val; > > + -> > + val =3D en ? AC100_ALM_INT_ENABLE : 0; +> > + val = en ? AC100_ALM_INT_ENABLE : 0; > > + > > + return regmap_write(regmap, AC100_ALM_INT_ENA, val); > > +} > > + -> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *= -alrm) +> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *alrm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; -> > + struct rtc_time *alrm_tm =3D &alrm->time; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; +> > + struct rtc_time *alrm_tm = &alrm->time; > > + u16 reg[7]; > > + unsigned int val; > > + int ret; > > + -> > + ret =3D regmap_read(regmap, AC100_ALM_INT_ENA, &val); +> > + ret = regmap_read(regmap, AC100_ALM_INT_ENA, &val); > > + if (ret) > > + return ret; > > + -> > + alrm->enabled =3D !!(val & AC100_ALM_INT_ENABLE); +> > + alrm->enabled = !!(val & AC100_ALM_INT_ENABLE); > > + -> > + ret =3D regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7); +> > + ret = regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7); > > + if (ret) > > + return ret; > > + -> > + alrm_tm->tm_sec =3D bcd2bin(reg[0] & AC100_ALM_SEC_MASK); -> > + alrm_tm->tm_min =3D bcd2bin(reg[1] & AC100_ALM_MIN_MASK); -> > + alrm_tm->tm_hour =3D bcd2bin(reg[2] & AC100_ALM_HOU_MASK); -> > + alrm_tm->tm_wday =3D bcd2bin(reg[3] & AC100_ALM_WEE_MASK); -> > + alrm_tm->tm_mday =3D bcd2bin(reg[4] & AC100_ALM_DAY_MASK); -> > + alrm_tm->tm_mon =3D bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1; -> > + alrm_tm->tm_year =3D bcd2bin(reg[6] & AC100_ALM_YEA_MASK) + +> > + alrm_tm->tm_sec = bcd2bin(reg[0] & AC100_ALM_SEC_MASK); +> > + alrm_tm->tm_min = bcd2bin(reg[1] & AC100_ALM_MIN_MASK); +> > + alrm_tm->tm_hour = bcd2bin(reg[2] & AC100_ALM_HOU_MASK); +> > + alrm_tm->tm_wday = bcd2bin(reg[3] & AC100_ALM_WEE_MASK); +> > + alrm_tm->tm_mday = bcd2bin(reg[4] & AC100_ALM_DAY_MASK); +> > + alrm_tm->tm_mon = bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1; +> > + alrm_tm->tm_year = bcd2bin(reg[6] & AC100_ALM_YEA_MASK) + > > + AC100_YEAR_OFF; > > + > > + return 0; > > +} > > + -> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *= -alrm) +> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; -> > + struct rtc_time *alrm_tm =3D &alrm->time; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; +> > + struct rtc_time *alrm_tm = &alrm->time; > > + u16 reg[8]; > > + int year; > > + int ret; > > + > > + /* our alarm has a limited year range... */ -> > + year =3D alrm_tm->tm_year - AC100_YEAR_OFF; +> > + year = alrm_tm->tm_year - AC100_YEAR_OFF; > > + if (year < 0 || year > (AC100_YEAR_MAX - 1900)) { > > + dev_err(dev, "alarm only supports year in range %d - %d\n", > > + AC100_YEAR_MIN, AC100_YEAR_MAX); @@ -286,24 +273,24 @@ alrm) > > + } > > + > > + /* convert to BCD */ -> > + reg[0] =3D (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) | +> > + reg[0] = (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[1] =3D (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) | +> > + reg[1] = (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[2] =3D (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) | +> > + reg[2] = (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) | > > + AC100_ALM_ENABLE_FLAG; > > + /* Do not enable weekday alarm */ -> > + reg[3] =3D bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK; -> > + reg[4] =3D (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) | +> > + reg[3] = bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK; +> > + reg[4] = (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[5] =3D (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) | +> > + reg[5] = (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[6] =3D (bin2bcd(year) & AC100_ALM_YEA_MASK) | +> > + reg[6] = (bin2bcd(year) & AC100_ALM_YEA_MASK) | > > + AC100_ALM_ENABLE_FLAG; > > + /* trigger write */ -> > + reg[7] =3D AC100_ALM_UPD_TRIGGER; +> > + reg[7] = AC100_ALM_UPD_TRIGGER; > > + -> > + ret =3D regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8); +> > + ret = regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8); > > + if (ret) > > + return ret; > > + @@ -312,15 +299,15 @@ alrm) > > + > > +static irqreturn_t ac100_rtc_irq(int irq, void *data) > > +{ -> > + struct ac100_rtc_dev *chip =3D data; -> > + struct regmap *regmap =3D chip->regmap; -> > + unsigned int val =3D 0; +> > + struct ac100_rtc_dev *chip = data; +> > + struct regmap *regmap = chip->regmap; +> > + unsigned int val = 0; > > + int ret; > > + > > + mutex_lock(&chip->rtc->ops_lock); > > + > > + /* read status */ -> > + ret =3D regmap_read(regmap, AC100_ALM_INT_STA, &val); +> > + ret = regmap_read(regmap, AC100_ALM_INT_STA, &val); > > + if (ret) > > + goto out; > > + @@ -329,12 +316,12 @@ alrm) > > + rtc_update_irq(chip->rtc, 1, RTC_AF | RTC_IRQF); > > + > > + /* clear status */ -> > + ret =3D regmap_write(regmap, AC100_ALM_INT_STA, val); +> > + ret = regmap_write(regmap, AC100_ALM_INT_STA, val); > > + if (ret) > > + goto out; > > + > > + /* disable interrupt */ -> > + ret =3D ac100_rtc_alarm_irq_enable(chip->dev, 0); +> > + ret = ac100_rtc_alarm_irq_enable(chip->dev, 0); > > + if (ret) > > + goto out; > > + } @@ -344,32 +331,32 @@ alrm) > > + return IRQ_HANDLED; > > +} > > + -> > +static const struct rtc_class_ops ac100_rtc_ops =3D { -> > + .read_time =3D ac100_rtc_get_time, -> > + .set_time =3D ac100_rtc_set_time, -> > + .read_alarm =3D ac100_rtc_get_alarm, -> > + .set_alarm =3D ac100_rtc_set_alarm, -> > + .alarm_irq_enable =3D ac100_rtc_alarm_irq_enable, +> > +static const struct rtc_class_ops ac100_rtc_ops = { +> > + .read_time = ac100_rtc_get_time, +> > + .set_time = ac100_rtc_set_time, +> > + .read_alarm = ac100_rtc_get_alarm, +> > + .set_alarm = ac100_rtc_set_alarm, +> > + .alarm_irq_enable = ac100_rtc_alarm_irq_enable, > > +}; > > + > > +static int ac100_rtc_probe(struct platform_device *pdev) > > +{ -> > + struct ac100_dev *ac100 =3D dev_get_drvdata(pdev->dev.parent); +> > + struct ac100_dev *ac100 = dev_get_drvdata(pdev->dev.parent); > > + struct ac100_rtc_dev *chip; > > + int ret; > > + -> > + chip =3D devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL); +> > + chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL); > > + platform_set_drvdata(pdev, chip); -> > + chip->dev =3D &pdev->dev; -> > + chip->regmap =3D ac100->regmap; +> > + chip->dev = &pdev->dev; +> > + chip->regmap = ac100->regmap; > > + -> > + chip->irq =3D platform_get_irq(pdev, 0); +> > + chip->irq = platform_get_irq(pdev, 0); > > + if (chip->irq < 0) { > > + dev_err(&pdev->dev, "No IRQ resource\n"); > > + return chip->irq; > > + } > > + -> > + ret =3D devm_request_threaded_irq(&pdev->dev, chip->irq, NULL, +> > + ret = devm_request_threaded_irq(&pdev->dev, chip->irq, NULL, > > + ac100_rtc_irq, > > + IRQF_SHARED | IRQF_ONESHOT, > > + dev_name(&pdev->dev), chip); @@ -379,8 +366,7 @@ alrm) > > + } > > + > > + /* always use 24 hour mode */ -> > + regmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR= -, +> > + regmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR, > > + AC100_RTC_CTRL_24HOUR); > > + > > + /* disable counter alarm interrupt */ @@ -389,7 +375,7 @@ alrm) > > + /* clear counter alarm pending interrupts */ > > + regmap_write(chip->regmap, AC100_ALM_INT_STA, AC100_ALM_INT_ENABLE); > > + -> > + chip->rtc =3D devm_rtc_device_register(&pdev->dev, "rtc-ac100", +> > + chip->rtc = devm_rtc_device_register(&pdev->dev, "rtc-ac100", > > + &ac100_rtc_ops, THIS_MODULE); > > + if (IS_ERR(chip->rtc)) { > > + dev_err(&pdev->dev, "unable to register device\n"); @@ -401,40 +387,38 @@ alrm) > > + return 0; > > +} > > + -> > +static const struct of_device_id ac100_rtc_match[] =3D { -> > + { .compatible =3D "x-powers,ac100-rtc" }, +> > +static const struct of_device_id ac100_rtc_match[] = { +> > + { .compatible = "x-powers,ac100-rtc" }, > > + { }, > > +}; > > +MODULE_DEVICE_TABLE(of, ac100_rtc_match); > > + -> > +static struct platform_driver ac100_rtc_driver =3D { -> > + .probe =3D ac100_rtc_probe, -> > + .driver =3D { -> > + .name =3D "ac100-rtc", -> > + .of_match_table =3D of_match_ptr(ac100_rtc_match), +> > +static struct platform_driver ac100_rtc_driver = { +> > + .probe = ac100_rtc_probe, +> > + .driver = { +> > + .name = "ac100-rtc", +> > + .of_match_table = of_match_ptr(ac100_rtc_match), > > + }, > > +}; > > +module_platform_driver(ac100_rtc_driver); > > + > > +MODULE_DESCRIPTION("X-Powers AC100 RTC driver"); -> > +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>"); +> > +MODULE_AUTHOR("Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>"); > > +MODULE_LICENSE("GPL v2"); ->=20 +> ---=20 +-- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org =E2=94=82 Open source software for ARM SoCs +Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ---=20 +-- You received this message because you are subscribed to "rtc-linux". Membership options at http://groups.google.com/group/rtc-linux . Please read http://groups.google.com/group/rtc-linux/web/checklist before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. +--- +You received this message because you are subscribed to the Google Groups "rtc-linux" group. +To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N2/content_digest index 3cfaf36..88dad0b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,17 +1,18 @@ "ref\01467988422-17934-1-git-send-email-wens@csie.org\0" "ref\01467988422-17934-4-git-send-email-wens@csie.org\0" "ref\020160708162152.GM22202@piout.net\0" - "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH v5 3/7] rtc: ac100: Add RTC driver for X-Powers AC100\0" + "ref\020160708162152.GM22202-m++hUPXGwpdeoWH0uzbU5w@public.gmane.org\0" + "From\0Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Subject\0Re: [PATCH v5 3/7] rtc: ac100: Add RTC driver for X-Powers AC100\0" "Date\0Mon, 8 Aug 2016 12:57:07 +0100\0" - "To\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" - "Cc\0Chen-Yu Tsai <wens@csie.org>" - Alessandro Zummo <a.zummo@towertech.it> - Maxime Ripard <maxime.ripard@free-electrons.com> - linux-kernel@vger.kernel.org - rtc-linux@googlegroups.com - devicetree@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>" + Alessandro Zummo <a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org> + Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On Fri, 08 Jul 2016, Alexandre Belloni wrote:\n" @@ -19,45 +20,44 @@ "> On 08/07/2016 at 22:33:38 +0800, Chen-Yu Tsai wrote :\n" "> > X-Powers AC100 is a codec / RTC combo chip. This driver supports\n" "> > the RTC sub-device.\n" - "> >=20\n" + "> > \n" "> > The RTC block also has clock outputs and non-volatile storage.\n" "> > Non-volatile storage wthin the RTC hardware is not supported.\n" "> > Clock output support is added in the next patch.\n" - "> >=20\n" - "> > Signed-off-by: Chen-Yu Tsai <wens@csie.org>\n" - "> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n" + "> > \n" + "> > Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>\n" + "> Acked-by: Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "\n" "Applied, thanks.\n" "\n" "> > ---\n" "> > Changes since v4:\n" - "> >=20\n" + "> > \n" "> > - None.\n" - "> >=20\n" + "> > \n" "> > Changes since v3:\n" - "> >=20\n" + "> > \n" "> > - Moved month/year conversion offsets inline with reg[] assignments\n" "> > - Used platform_get_irq instead of of_get_irq\n" "> > - Dropped separate mutex and use rtc->ops_lock in interrupt handler\n" "> > - Dropped of_irq.h from includes\n" "> > - Added of_device_id and .of_match_table\n" - "> >=20\n" + "> > \n" "> > Changes since v2:\n" - "> >=20\n" + "> > \n" "> > - Fixed off-by-1 errors in register mask macros\n" "> > - Fixed copy-paste error in set_alarm function\n" "> > - Drop uie_unsupported, since the alarm works now\n" "> > - Fixed up copyright notice\n" "> > - Changed license to GPL v2, matching mfd driver\n" - "> >=20\n" + "> > \n" "> > ---\n" "> > drivers/rtc/Kconfig | 10 ++\n" "> > drivers/rtc/Makefile | 1 +\n" - "> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++=\n" - "++++++++\n" + "> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++++\n" "> > 3 files changed, 336 insertions(+)\n" "> > create mode 100644 drivers/rtc/rtc-ac100.c\n" - "> >=20\n" + "> > \n" "> > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig\n" "> > index 18639e0cb6e2..b9d7cbb6bd76 100644\n" "> > --- a/drivers/rtc/Kconfig\n" @@ -65,7 +65,7 @@ "> > @@ -183,6 +183,16 @@ config RTC_DRV_ABX80X\n" "> > \t This driver can also be built as a module. If so, the module\n" "> > \t will be called rtc-abx80x.\n" - "> > =20\n" + "> > \n" "> > +config RTC_DRV_AC100\n" "> > +\ttristate \"X-Powers AC100\"\n" "> > +\tdepends on MFD_AC100\n" @@ -83,14 +83,14 @@ "> > index ea2833723fa9..b07c28779573 100644\n" "> > --- a/drivers/rtc/Makefile\n" "> > +++ b/drivers/rtc/Makefile\n" - "> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100)\t+=3D rtc-ab3100.o\n" - "> > obj-$(CONFIG_RTC_DRV_AB8500)\t+=3D rtc-ab8500.o\n" - "> > obj-$(CONFIG_RTC_DRV_ABB5ZES3)\t+=3D rtc-ab-b5ze-s3.o\n" - "> > obj-$(CONFIG_RTC_DRV_ABX80X)\t+=3D rtc-abx80x.o\n" - "> > +obj-$(CONFIG_RTC_DRV_AC100)\t+=3D rtc-ac100.o\n" - "> > obj-$(CONFIG_RTC_DRV_ARMADA38X)\t+=3D rtc-armada38x.o\n" - "> > obj-$(CONFIG_RTC_DRV_AS3722)\t+=3D rtc-as3722.o\n" - "> > obj-$(CONFIG_RTC_DRV_ASM9260)\t+=3D rtc-asm9260.o\n" + "> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100)\t+= rtc-ab3100.o\n" + "> > obj-$(CONFIG_RTC_DRV_AB8500)\t+= rtc-ab8500.o\n" + "> > obj-$(CONFIG_RTC_DRV_ABB5ZES3)\t+= rtc-ab-b5ze-s3.o\n" + "> > obj-$(CONFIG_RTC_DRV_ABX80X)\t+= rtc-abx80x.o\n" + "> > +obj-$(CONFIG_RTC_DRV_AC100)\t+= rtc-ac100.o\n" + "> > obj-$(CONFIG_RTC_DRV_ARMADA38X)\t+= rtc-armada38x.o\n" + "> > obj-$(CONFIG_RTC_DRV_AS3722)\t+= rtc-as3722.o\n" + "> > obj-$(CONFIG_RTC_DRV_ASM9260)\t+= rtc-asm9260.o\n" "> > diff --git a/drivers/rtc/rtc-ac100.c b/drivers/rtc/rtc-ac100.c\n" "> > new file mode 100644\n" "> > index 000000000000..5a9ca89d04c7\n" @@ -102,19 +102,15 @@ "> > + *\n" "> > + * Copyright (c) 2016 Chen-Yu Tsai\n" "> > + *\n" - "> > + * Chen-Yu Tsai <wens@csie.org>\n" + "> > + * Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>\n" "> > + *\n" - "> > + * This program is free software; you can redistribute it and/or modif=\n" - "y\n" + "> > + * This program is free software; you can redistribute it and/or modify\n" "> > + * it under the terms of the GNU General Public License version 2 as\n" "> > + * published by the Free Software Foundation.\n" "> > + *\n" - "> > + * This program is distributed in the hope that it will be useful, but=\n" - " WITHOUT\n" - "> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY =\n" - "or\n" - "> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licen=\n" - "se for\n" + "> > + * This program is distributed in the hope that it will be useful, but WITHOUT\n" + "> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n" + "> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\n" "> > + * more details.\n" "> > + */\n" "> > +\n" @@ -159,14 +155,11 @@ "> > +#define AC100_ALM_UPD_TRIGGER\tBIT(15)\n" "> > +\n" "> > +/*\n" - "> > + * The year parameter passed to the driver is usually an offset relati=\n" - "ve to\n" - "> > + * the year 1900. This macro is used to convert this offset to another=\n" - " one\n" + "> > + * The year parameter passed to the driver is usually an offset relative to\n" + "> > + * the year 1900. This macro is used to convert this offset to another one\n" "> > + * relative to the minimum year allowed by the hardware.\n" "> > + *\n" - "> > + * The year range is 1970 - 2069. This range is selected to match Allw=\n" - "inner's\n" + "> > + * The year range is 1970 - 2069. This range is selected to match Allwinner's\n" "> > + * driver.\n" "> > + */\n" "> > +#define AC100_YEAR_MIN\t\t\t\t1970\n" @@ -181,40 +174,38 @@ "> > +\tunsigned long alarm;\n" "> > +};\n" "> > +\n" - "> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc=\n" - "_tm)\n" + "> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc_tm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" "> > +\tu16 reg[7];\n" "> > +\tint ret;\n" "> > +\n" - "> > +\tret =3D regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7);\n" + "> > +\tret = regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" - "> > +\trtc_tm->tm_sec =3D bcd2bin(reg[0] & AC100_RTC_SEC_MASK);\n" - "> > +\trtc_tm->tm_min =3D bcd2bin(reg[1] & AC100_RTC_MIN_MASK);\n" - "> > +\trtc_tm->tm_hour =3D bcd2bin(reg[2] & AC100_RTC_HOU_MASK);\n" - "> > +\trtc_tm->tm_wday =3D bcd2bin(reg[3] & AC100_RTC_WEE_MASK);\n" - "> > +\trtc_tm->tm_mday =3D bcd2bin(reg[4] & AC100_RTC_DAY_MASK);\n" - "> > +\trtc_tm->tm_mon =3D bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1;\n" - "> > +\trtc_tm->tm_year =3D bcd2bin(reg[6] & AC100_RTC_YEA_MASK) +\n" + "> > +\trtc_tm->tm_sec = bcd2bin(reg[0] & AC100_RTC_SEC_MASK);\n" + "> > +\trtc_tm->tm_min = bcd2bin(reg[1] & AC100_RTC_MIN_MASK);\n" + "> > +\trtc_tm->tm_hour = bcd2bin(reg[2] & AC100_RTC_HOU_MASK);\n" + "> > +\trtc_tm->tm_wday = bcd2bin(reg[3] & AC100_RTC_WEE_MASK);\n" + "> > +\trtc_tm->tm_mday = bcd2bin(reg[4] & AC100_RTC_DAY_MASK);\n" + "> > +\trtc_tm->tm_mon = bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1;\n" + "> > +\trtc_tm->tm_year = bcd2bin(reg[6] & AC100_RTC_YEA_MASK) +\n" "> > +\t\t\t AC100_YEAR_OFF;\n" "> > +\n" "> > +\treturn rtc_valid_tm(rtc_tm);\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc=\n" - "_tm)\n" + "> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" "> > +\tint year;\n" "> > +\tu16 reg[8];\n" "> > +\n" "> > +\t/* our RTC has a limited year range... */\n" - "> > +\tyear =3D rtc_tm->tm_year - AC100_YEAR_OFF;\n" + "> > +\tyear = rtc_tm->tm_year - AC100_YEAR_OFF;\n" "> > +\tif (year < 0 || year > (AC100_YEAR_MAX - 1900)) {\n" "> > +\t\tdev_err(dev, \"rtc only supports year in range %d - %d\\n\",\n" "> > +\t\t\tAC100_YEAR_MIN, AC100_YEAR_MAX);\n" @@ -222,79 +213,76 @@ "> > +\t}\n" "> > +\n" "> > +\t/* convert to BCD */\n" - "> > +\treg[0] =3D bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK;\n" - "> > +\treg[1] =3D bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK;\n" - "> > +\treg[2] =3D bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK;\n" - "> > +\treg[3] =3D bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK;\n" - "> > +\treg[4] =3D bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK;\n" - "> > +\treg[5] =3D bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK;\n" - "> > +\treg[6] =3D bin2bcd(year)\t\t & AC100_RTC_YEA_MASK;\n" + "> > +\treg[0] = bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK;\n" + "> > +\treg[1] = bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK;\n" + "> > +\treg[2] = bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK;\n" + "> > +\treg[3] = bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK;\n" + "> > +\treg[4] = bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK;\n" + "> > +\treg[5] = bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK;\n" + "> > +\treg[6] = bin2bcd(year)\t\t & AC100_RTC_YEA_MASK;\n" "> > +\t/* trigger write */\n" - "> > +\treg[7] =3D AC100_RTC_UPD_TRIGGER;\n" + "> > +\treg[7] = AC100_RTC_UPD_TRIGGER;\n" "> > +\n" "> > +\t/* Is it a leap year? */\n" "> > +\tif (is_leap_year(year + AC100_YEAR_OFF + 1900))\n" - "> > +\t\treg[6] |=3D AC100_RTC_YEA_LEAP;\n" + "> > +\t\treg[6] |= AC100_RTC_YEA_LEAP;\n" "> > +\n" "> > +\treturn regmap_bulk_write(regmap, AC100_RTC_SEC, reg, 8);\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int=\n" - " en)\n" + "> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int en)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" "> > +\tunsigned int val;\n" "> > +\n" - "> > +\tval =3D en ? AC100_ALM_INT_ENABLE : 0;\n" + "> > +\tval = en ? AC100_ALM_INT_ENABLE : 0;\n" "> > +\n" "> > +\treturn regmap_write(regmap, AC100_ALM_INT_ENA, val);\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *=\n" - "alrm)\n" + "> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *alrm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" - "> > +\tstruct rtc_time *alrm_tm =3D &alrm->time;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" + "> > +\tstruct rtc_time *alrm_tm = &alrm->time;\n" "> > +\tu16 reg[7];\n" "> > +\tunsigned int val;\n" "> > +\tint ret;\n" "> > +\n" - "> > +\tret =3D regmap_read(regmap, AC100_ALM_INT_ENA, &val);\n" + "> > +\tret = regmap_read(regmap, AC100_ALM_INT_ENA, &val);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" - "> > +\talrm->enabled =3D !!(val & AC100_ALM_INT_ENABLE);\n" + "> > +\talrm->enabled = !!(val & AC100_ALM_INT_ENABLE);\n" "> > +\n" - "> > +\tret =3D regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7);\n" + "> > +\tret = regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" - "> > +\talrm_tm->tm_sec =3D bcd2bin(reg[0] & AC100_ALM_SEC_MASK);\n" - "> > +\talrm_tm->tm_min =3D bcd2bin(reg[1] & AC100_ALM_MIN_MASK);\n" - "> > +\talrm_tm->tm_hour =3D bcd2bin(reg[2] & AC100_ALM_HOU_MASK);\n" - "> > +\talrm_tm->tm_wday =3D bcd2bin(reg[3] & AC100_ALM_WEE_MASK);\n" - "> > +\talrm_tm->tm_mday =3D bcd2bin(reg[4] & AC100_ALM_DAY_MASK);\n" - "> > +\talrm_tm->tm_mon =3D bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1;\n" - "> > +\talrm_tm->tm_year =3D bcd2bin(reg[6] & AC100_ALM_YEA_MASK) +\n" + "> > +\talrm_tm->tm_sec = bcd2bin(reg[0] & AC100_ALM_SEC_MASK);\n" + "> > +\talrm_tm->tm_min = bcd2bin(reg[1] & AC100_ALM_MIN_MASK);\n" + "> > +\talrm_tm->tm_hour = bcd2bin(reg[2] & AC100_ALM_HOU_MASK);\n" + "> > +\talrm_tm->tm_wday = bcd2bin(reg[3] & AC100_ALM_WEE_MASK);\n" + "> > +\talrm_tm->tm_mday = bcd2bin(reg[4] & AC100_ALM_DAY_MASK);\n" + "> > +\talrm_tm->tm_mon = bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1;\n" + "> > +\talrm_tm->tm_year = bcd2bin(reg[6] & AC100_ALM_YEA_MASK) +\n" "> > +\t\t\t AC100_YEAR_OFF;\n" "> > +\n" "> > +\treturn 0;\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *=\n" - "alrm)\n" + "> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" - "> > +\tstruct rtc_time *alrm_tm =3D &alrm->time;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" + "> > +\tstruct rtc_time *alrm_tm = &alrm->time;\n" "> > +\tu16 reg[8];\n" "> > +\tint year;\n" "> > +\tint ret;\n" "> > +\n" "> > +\t/* our alarm has a limited year range... */\n" - "> > +\tyear =3D alrm_tm->tm_year - AC100_YEAR_OFF;\n" + "> > +\tyear = alrm_tm->tm_year - AC100_YEAR_OFF;\n" "> > +\tif (year < 0 || year > (AC100_YEAR_MAX - 1900)) {\n" "> > +\t\tdev_err(dev, \"alarm only supports year in range %d - %d\\n\",\n" "> > +\t\t\tAC100_YEAR_MIN, AC100_YEAR_MAX);\n" @@ -302,24 +290,24 @@ "> > +\t}\n" "> > +\n" "> > +\t/* convert to BCD */\n" - "> > +\treg[0] =3D (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) |\n" + "> > +\treg[0] = (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[1] =3D (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) |\n" + "> > +\treg[1] = (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[2] =3D (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) |\n" + "> > +\treg[2] = (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" "> > +\t/* Do not enable weekday alarm */\n" - "> > +\treg[3] =3D bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK;\n" - "> > +\treg[4] =3D (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) |\n" + "> > +\treg[3] = bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK;\n" + "> > +\treg[4] = (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[5] =3D (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) |\n" + "> > +\treg[5] = (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[6] =3D (bin2bcd(year) & AC100_ALM_YEA_MASK) |\n" + "> > +\treg[6] = (bin2bcd(year) & AC100_ALM_YEA_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" "> > +\t/* trigger write */\n" - "> > +\treg[7] =3D AC100_ALM_UPD_TRIGGER;\n" + "> > +\treg[7] = AC100_ALM_UPD_TRIGGER;\n" "> > +\n" - "> > +\tret =3D regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8);\n" + "> > +\tret = regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" @@ -328,15 +316,15 @@ "> > +\n" "> > +static irqreturn_t ac100_rtc_irq(int irq, void *data)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D data;\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" - "> > +\tunsigned int val =3D 0;\n" + "> > +\tstruct ac100_rtc_dev *chip = data;\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" + "> > +\tunsigned int val = 0;\n" "> > +\tint ret;\n" "> > +\n" "> > +\tmutex_lock(&chip->rtc->ops_lock);\n" "> > +\n" "> > +\t/* read status */\n" - "> > +\tret =3D regmap_read(regmap, AC100_ALM_INT_STA, &val);\n" + "> > +\tret = regmap_read(regmap, AC100_ALM_INT_STA, &val);\n" "> > +\tif (ret)\n" "> > +\t\tgoto out;\n" "> > +\n" @@ -345,12 +333,12 @@ "> > +\t\trtc_update_irq(chip->rtc, 1, RTC_AF | RTC_IRQF);\n" "> > +\n" "> > +\t\t/* clear status */\n" - "> > +\t\tret =3D regmap_write(regmap, AC100_ALM_INT_STA, val);\n" + "> > +\t\tret = regmap_write(regmap, AC100_ALM_INT_STA, val);\n" "> > +\t\tif (ret)\n" "> > +\t\t\tgoto out;\n" "> > +\n" "> > +\t\t/* disable interrupt */\n" - "> > +\t\tret =3D ac100_rtc_alarm_irq_enable(chip->dev, 0);\n" + "> > +\t\tret = ac100_rtc_alarm_irq_enable(chip->dev, 0);\n" "> > +\t\tif (ret)\n" "> > +\t\t\tgoto out;\n" "> > +\t}\n" @@ -360,32 +348,32 @@ "> > +\treturn IRQ_HANDLED;\n" "> > +}\n" "> > +\n" - "> > +static const struct rtc_class_ops ac100_rtc_ops =3D {\n" - "> > +\t.read_time\t =3D ac100_rtc_get_time,\n" - "> > +\t.set_time\t =3D ac100_rtc_set_time,\n" - "> > +\t.read_alarm\t =3D ac100_rtc_get_alarm,\n" - "> > +\t.set_alarm\t =3D ac100_rtc_set_alarm,\n" - "> > +\t.alarm_irq_enable =3D ac100_rtc_alarm_irq_enable,\n" + "> > +static const struct rtc_class_ops ac100_rtc_ops = {\n" + "> > +\t.read_time\t = ac100_rtc_get_time,\n" + "> > +\t.set_time\t = ac100_rtc_set_time,\n" + "> > +\t.read_alarm\t = ac100_rtc_get_alarm,\n" + "> > +\t.set_alarm\t = ac100_rtc_set_alarm,\n" + "> > +\t.alarm_irq_enable = ac100_rtc_alarm_irq_enable,\n" "> > +};\n" "> > +\n" "> > +static int ac100_rtc_probe(struct platform_device *pdev)\n" "> > +{\n" - "> > +\tstruct ac100_dev *ac100 =3D dev_get_drvdata(pdev->dev.parent);\n" + "> > +\tstruct ac100_dev *ac100 = dev_get_drvdata(pdev->dev.parent);\n" "> > +\tstruct ac100_rtc_dev *chip;\n" "> > +\tint ret;\n" "> > +\n" - "> > +\tchip =3D devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);\n" + "> > +\tchip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);\n" "> > +\tplatform_set_drvdata(pdev, chip);\n" - "> > +\tchip->dev =3D &pdev->dev;\n" - "> > +\tchip->regmap =3D ac100->regmap;\n" + "> > +\tchip->dev = &pdev->dev;\n" + "> > +\tchip->regmap = ac100->regmap;\n" "> > +\n" - "> > +\tchip->irq =3D platform_get_irq(pdev, 0);\n" + "> > +\tchip->irq = platform_get_irq(pdev, 0);\n" "> > +\tif (chip->irq < 0) {\n" "> > +\t\tdev_err(&pdev->dev, \"No IRQ resource\\n\");\n" "> > +\t\treturn chip->irq;\n" "> > +\t}\n" "> > +\n" - "> > +\tret =3D devm_request_threaded_irq(&pdev->dev, chip->irq, NULL,\n" + "> > +\tret = devm_request_threaded_irq(&pdev->dev, chip->irq, NULL,\n" "> > +\t\t\t\t\tac100_rtc_irq,\n" "> > +\t\t\t\t\tIRQF_SHARED | IRQF_ONESHOT,\n" "> > +\t\t\t\t\tdev_name(&pdev->dev), chip);\n" @@ -395,8 +383,7 @@ "> > +\t}\n" "> > +\n" "> > +\t/* always use 24 hour mode */\n" - "> > +\tregmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR=\n" - ",\n" + "> > +\tregmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR,\n" "> > +\t\t\t AC100_RTC_CTRL_24HOUR);\n" "> > +\n" "> > +\t/* disable counter alarm interrupt */\n" @@ -405,7 +392,7 @@ "> > +\t/* clear counter alarm pending interrupts */\n" "> > +\tregmap_write(chip->regmap, AC100_ALM_INT_STA, AC100_ALM_INT_ENABLE);\n" "> > +\n" - "> > +\tchip->rtc =3D devm_rtc_device_register(&pdev->dev, \"rtc-ac100\",\n" + "> > +\tchip->rtc = devm_rtc_device_register(&pdev->dev, \"rtc-ac100\",\n" "> > +\t\t\t\t\t &ac100_rtc_ops, THIS_MODULE);\n" "> > +\tif (IS_ERR(chip->rtc)) {\n" "> > +\t\tdev_err(&pdev->dev, \"unable to register device\\n\");\n" @@ -417,42 +404,40 @@ "> > +\treturn 0;\n" "> > +}\n" "> > +\n" - "> > +static const struct of_device_id ac100_rtc_match[] =3D {\n" - "> > +\t{ .compatible =3D \"x-powers,ac100-rtc\" },\n" + "> > +static const struct of_device_id ac100_rtc_match[] = {\n" + "> > +\t{ .compatible = \"x-powers,ac100-rtc\" },\n" "> > +\t{ },\n" "> > +};\n" "> > +MODULE_DEVICE_TABLE(of, ac100_rtc_match);\n" "> > +\n" - "> > +static struct platform_driver ac100_rtc_driver =3D {\n" - "> > +\t.probe\t\t=3D ac100_rtc_probe,\n" - "> > +\t.driver\t\t=3D {\n" - "> > +\t\t.name\t\t=3D \"ac100-rtc\",\n" - "> > +\t\t.of_match_table\t=3D of_match_ptr(ac100_rtc_match),\n" + "> > +static struct platform_driver ac100_rtc_driver = {\n" + "> > +\t.probe\t\t= ac100_rtc_probe,\n" + "> > +\t.driver\t\t= {\n" + "> > +\t\t.name\t\t= \"ac100-rtc\",\n" + "> > +\t\t.of_match_table\t= of_match_ptr(ac100_rtc_match),\n" "> > +\t},\n" "> > +};\n" "> > +module_platform_driver(ac100_rtc_driver);\n" "> > +\n" "> > +MODULE_DESCRIPTION(\"X-Powers AC100 RTC driver\");\n" - "> > +MODULE_AUTHOR(\"Chen-Yu Tsai <wens@csie.org>\");\n" + "> > +MODULE_AUTHOR(\"Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>\");\n" "> > +MODULE_LICENSE(\"GPL v2\");\n" - ">=20\n" + "> \n" "\n" - "--=20\n" + "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" + "Linaro.org \342\224\202 Open source software for ARM SoCs\n" "Follow Linaro: Facebook | Twitter | Blog\n" "\n" - "--=20\n" + "-- \n" "You received this message because you are subscribed to \"rtc-linux\".\n" "Membership options at http://groups.google.com/group/rtc-linux .\n" "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" + "--- \n" + "You received this message because you are subscribed to the Google Groups \"rtc-linux\" group.\n" + "To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org\n" For more options, visit https://groups.google.com/d/optout. -788f500da3dd81aab883d296f993acda476dab2da9405e8cad9c6af51f32f0c6 +0a520bee27947ff917c09db7d59f0344778bdadd60f78a91c660e690699a56ca
diff --git a/a/1.txt b/N3/1.txt index 7d505ac..323d0d9 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -3,11 +3,11 @@ On Fri, 08 Jul 2016, Alexandre Belloni wrote: > On 08/07/2016 at 22:33:38 +0800, Chen-Yu Tsai wrote : > > X-Powers AC100 is a codec / RTC combo chip. This driver supports > > the RTC sub-device. -> >=20 +> > > > The RTC block also has clock outputs and non-volatile storage. > > Non-volatile storage wthin the RTC hardware is not supported. > > Clock output support is added in the next patch. -> >=20 +> > > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> @@ -15,33 +15,32 @@ Applied, thanks. > > --- > > Changes since v4: -> >=20 +> > > > - None. -> >=20 +> > > > Changes since v3: -> >=20 +> > > > - Moved month/year conversion offsets inline with reg[] assignments > > - Used platform_get_irq instead of of_get_irq > > - Dropped separate mutex and use rtc->ops_lock in interrupt handler > > - Dropped of_irq.h from includes > > - Added of_device_id and .of_match_table -> >=20 +> > > > Changes since v2: -> >=20 +> > > > - Fixed off-by-1 errors in register mask macros > > - Fixed copy-paste error in set_alarm function > > - Drop uie_unsupported, since the alarm works now > > - Fixed up copyright notice > > - Changed license to GPL v2, matching mfd driver -> >=20 +> > > > --- > > drivers/rtc/Kconfig | 10 ++ > > drivers/rtc/Makefile | 1 + -> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++= -++++++++ +> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 336 insertions(+) > > create mode 100644 drivers/rtc/rtc-ac100.c -> >=20 +> > > > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig > > index 18639e0cb6e2..b9d7cbb6bd76 100644 > > --- a/drivers/rtc/Kconfig @@ -49,7 +48,7 @@ Applied, thanks. > > @@ -183,6 +183,16 @@ config RTC_DRV_ABX80X > > This driver can also be built as a module. If so, the module > > will be called rtc-abx80x. -> > =20 +> > > > +config RTC_DRV_AC100 > > + tristate "X-Powers AC100" > > + depends on MFD_AC100 @@ -67,14 +66,14 @@ Applied, thanks. > > index ea2833723fa9..b07c28779573 100644 > > --- a/drivers/rtc/Makefile > > +++ b/drivers/rtc/Makefile -> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100) +=3D rtc-ab3100.o -> > obj-$(CONFIG_RTC_DRV_AB8500) +=3D rtc-ab8500.o -> > obj-$(CONFIG_RTC_DRV_ABB5ZES3) +=3D rtc-ab-b5ze-s3.o -> > obj-$(CONFIG_RTC_DRV_ABX80X) +=3D rtc-abx80x.o -> > +obj-$(CONFIG_RTC_DRV_AC100) +=3D rtc-ac100.o -> > obj-$(CONFIG_RTC_DRV_ARMADA38X) +=3D rtc-armada38x.o -> > obj-$(CONFIG_RTC_DRV_AS3722) +=3D rtc-as3722.o -> > obj-$(CONFIG_RTC_DRV_ASM9260) +=3D rtc-asm9260.o +> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100) += rtc-ab3100.o +> > obj-$(CONFIG_RTC_DRV_AB8500) += rtc-ab8500.o +> > obj-$(CONFIG_RTC_DRV_ABB5ZES3) += rtc-ab-b5ze-s3.o +> > obj-$(CONFIG_RTC_DRV_ABX80X) += rtc-abx80x.o +> > +obj-$(CONFIG_RTC_DRV_AC100) += rtc-ac100.o +> > obj-$(CONFIG_RTC_DRV_ARMADA38X) += rtc-armada38x.o +> > obj-$(CONFIG_RTC_DRV_AS3722) += rtc-as3722.o +> > obj-$(CONFIG_RTC_DRV_ASM9260) += rtc-asm9260.o > > diff --git a/drivers/rtc/rtc-ac100.c b/drivers/rtc/rtc-ac100.c > > new file mode 100644 > > index 000000000000..5a9ca89d04c7 @@ -88,17 +87,13 @@ Applied, thanks. > > + * > > + * Chen-Yu Tsai <wens@csie.org> > > + * -> > + * This program is free software; you can redistribute it and/or modif= -y +> > + * This program is free software; you can redistribute it and/or modify > > + * it under the terms of the GNU General Public License version 2 as > > + * published by the Free Software Foundation. > > + * -> > + * This program is distributed in the hope that it will be useful, but= - WITHOUT -> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY = -or -> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licen= -se for +> > + * This program is distributed in the hope that it will be useful, but WITHOUT +> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > > + * more details. > > + */ > > + @@ -143,14 +138,11 @@ se for > > +#define AC100_ALM_UPD_TRIGGER BIT(15) > > + > > +/* -> > + * The year parameter passed to the driver is usually an offset relati= -ve to -> > + * the year 1900. This macro is used to convert this offset to another= - one +> > + * The year parameter passed to the driver is usually an offset relative to +> > + * the year 1900. This macro is used to convert this offset to another one > > + * relative to the minimum year allowed by the hardware. > > + * -> > + * The year range is 1970 - 2069. This range is selected to match Allw= -inner's +> > + * The year range is 1970 - 2069. This range is selected to match Allwinner's > > + * driver. > > + */ > > +#define AC100_YEAR_MIN 1970 @@ -165,40 +157,38 @@ inner's > > + unsigned long alarm; > > +}; > > + -> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc= -_tm) +> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc_tm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; > > + u16 reg[7]; > > + int ret; > > + -> > + ret =3D regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7); +> > + ret = regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7); > > + if (ret) > > + return ret; > > + -> > + rtc_tm->tm_sec =3D bcd2bin(reg[0] & AC100_RTC_SEC_MASK); -> > + rtc_tm->tm_min =3D bcd2bin(reg[1] & AC100_RTC_MIN_MASK); -> > + rtc_tm->tm_hour =3D bcd2bin(reg[2] & AC100_RTC_HOU_MASK); -> > + rtc_tm->tm_wday =3D bcd2bin(reg[3] & AC100_RTC_WEE_MASK); -> > + rtc_tm->tm_mday =3D bcd2bin(reg[4] & AC100_RTC_DAY_MASK); -> > + rtc_tm->tm_mon =3D bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1; -> > + rtc_tm->tm_year =3D bcd2bin(reg[6] & AC100_RTC_YEA_MASK) + +> > + rtc_tm->tm_sec = bcd2bin(reg[0] & AC100_RTC_SEC_MASK); +> > + rtc_tm->tm_min = bcd2bin(reg[1] & AC100_RTC_MIN_MASK); +> > + rtc_tm->tm_hour = bcd2bin(reg[2] & AC100_RTC_HOU_MASK); +> > + rtc_tm->tm_wday = bcd2bin(reg[3] & AC100_RTC_WEE_MASK); +> > + rtc_tm->tm_mday = bcd2bin(reg[4] & AC100_RTC_DAY_MASK); +> > + rtc_tm->tm_mon = bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1; +> > + rtc_tm->tm_year = bcd2bin(reg[6] & AC100_RTC_YEA_MASK) + > > + AC100_YEAR_OFF; > > + > > + return rtc_valid_tm(rtc_tm); > > +} > > + -> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc= -_tm) +> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; > > + int year; > > + u16 reg[8]; > > + > > + /* our RTC has a limited year range... */ -> > + year =3D rtc_tm->tm_year - AC100_YEAR_OFF; +> > + year = rtc_tm->tm_year - AC100_YEAR_OFF; > > + if (year < 0 || year > (AC100_YEAR_MAX - 1900)) { > > + dev_err(dev, "rtc only supports year in range %d - %d\n", > > + AC100_YEAR_MIN, AC100_YEAR_MAX); @@ -206,79 +196,76 @@ _tm) > > + } > > + > > + /* convert to BCD */ -> > + reg[0] =3D bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK; -> > + reg[1] =3D bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK; -> > + reg[2] =3D bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK; -> > + reg[3] =3D bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK; -> > + reg[4] =3D bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK; -> > + reg[5] =3D bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK; -> > + reg[6] =3D bin2bcd(year) & AC100_RTC_YEA_MASK; +> > + reg[0] = bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK; +> > + reg[1] = bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK; +> > + reg[2] = bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK; +> > + reg[3] = bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK; +> > + reg[4] = bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK; +> > + reg[5] = bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK; +> > + reg[6] = bin2bcd(year) & AC100_RTC_YEA_MASK; > > + /* trigger write */ -> > + reg[7] =3D AC100_RTC_UPD_TRIGGER; +> > + reg[7] = AC100_RTC_UPD_TRIGGER; > > + > > + /* Is it a leap year? */ > > + if (is_leap_year(year + AC100_YEAR_OFF + 1900)) -> > + reg[6] |=3D AC100_RTC_YEA_LEAP; +> > + reg[6] |= AC100_RTC_YEA_LEAP; > > + > > + return regmap_bulk_write(regmap, AC100_RTC_SEC, reg, 8); > > +} > > + -> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int= - en) +> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int en) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; > > + unsigned int val; > > + -> > + val =3D en ? AC100_ALM_INT_ENABLE : 0; +> > + val = en ? AC100_ALM_INT_ENABLE : 0; > > + > > + return regmap_write(regmap, AC100_ALM_INT_ENA, val); > > +} > > + -> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *= -alrm) +> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *alrm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; -> > + struct rtc_time *alrm_tm =3D &alrm->time; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; +> > + struct rtc_time *alrm_tm = &alrm->time; > > + u16 reg[7]; > > + unsigned int val; > > + int ret; > > + -> > + ret =3D regmap_read(regmap, AC100_ALM_INT_ENA, &val); +> > + ret = regmap_read(regmap, AC100_ALM_INT_ENA, &val); > > + if (ret) > > + return ret; > > + -> > + alrm->enabled =3D !!(val & AC100_ALM_INT_ENABLE); +> > + alrm->enabled = !!(val & AC100_ALM_INT_ENABLE); > > + -> > + ret =3D regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7); +> > + ret = regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7); > > + if (ret) > > + return ret; > > + -> > + alrm_tm->tm_sec =3D bcd2bin(reg[0] & AC100_ALM_SEC_MASK); -> > + alrm_tm->tm_min =3D bcd2bin(reg[1] & AC100_ALM_MIN_MASK); -> > + alrm_tm->tm_hour =3D bcd2bin(reg[2] & AC100_ALM_HOU_MASK); -> > + alrm_tm->tm_wday =3D bcd2bin(reg[3] & AC100_ALM_WEE_MASK); -> > + alrm_tm->tm_mday =3D bcd2bin(reg[4] & AC100_ALM_DAY_MASK); -> > + alrm_tm->tm_mon =3D bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1; -> > + alrm_tm->tm_year =3D bcd2bin(reg[6] & AC100_ALM_YEA_MASK) + +> > + alrm_tm->tm_sec = bcd2bin(reg[0] & AC100_ALM_SEC_MASK); +> > + alrm_tm->tm_min = bcd2bin(reg[1] & AC100_ALM_MIN_MASK); +> > + alrm_tm->tm_hour = bcd2bin(reg[2] & AC100_ALM_HOU_MASK); +> > + alrm_tm->tm_wday = bcd2bin(reg[3] & AC100_ALM_WEE_MASK); +> > + alrm_tm->tm_mday = bcd2bin(reg[4] & AC100_ALM_DAY_MASK); +> > + alrm_tm->tm_mon = bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1; +> > + alrm_tm->tm_year = bcd2bin(reg[6] & AC100_ALM_YEA_MASK) + > > + AC100_YEAR_OFF; > > + > > + return 0; > > +} > > + -> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *= -alrm) +> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) > > +{ -> > + struct ac100_rtc_dev *chip =3D dev_get_drvdata(dev); -> > + struct regmap *regmap =3D chip->regmap; -> > + struct rtc_time *alrm_tm =3D &alrm->time; +> > + struct ac100_rtc_dev *chip = dev_get_drvdata(dev); +> > + struct regmap *regmap = chip->regmap; +> > + struct rtc_time *alrm_tm = &alrm->time; > > + u16 reg[8]; > > + int year; > > + int ret; > > + > > + /* our alarm has a limited year range... */ -> > + year =3D alrm_tm->tm_year - AC100_YEAR_OFF; +> > + year = alrm_tm->tm_year - AC100_YEAR_OFF; > > + if (year < 0 || year > (AC100_YEAR_MAX - 1900)) { > > + dev_err(dev, "alarm only supports year in range %d - %d\n", > > + AC100_YEAR_MIN, AC100_YEAR_MAX); @@ -286,24 +273,24 @@ alrm) > > + } > > + > > + /* convert to BCD */ -> > + reg[0] =3D (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) | +> > + reg[0] = (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[1] =3D (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) | +> > + reg[1] = (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[2] =3D (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) | +> > + reg[2] = (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) | > > + AC100_ALM_ENABLE_FLAG; > > + /* Do not enable weekday alarm */ -> > + reg[3] =3D bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK; -> > + reg[4] =3D (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) | +> > + reg[3] = bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK; +> > + reg[4] = (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[5] =3D (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) | +> > + reg[5] = (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) | > > + AC100_ALM_ENABLE_FLAG; -> > + reg[6] =3D (bin2bcd(year) & AC100_ALM_YEA_MASK) | +> > + reg[6] = (bin2bcd(year) & AC100_ALM_YEA_MASK) | > > + AC100_ALM_ENABLE_FLAG; > > + /* trigger write */ -> > + reg[7] =3D AC100_ALM_UPD_TRIGGER; +> > + reg[7] = AC100_ALM_UPD_TRIGGER; > > + -> > + ret =3D regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8); +> > + ret = regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8); > > + if (ret) > > + return ret; > > + @@ -312,15 +299,15 @@ alrm) > > + > > +static irqreturn_t ac100_rtc_irq(int irq, void *data) > > +{ -> > + struct ac100_rtc_dev *chip =3D data; -> > + struct regmap *regmap =3D chip->regmap; -> > + unsigned int val =3D 0; +> > + struct ac100_rtc_dev *chip = data; +> > + struct regmap *regmap = chip->regmap; +> > + unsigned int val = 0; > > + int ret; > > + > > + mutex_lock(&chip->rtc->ops_lock); > > + > > + /* read status */ -> > + ret =3D regmap_read(regmap, AC100_ALM_INT_STA, &val); +> > + ret = regmap_read(regmap, AC100_ALM_INT_STA, &val); > > + if (ret) > > + goto out; > > + @@ -329,12 +316,12 @@ alrm) > > + rtc_update_irq(chip->rtc, 1, RTC_AF | RTC_IRQF); > > + > > + /* clear status */ -> > + ret =3D regmap_write(regmap, AC100_ALM_INT_STA, val); +> > + ret = regmap_write(regmap, AC100_ALM_INT_STA, val); > > + if (ret) > > + goto out; > > + > > + /* disable interrupt */ -> > + ret =3D ac100_rtc_alarm_irq_enable(chip->dev, 0); +> > + ret = ac100_rtc_alarm_irq_enable(chip->dev, 0); > > + if (ret) > > + goto out; > > + } @@ -344,32 +331,32 @@ alrm) > > + return IRQ_HANDLED; > > +} > > + -> > +static const struct rtc_class_ops ac100_rtc_ops =3D { -> > + .read_time =3D ac100_rtc_get_time, -> > + .set_time =3D ac100_rtc_set_time, -> > + .read_alarm =3D ac100_rtc_get_alarm, -> > + .set_alarm =3D ac100_rtc_set_alarm, -> > + .alarm_irq_enable =3D ac100_rtc_alarm_irq_enable, +> > +static const struct rtc_class_ops ac100_rtc_ops = { +> > + .read_time = ac100_rtc_get_time, +> > + .set_time = ac100_rtc_set_time, +> > + .read_alarm = ac100_rtc_get_alarm, +> > + .set_alarm = ac100_rtc_set_alarm, +> > + .alarm_irq_enable = ac100_rtc_alarm_irq_enable, > > +}; > > + > > +static int ac100_rtc_probe(struct platform_device *pdev) > > +{ -> > + struct ac100_dev *ac100 =3D dev_get_drvdata(pdev->dev.parent); +> > + struct ac100_dev *ac100 = dev_get_drvdata(pdev->dev.parent); > > + struct ac100_rtc_dev *chip; > > + int ret; > > + -> > + chip =3D devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL); +> > + chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL); > > + platform_set_drvdata(pdev, chip); -> > + chip->dev =3D &pdev->dev; -> > + chip->regmap =3D ac100->regmap; +> > + chip->dev = &pdev->dev; +> > + chip->regmap = ac100->regmap; > > + -> > + chip->irq =3D platform_get_irq(pdev, 0); +> > + chip->irq = platform_get_irq(pdev, 0); > > + if (chip->irq < 0) { > > + dev_err(&pdev->dev, "No IRQ resource\n"); > > + return chip->irq; > > + } > > + -> > + ret =3D devm_request_threaded_irq(&pdev->dev, chip->irq, NULL, +> > + ret = devm_request_threaded_irq(&pdev->dev, chip->irq, NULL, > > + ac100_rtc_irq, > > + IRQF_SHARED | IRQF_ONESHOT, > > + dev_name(&pdev->dev), chip); @@ -379,8 +366,7 @@ alrm) > > + } > > + > > + /* always use 24 hour mode */ -> > + regmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR= -, +> > + regmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR, > > + AC100_RTC_CTRL_24HOUR); > > + > > + /* disable counter alarm interrupt */ @@ -389,7 +375,7 @@ alrm) > > + /* clear counter alarm pending interrupts */ > > + regmap_write(chip->regmap, AC100_ALM_INT_STA, AC100_ALM_INT_ENABLE); > > + -> > + chip->rtc =3D devm_rtc_device_register(&pdev->dev, "rtc-ac100", +> > + chip->rtc = devm_rtc_device_register(&pdev->dev, "rtc-ac100", > > + &ac100_rtc_ops, THIS_MODULE); > > + if (IS_ERR(chip->rtc)) { > > + dev_err(&pdev->dev, "unable to register device\n"); @@ -401,17 +387,17 @@ alrm) > > + return 0; > > +} > > + -> > +static const struct of_device_id ac100_rtc_match[] =3D { -> > + { .compatible =3D "x-powers,ac100-rtc" }, +> > +static const struct of_device_id ac100_rtc_match[] = { +> > + { .compatible = "x-powers,ac100-rtc" }, > > + { }, > > +}; > > +MODULE_DEVICE_TABLE(of, ac100_rtc_match); > > + -> > +static struct platform_driver ac100_rtc_driver =3D { -> > + .probe =3D ac100_rtc_probe, -> > + .driver =3D { -> > + .name =3D "ac100-rtc", -> > + .of_match_table =3D of_match_ptr(ac100_rtc_match), +> > +static struct platform_driver ac100_rtc_driver = { +> > + .probe = ac100_rtc_probe, +> > + .driver = { +> > + .name = "ac100-rtc", +> > + .of_match_table = of_match_ptr(ac100_rtc_match), > > + }, > > +}; > > +module_platform_driver(ac100_rtc_driver); @@ -419,22 +405,10 @@ alrm) > > +MODULE_DESCRIPTION("X-Powers AC100 RTC driver"); > > +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>"); > > +MODULE_LICENSE("GPL v2"); ->=20 +> ---=20 +-- Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org =E2=94=82 Open source software for ARM SoCs +Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog - ---=20 -You received this message because you are subscribed to "rtc-linux". -Membership options at http://groups.google.com/group/rtc-linux . -Please read http://groups.google.com/group/rtc-linux/web/checklist -before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. -For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N3/content_digest index 3cfaf36..be48e90 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,7 +2,7 @@ "ref\01467988422-17934-4-git-send-email-wens@csie.org\0" "ref\020160708162152.GM22202@piout.net\0" "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0[rtc-linux] Re: [PATCH v5 3/7] rtc: ac100: Add RTC driver for X-Powers AC100\0" + "Subject\0Re: [PATCH v5 3/7] rtc: ac100: Add RTC driver for X-Powers AC100\0" "Date\0Mon, 8 Aug 2016 12:57:07 +0100\0" "To\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" "Cc\0Chen-Yu Tsai <wens@csie.org>" @@ -19,11 +19,11 @@ "> On 08/07/2016 at 22:33:38 +0800, Chen-Yu Tsai wrote :\n" "> > X-Powers AC100 is a codec / RTC combo chip. This driver supports\n" "> > the RTC sub-device.\n" - "> >=20\n" + "> > \n" "> > The RTC block also has clock outputs and non-volatile storage.\n" "> > Non-volatile storage wthin the RTC hardware is not supported.\n" "> > Clock output support is added in the next patch.\n" - "> >=20\n" + "> > \n" "> > Signed-off-by: Chen-Yu Tsai <wens@csie.org>\n" "> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n" "\n" @@ -31,33 +31,32 @@ "\n" "> > ---\n" "> > Changes since v4:\n" - "> >=20\n" + "> > \n" "> > - None.\n" - "> >=20\n" + "> > \n" "> > Changes since v3:\n" - "> >=20\n" + "> > \n" "> > - Moved month/year conversion offsets inline with reg[] assignments\n" "> > - Used platform_get_irq instead of of_get_irq\n" "> > - Dropped separate mutex and use rtc->ops_lock in interrupt handler\n" "> > - Dropped of_irq.h from includes\n" "> > - Added of_device_id and .of_match_table\n" - "> >=20\n" + "> > \n" "> > Changes since v2:\n" - "> >=20\n" + "> > \n" "> > - Fixed off-by-1 errors in register mask macros\n" "> > - Fixed copy-paste error in set_alarm function\n" "> > - Drop uie_unsupported, since the alarm works now\n" "> > - Fixed up copyright notice\n" "> > - Changed license to GPL v2, matching mfd driver\n" - "> >=20\n" + "> > \n" "> > ---\n" "> > drivers/rtc/Kconfig | 10 ++\n" "> > drivers/rtc/Makefile | 1 +\n" - "> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++=\n" - "++++++++\n" + "> > drivers/rtc/rtc-ac100.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++++\n" "> > 3 files changed, 336 insertions(+)\n" "> > create mode 100644 drivers/rtc/rtc-ac100.c\n" - "> >=20\n" + "> > \n" "> > diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig\n" "> > index 18639e0cb6e2..b9d7cbb6bd76 100644\n" "> > --- a/drivers/rtc/Kconfig\n" @@ -65,7 +64,7 @@ "> > @@ -183,6 +183,16 @@ config RTC_DRV_ABX80X\n" "> > \t This driver can also be built as a module. If so, the module\n" "> > \t will be called rtc-abx80x.\n" - "> > =20\n" + "> > \n" "> > +config RTC_DRV_AC100\n" "> > +\ttristate \"X-Powers AC100\"\n" "> > +\tdepends on MFD_AC100\n" @@ -83,14 +82,14 @@ "> > index ea2833723fa9..b07c28779573 100644\n" "> > --- a/drivers/rtc/Makefile\n" "> > +++ b/drivers/rtc/Makefile\n" - "> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100)\t+=3D rtc-ab3100.o\n" - "> > obj-$(CONFIG_RTC_DRV_AB8500)\t+=3D rtc-ab8500.o\n" - "> > obj-$(CONFIG_RTC_DRV_ABB5ZES3)\t+=3D rtc-ab-b5ze-s3.o\n" - "> > obj-$(CONFIG_RTC_DRV_ABX80X)\t+=3D rtc-abx80x.o\n" - "> > +obj-$(CONFIG_RTC_DRV_AC100)\t+=3D rtc-ac100.o\n" - "> > obj-$(CONFIG_RTC_DRV_ARMADA38X)\t+=3D rtc-armada38x.o\n" - "> > obj-$(CONFIG_RTC_DRV_AS3722)\t+=3D rtc-as3722.o\n" - "> > obj-$(CONFIG_RTC_DRV_ASM9260)\t+=3D rtc-asm9260.o\n" + "> > @@ -26,6 +26,7 @@ obj-$(CONFIG_RTC_DRV_AB3100)\t+= rtc-ab3100.o\n" + "> > obj-$(CONFIG_RTC_DRV_AB8500)\t+= rtc-ab8500.o\n" + "> > obj-$(CONFIG_RTC_DRV_ABB5ZES3)\t+= rtc-ab-b5ze-s3.o\n" + "> > obj-$(CONFIG_RTC_DRV_ABX80X)\t+= rtc-abx80x.o\n" + "> > +obj-$(CONFIG_RTC_DRV_AC100)\t+= rtc-ac100.o\n" + "> > obj-$(CONFIG_RTC_DRV_ARMADA38X)\t+= rtc-armada38x.o\n" + "> > obj-$(CONFIG_RTC_DRV_AS3722)\t+= rtc-as3722.o\n" + "> > obj-$(CONFIG_RTC_DRV_ASM9260)\t+= rtc-asm9260.o\n" "> > diff --git a/drivers/rtc/rtc-ac100.c b/drivers/rtc/rtc-ac100.c\n" "> > new file mode 100644\n" "> > index 000000000000..5a9ca89d04c7\n" @@ -104,17 +103,13 @@ "> > + *\n" "> > + * Chen-Yu Tsai <wens@csie.org>\n" "> > + *\n" - "> > + * This program is free software; you can redistribute it and/or modif=\n" - "y\n" + "> > + * This program is free software; you can redistribute it and/or modify\n" "> > + * it under the terms of the GNU General Public License version 2 as\n" "> > + * published by the Free Software Foundation.\n" "> > + *\n" - "> > + * This program is distributed in the hope that it will be useful, but=\n" - " WITHOUT\n" - "> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY =\n" - "or\n" - "> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public Licen=\n" - "se for\n" + "> > + * This program is distributed in the hope that it will be useful, but WITHOUT\n" + "> > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n" + "> > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\n" "> > + * more details.\n" "> > + */\n" "> > +\n" @@ -159,14 +154,11 @@ "> > +#define AC100_ALM_UPD_TRIGGER\tBIT(15)\n" "> > +\n" "> > +/*\n" - "> > + * The year parameter passed to the driver is usually an offset relati=\n" - "ve to\n" - "> > + * the year 1900. This macro is used to convert this offset to another=\n" - " one\n" + "> > + * The year parameter passed to the driver is usually an offset relative to\n" + "> > + * the year 1900. This macro is used to convert this offset to another one\n" "> > + * relative to the minimum year allowed by the hardware.\n" "> > + *\n" - "> > + * The year range is 1970 - 2069. This range is selected to match Allw=\n" - "inner's\n" + "> > + * The year range is 1970 - 2069. This range is selected to match Allwinner's\n" "> > + * driver.\n" "> > + */\n" "> > +#define AC100_YEAR_MIN\t\t\t\t1970\n" @@ -181,40 +173,38 @@ "> > +\tunsigned long alarm;\n" "> > +};\n" "> > +\n" - "> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc=\n" - "_tm)\n" + "> > +static int ac100_rtc_get_time(struct device *dev, struct rtc_time *rtc_tm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" "> > +\tu16 reg[7];\n" "> > +\tint ret;\n" "> > +\n" - "> > +\tret =3D regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7);\n" + "> > +\tret = regmap_bulk_read(regmap, AC100_RTC_SEC, reg, 7);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" - "> > +\trtc_tm->tm_sec =3D bcd2bin(reg[0] & AC100_RTC_SEC_MASK);\n" - "> > +\trtc_tm->tm_min =3D bcd2bin(reg[1] & AC100_RTC_MIN_MASK);\n" - "> > +\trtc_tm->tm_hour =3D bcd2bin(reg[2] & AC100_RTC_HOU_MASK);\n" - "> > +\trtc_tm->tm_wday =3D bcd2bin(reg[3] & AC100_RTC_WEE_MASK);\n" - "> > +\trtc_tm->tm_mday =3D bcd2bin(reg[4] & AC100_RTC_DAY_MASK);\n" - "> > +\trtc_tm->tm_mon =3D bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1;\n" - "> > +\trtc_tm->tm_year =3D bcd2bin(reg[6] & AC100_RTC_YEA_MASK) +\n" + "> > +\trtc_tm->tm_sec = bcd2bin(reg[0] & AC100_RTC_SEC_MASK);\n" + "> > +\trtc_tm->tm_min = bcd2bin(reg[1] & AC100_RTC_MIN_MASK);\n" + "> > +\trtc_tm->tm_hour = bcd2bin(reg[2] & AC100_RTC_HOU_MASK);\n" + "> > +\trtc_tm->tm_wday = bcd2bin(reg[3] & AC100_RTC_WEE_MASK);\n" + "> > +\trtc_tm->tm_mday = bcd2bin(reg[4] & AC100_RTC_DAY_MASK);\n" + "> > +\trtc_tm->tm_mon = bcd2bin(reg[5] & AC100_RTC_MON_MASK) - 1;\n" + "> > +\trtc_tm->tm_year = bcd2bin(reg[6] & AC100_RTC_YEA_MASK) +\n" "> > +\t\t\t AC100_YEAR_OFF;\n" "> > +\n" "> > +\treturn rtc_valid_tm(rtc_tm);\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc=\n" - "_tm)\n" + "> > +static int ac100_rtc_set_time(struct device *dev, struct rtc_time *rtc_tm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" "> > +\tint year;\n" "> > +\tu16 reg[8];\n" "> > +\n" "> > +\t/* our RTC has a limited year range... */\n" - "> > +\tyear =3D rtc_tm->tm_year - AC100_YEAR_OFF;\n" + "> > +\tyear = rtc_tm->tm_year - AC100_YEAR_OFF;\n" "> > +\tif (year < 0 || year > (AC100_YEAR_MAX - 1900)) {\n" "> > +\t\tdev_err(dev, \"rtc only supports year in range %d - %d\\n\",\n" "> > +\t\t\tAC100_YEAR_MIN, AC100_YEAR_MAX);\n" @@ -222,79 +212,76 @@ "> > +\t}\n" "> > +\n" "> > +\t/* convert to BCD */\n" - "> > +\treg[0] =3D bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK;\n" - "> > +\treg[1] =3D bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK;\n" - "> > +\treg[2] =3D bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK;\n" - "> > +\treg[3] =3D bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK;\n" - "> > +\treg[4] =3D bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK;\n" - "> > +\treg[5] =3D bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK;\n" - "> > +\treg[6] =3D bin2bcd(year)\t\t & AC100_RTC_YEA_MASK;\n" + "> > +\treg[0] = bin2bcd(rtc_tm->tm_sec) & AC100_RTC_SEC_MASK;\n" + "> > +\treg[1] = bin2bcd(rtc_tm->tm_min) & AC100_RTC_MIN_MASK;\n" + "> > +\treg[2] = bin2bcd(rtc_tm->tm_hour) & AC100_RTC_HOU_MASK;\n" + "> > +\treg[3] = bin2bcd(rtc_tm->tm_wday) & AC100_RTC_WEE_MASK;\n" + "> > +\treg[4] = bin2bcd(rtc_tm->tm_mday) & AC100_RTC_DAY_MASK;\n" + "> > +\treg[5] = bin2bcd(rtc_tm->tm_mon + 1) & AC100_RTC_MON_MASK;\n" + "> > +\treg[6] = bin2bcd(year)\t\t & AC100_RTC_YEA_MASK;\n" "> > +\t/* trigger write */\n" - "> > +\treg[7] =3D AC100_RTC_UPD_TRIGGER;\n" + "> > +\treg[7] = AC100_RTC_UPD_TRIGGER;\n" "> > +\n" "> > +\t/* Is it a leap year? */\n" "> > +\tif (is_leap_year(year + AC100_YEAR_OFF + 1900))\n" - "> > +\t\treg[6] |=3D AC100_RTC_YEA_LEAP;\n" + "> > +\t\treg[6] |= AC100_RTC_YEA_LEAP;\n" "> > +\n" "> > +\treturn regmap_bulk_write(regmap, AC100_RTC_SEC, reg, 8);\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int=\n" - " en)\n" + "> > +static int ac100_rtc_alarm_irq_enable(struct device *dev, unsigned int en)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" "> > +\tunsigned int val;\n" "> > +\n" - "> > +\tval =3D en ? AC100_ALM_INT_ENABLE : 0;\n" + "> > +\tval = en ? AC100_ALM_INT_ENABLE : 0;\n" "> > +\n" "> > +\treturn regmap_write(regmap, AC100_ALM_INT_ENA, val);\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *=\n" - "alrm)\n" + "> > +static int ac100_rtc_get_alarm(struct device *dev, struct rtc_wkalrm *alrm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" - "> > +\tstruct rtc_time *alrm_tm =3D &alrm->time;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" + "> > +\tstruct rtc_time *alrm_tm = &alrm->time;\n" "> > +\tu16 reg[7];\n" "> > +\tunsigned int val;\n" "> > +\tint ret;\n" "> > +\n" - "> > +\tret =3D regmap_read(regmap, AC100_ALM_INT_ENA, &val);\n" + "> > +\tret = regmap_read(regmap, AC100_ALM_INT_ENA, &val);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" - "> > +\talrm->enabled =3D !!(val & AC100_ALM_INT_ENABLE);\n" + "> > +\talrm->enabled = !!(val & AC100_ALM_INT_ENABLE);\n" "> > +\n" - "> > +\tret =3D regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7);\n" + "> > +\tret = regmap_bulk_read(regmap, AC100_ALM_SEC, reg, 7);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" - "> > +\talrm_tm->tm_sec =3D bcd2bin(reg[0] & AC100_ALM_SEC_MASK);\n" - "> > +\talrm_tm->tm_min =3D bcd2bin(reg[1] & AC100_ALM_MIN_MASK);\n" - "> > +\talrm_tm->tm_hour =3D bcd2bin(reg[2] & AC100_ALM_HOU_MASK);\n" - "> > +\talrm_tm->tm_wday =3D bcd2bin(reg[3] & AC100_ALM_WEE_MASK);\n" - "> > +\talrm_tm->tm_mday =3D bcd2bin(reg[4] & AC100_ALM_DAY_MASK);\n" - "> > +\talrm_tm->tm_mon =3D bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1;\n" - "> > +\talrm_tm->tm_year =3D bcd2bin(reg[6] & AC100_ALM_YEA_MASK) +\n" + "> > +\talrm_tm->tm_sec = bcd2bin(reg[0] & AC100_ALM_SEC_MASK);\n" + "> > +\talrm_tm->tm_min = bcd2bin(reg[1] & AC100_ALM_MIN_MASK);\n" + "> > +\talrm_tm->tm_hour = bcd2bin(reg[2] & AC100_ALM_HOU_MASK);\n" + "> > +\talrm_tm->tm_wday = bcd2bin(reg[3] & AC100_ALM_WEE_MASK);\n" + "> > +\talrm_tm->tm_mday = bcd2bin(reg[4] & AC100_ALM_DAY_MASK);\n" + "> > +\talrm_tm->tm_mon = bcd2bin(reg[5] & AC100_ALM_MON_MASK) - 1;\n" + "> > +\talrm_tm->tm_year = bcd2bin(reg[6] & AC100_ALM_YEA_MASK) +\n" "> > +\t\t\t AC100_YEAR_OFF;\n" "> > +\n" "> > +\treturn 0;\n" "> > +}\n" "> > +\n" - "> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *=\n" - "alrm)\n" + "> > +static int ac100_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D dev_get_drvdata(dev);\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" - "> > +\tstruct rtc_time *alrm_tm =3D &alrm->time;\n" + "> > +\tstruct ac100_rtc_dev *chip = dev_get_drvdata(dev);\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" + "> > +\tstruct rtc_time *alrm_tm = &alrm->time;\n" "> > +\tu16 reg[8];\n" "> > +\tint year;\n" "> > +\tint ret;\n" "> > +\n" "> > +\t/* our alarm has a limited year range... */\n" - "> > +\tyear =3D alrm_tm->tm_year - AC100_YEAR_OFF;\n" + "> > +\tyear = alrm_tm->tm_year - AC100_YEAR_OFF;\n" "> > +\tif (year < 0 || year > (AC100_YEAR_MAX - 1900)) {\n" "> > +\t\tdev_err(dev, \"alarm only supports year in range %d - %d\\n\",\n" "> > +\t\t\tAC100_YEAR_MIN, AC100_YEAR_MAX);\n" @@ -302,24 +289,24 @@ "> > +\t}\n" "> > +\n" "> > +\t/* convert to BCD */\n" - "> > +\treg[0] =3D (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) |\n" + "> > +\treg[0] = (bin2bcd(alrm_tm->tm_sec) & AC100_ALM_SEC_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[1] =3D (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) |\n" + "> > +\treg[1] = (bin2bcd(alrm_tm->tm_min) & AC100_ALM_MIN_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[2] =3D (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) |\n" + "> > +\treg[2] = (bin2bcd(alrm_tm->tm_hour) & AC100_ALM_HOU_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" "> > +\t/* Do not enable weekday alarm */\n" - "> > +\treg[3] =3D bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK;\n" - "> > +\treg[4] =3D (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) |\n" + "> > +\treg[3] = bin2bcd(alrm_tm->tm_wday) & AC100_ALM_WEE_MASK;\n" + "> > +\treg[4] = (bin2bcd(alrm_tm->tm_mday) & AC100_ALM_DAY_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[5] =3D (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) |\n" + "> > +\treg[5] = (bin2bcd(alrm_tm->tm_mon + 1) & AC100_ALM_MON_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" - "> > +\treg[6] =3D (bin2bcd(year) & AC100_ALM_YEA_MASK) |\n" + "> > +\treg[6] = (bin2bcd(year) & AC100_ALM_YEA_MASK) |\n" "> > +\t\t\tAC100_ALM_ENABLE_FLAG;\n" "> > +\t/* trigger write */\n" - "> > +\treg[7] =3D AC100_ALM_UPD_TRIGGER;\n" + "> > +\treg[7] = AC100_ALM_UPD_TRIGGER;\n" "> > +\n" - "> > +\tret =3D regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8);\n" + "> > +\tret = regmap_bulk_write(regmap, AC100_ALM_SEC, reg, 8);\n" "> > +\tif (ret)\n" "> > +\t\treturn ret;\n" "> > +\n" @@ -328,15 +315,15 @@ "> > +\n" "> > +static irqreturn_t ac100_rtc_irq(int irq, void *data)\n" "> > +{\n" - "> > +\tstruct ac100_rtc_dev *chip =3D data;\n" - "> > +\tstruct regmap *regmap =3D chip->regmap;\n" - "> > +\tunsigned int val =3D 0;\n" + "> > +\tstruct ac100_rtc_dev *chip = data;\n" + "> > +\tstruct regmap *regmap = chip->regmap;\n" + "> > +\tunsigned int val = 0;\n" "> > +\tint ret;\n" "> > +\n" "> > +\tmutex_lock(&chip->rtc->ops_lock);\n" "> > +\n" "> > +\t/* read status */\n" - "> > +\tret =3D regmap_read(regmap, AC100_ALM_INT_STA, &val);\n" + "> > +\tret = regmap_read(regmap, AC100_ALM_INT_STA, &val);\n" "> > +\tif (ret)\n" "> > +\t\tgoto out;\n" "> > +\n" @@ -345,12 +332,12 @@ "> > +\t\trtc_update_irq(chip->rtc, 1, RTC_AF | RTC_IRQF);\n" "> > +\n" "> > +\t\t/* clear status */\n" - "> > +\t\tret =3D regmap_write(regmap, AC100_ALM_INT_STA, val);\n" + "> > +\t\tret = regmap_write(regmap, AC100_ALM_INT_STA, val);\n" "> > +\t\tif (ret)\n" "> > +\t\t\tgoto out;\n" "> > +\n" "> > +\t\t/* disable interrupt */\n" - "> > +\t\tret =3D ac100_rtc_alarm_irq_enable(chip->dev, 0);\n" + "> > +\t\tret = ac100_rtc_alarm_irq_enable(chip->dev, 0);\n" "> > +\t\tif (ret)\n" "> > +\t\t\tgoto out;\n" "> > +\t}\n" @@ -360,32 +347,32 @@ "> > +\treturn IRQ_HANDLED;\n" "> > +}\n" "> > +\n" - "> > +static const struct rtc_class_ops ac100_rtc_ops =3D {\n" - "> > +\t.read_time\t =3D ac100_rtc_get_time,\n" - "> > +\t.set_time\t =3D ac100_rtc_set_time,\n" - "> > +\t.read_alarm\t =3D ac100_rtc_get_alarm,\n" - "> > +\t.set_alarm\t =3D ac100_rtc_set_alarm,\n" - "> > +\t.alarm_irq_enable =3D ac100_rtc_alarm_irq_enable,\n" + "> > +static const struct rtc_class_ops ac100_rtc_ops = {\n" + "> > +\t.read_time\t = ac100_rtc_get_time,\n" + "> > +\t.set_time\t = ac100_rtc_set_time,\n" + "> > +\t.read_alarm\t = ac100_rtc_get_alarm,\n" + "> > +\t.set_alarm\t = ac100_rtc_set_alarm,\n" + "> > +\t.alarm_irq_enable = ac100_rtc_alarm_irq_enable,\n" "> > +};\n" "> > +\n" "> > +static int ac100_rtc_probe(struct platform_device *pdev)\n" "> > +{\n" - "> > +\tstruct ac100_dev *ac100 =3D dev_get_drvdata(pdev->dev.parent);\n" + "> > +\tstruct ac100_dev *ac100 = dev_get_drvdata(pdev->dev.parent);\n" "> > +\tstruct ac100_rtc_dev *chip;\n" "> > +\tint ret;\n" "> > +\n" - "> > +\tchip =3D devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);\n" + "> > +\tchip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);\n" "> > +\tplatform_set_drvdata(pdev, chip);\n" - "> > +\tchip->dev =3D &pdev->dev;\n" - "> > +\tchip->regmap =3D ac100->regmap;\n" + "> > +\tchip->dev = &pdev->dev;\n" + "> > +\tchip->regmap = ac100->regmap;\n" "> > +\n" - "> > +\tchip->irq =3D platform_get_irq(pdev, 0);\n" + "> > +\tchip->irq = platform_get_irq(pdev, 0);\n" "> > +\tif (chip->irq < 0) {\n" "> > +\t\tdev_err(&pdev->dev, \"No IRQ resource\\n\");\n" "> > +\t\treturn chip->irq;\n" "> > +\t}\n" "> > +\n" - "> > +\tret =3D devm_request_threaded_irq(&pdev->dev, chip->irq, NULL,\n" + "> > +\tret = devm_request_threaded_irq(&pdev->dev, chip->irq, NULL,\n" "> > +\t\t\t\t\tac100_rtc_irq,\n" "> > +\t\t\t\t\tIRQF_SHARED | IRQF_ONESHOT,\n" "> > +\t\t\t\t\tdev_name(&pdev->dev), chip);\n" @@ -395,8 +382,7 @@ "> > +\t}\n" "> > +\n" "> > +\t/* always use 24 hour mode */\n" - "> > +\tregmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR=\n" - ",\n" + "> > +\tregmap_write_bits(chip->regmap, AC100_RTC_CTRL, AC100_RTC_CTRL_24HOUR,\n" "> > +\t\t\t AC100_RTC_CTRL_24HOUR);\n" "> > +\n" "> > +\t/* disable counter alarm interrupt */\n" @@ -405,7 +391,7 @@ "> > +\t/* clear counter alarm pending interrupts */\n" "> > +\tregmap_write(chip->regmap, AC100_ALM_INT_STA, AC100_ALM_INT_ENABLE);\n" "> > +\n" - "> > +\tchip->rtc =3D devm_rtc_device_register(&pdev->dev, \"rtc-ac100\",\n" + "> > +\tchip->rtc = devm_rtc_device_register(&pdev->dev, \"rtc-ac100\",\n" "> > +\t\t\t\t\t &ac100_rtc_ops, THIS_MODULE);\n" "> > +\tif (IS_ERR(chip->rtc)) {\n" "> > +\t\tdev_err(&pdev->dev, \"unable to register device\\n\");\n" @@ -417,17 +403,17 @@ "> > +\treturn 0;\n" "> > +}\n" "> > +\n" - "> > +static const struct of_device_id ac100_rtc_match[] =3D {\n" - "> > +\t{ .compatible =3D \"x-powers,ac100-rtc\" },\n" + "> > +static const struct of_device_id ac100_rtc_match[] = {\n" + "> > +\t{ .compatible = \"x-powers,ac100-rtc\" },\n" "> > +\t{ },\n" "> > +};\n" "> > +MODULE_DEVICE_TABLE(of, ac100_rtc_match);\n" "> > +\n" - "> > +static struct platform_driver ac100_rtc_driver =3D {\n" - "> > +\t.probe\t\t=3D ac100_rtc_probe,\n" - "> > +\t.driver\t\t=3D {\n" - "> > +\t\t.name\t\t=3D \"ac100-rtc\",\n" - "> > +\t\t.of_match_table\t=3D of_match_ptr(ac100_rtc_match),\n" + "> > +static struct platform_driver ac100_rtc_driver = {\n" + "> > +\t.probe\t\t= ac100_rtc_probe,\n" + "> > +\t.driver\t\t= {\n" + "> > +\t\t.name\t\t= \"ac100-rtc\",\n" + "> > +\t\t.of_match_table\t= of_match_ptr(ac100_rtc_match),\n" "> > +\t},\n" "> > +};\n" "> > +module_platform_driver(ac100_rtc_driver);\n" @@ -435,24 +421,12 @@ "> > +MODULE_DESCRIPTION(\"X-Powers AC100 RTC driver\");\n" "> > +MODULE_AUTHOR(\"Chen-Yu Tsai <wens@csie.org>\");\n" "> > +MODULE_LICENSE(\"GPL v2\");\n" - ">=20\n" + "> \n" "\n" - "--=20\n" + "-- \n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" - "Follow Linaro: Facebook | Twitter | Blog\n" - "\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "Linaro.org \342\224\202 Open source software for ARM SoCs\n" + Follow Linaro: Facebook | Twitter | Blog -788f500da3dd81aab883d296f993acda476dab2da9405e8cad9c6af51f32f0c6 +f8393118b0483f45ea390909d6d33981e8343766329e57cbe38c1ef387906a7f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.