diff for duplicates of <20151030172325.GB4058@x1> diff --git a/a/1.txt b/N1/1.txt index e5e282b..ea605d9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,61 +11,66 @@ On Fri, 30 Oct 2015, Alim Akhtar wrote: > WDUR and ADUR high, whereas for s2mps15 only set AUDR to high. > 3> On s2mps15, WUDR, RUDR and AUDR functions should never be used > at the same time. -> +>=20 > This patch add required changes to enable s2mps15 rtc timer. -> +>=20 > Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com> > Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com> > --- -> drivers/rtc/rtc-s5m.c | 37 +++++++++++++++++++++++++++++++++---- +> drivers/rtc/rtc-s5m.c | 37 +++++++++++++++++++++++++++++++++= +---- > include/linux/mfd/samsung/rtc.h | 2 ++ For the MFD change: Acked-by: Lee Jones <lee.jones@linaro.org> > 2 files changed, 35 insertions(+), 4 deletions(-) -> +>=20 > diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c > index f2504b4eef34..0d68a85dd429 100644 > --- a/drivers/rtc/rtc-s5m.c > +++ b/drivers/rtc/rtc-s5m.c -> @@ -188,6 +188,7 @@ static inline int s5m_check_peding_alarm_interrupt(struct s5m_rtc_info *info, -> ret = regmap_read(info->regmap, S5M_RTC_STATUS, &val); -> val &= S5M_ALARM0_STATUS; +> @@ -188,6 +188,7 @@ static inline int s5m_check_peding_alarm_interrupt(st= +ruct s5m_rtc_info *info, +> ret =3D regmap_read(info->regmap, S5M_RTC_STATUS, &val); +> val &=3D S5M_ALARM0_STATUS; > break; > + case S2MPS15X: > case S2MPS14X: > case S2MPS13X: -> ret = regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2, -> @@ -219,9 +220,22 @@ static inline int s5m8767_rtc_set_time_reg(struct s5m_rtc_info *info) +> ret =3D regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2, +> @@ -219,9 +220,22 @@ static inline int s5m8767_rtc_set_time_reg(struct s5= +m_rtc_info *info) > return ret; > } -> -> - data |= info->regs->rtc_udr_mask; -> - if (info->device_type == S5M8763X || info->device_type == S5M8767X) -> - data |= S5M_RTC_TIME_EN_MASK; +> =20 +> - data |=3D info->regs->rtc_udr_mask; +> - if (info->device_type =3D=3D S5M8763X || info->device_type =3D=3D S5M87= +67X) +> - data |=3D S5M_RTC_TIME_EN_MASK; > + switch (info->device_type) { > + case S5M8763X: > + case S5M8767X: -> + data |= info->regs->rtc_udr_mask | S5M_RTC_TIME_EN_MASK; +> + data |=3D info->regs->rtc_udr_mask | S5M_RTC_TIME_EN_MASK; > + case S2MPS15X: > + /* As per UM, for write time register, set WUDR bit to high */ -> + data |= S2MPS15_RTC_WUDR_MASK; +> + data |=3D S2MPS15_RTC_WUDR_MASK; > + break; > + case S2MPS14X: > + case S2MPS13X: -> + data |= info->regs->rtc_udr_mask; +> + data |=3D info->regs->rtc_udr_mask; > + break; > + default: > + return -EINVAL; > + } > + -> -> ret = regmap_write(info->regmap, info->regs->rtc_udr_update, data); +> =20 +> ret =3D regmap_write(info->regmap, info->regs->rtc_udr_update, data); > if (ret < 0) { -> @@ -252,6 +266,11 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info) +> @@ -252,6 +266,11 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s= +5m_rtc_info *info) > case S5M8767X: -> data &= ~S5M_RTC_TIME_EN_MASK; +> data &=3D ~S5M_RTC_TIME_EN_MASK; > break; > + case S2MPS15X: > + /* As per UM, for write alarm, set A_UDR(bit[4]) to high @@ -73,83 +78,95 @@ For the MFD change: > + */ > + break; > case S2MPS14X: -> data |= S2MPS_RTC_RUDR_MASK; +> data |=3D S2MPS_RTC_RUDR_MASK; > break; -> @@ -317,7 +336,8 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm) +> @@ -317,7 +336,8 @@ static int s5m_rtc_read_time(struct device *dev, stru= +ct rtc_time *tm) > u8 data[info->regs->regs_count]; > int ret; -> -> - if (info->device_type == S2MPS14X || info->device_type == S2MPS13X) { -> + if (info->device_type == S2MPS15X || info->device_type == S2MPS14X || -> + info->device_type == S2MPS13X) { -> ret = regmap_update_bits(info->regmap, +> =20 +> - if (info->device_type =3D=3D S2MPS14X || info->device_type =3D=3D S2MPS= +13X) { +> + if (info->device_type =3D=3D S2MPS15X || info->device_type =3D=3D S2MPS= +14X || +> + info->device_type =3D=3D S2MPS13X) { +> ret =3D regmap_update_bits(info->regmap, > info->regs->rtc_udr_update, > S2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK); -> @@ -339,6 +359,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm) +> @@ -339,6 +359,7 @@ static int s5m_rtc_read_time(struct device *dev, stru= +ct rtc_time *tm) > break; -> +> =20 > case S5M8767X: > + case S2MPS15X: > case S2MPS14X: > case S2MPS13X: > s5m8767_data_to_tm(data, tm, info->rtc_24hr_mode); -> @@ -366,6 +387,7 @@ static int s5m_rtc_set_time(struct device *dev, struct rtc_time *tm) +> @@ -366,6 +387,7 @@ static int s5m_rtc_set_time(struct device *dev, struc= +t rtc_time *tm) > s5m8763_tm_to_data(tm, data); > break; > case S5M8767X: > + case S2MPS15X: > case S2MPS14X: > case S2MPS13X: -> ret = s5m8767_tm_to_data(tm, data); -> @@ -414,6 +436,7 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) +> ret =3D s5m8767_tm_to_data(tm, data); +> @@ -414,6 +436,7 @@ static int s5m_rtc_read_alarm(struct device *dev, str= +uct rtc_wkalrm *alrm) > break; -> +> =20 > case S5M8767X: > + case S2MPS15X: > case S2MPS14X: > case S2MPS13X: > s5m8767_data_to_tm(data, &alrm->time, info->rtc_24hr_mode); -> @@ -463,6 +486,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info) +> @@ -463,6 +486,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *in= +fo) > break; -> +> =20 > case S5M8767X: > + case S2MPS15X: > case S2MPS14X: > case S2MPS13X: -> for (i = 0; i < info->regs->regs_count; i++) -> @@ -508,6 +532,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info) +> for (i =3D 0; i < info->regs->regs_count; i++) +> @@ -508,6 +532,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *i= +nfo) > break; -> +> =20 > case S5M8767X: > + case S2MPS15X: > case S2MPS14X: > case S2MPS13X: -> data[RTC_SEC] |= ALARM_ENABLE_MASK; -> @@ -548,6 +573,7 @@ static int s5m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) +> data[RTC_SEC] |=3D ALARM_ENABLE_MASK; +> @@ -548,6 +573,7 @@ static int s5m_rtc_set_alarm(struct device *dev, stru= +ct rtc_wkalrm *alrm) > break; -> +> =20 > case S5M8767X: > + case S2MPS15X: > case S2MPS14X: > case S2MPS13X: > s5m8767_tm_to_data(&alrm->time, data); -> @@ -631,6 +657,7 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info) -> ret = regmap_raw_write(info->regmap, S5M_ALARM0_CONF, data, 2); +> @@ -631,6 +657,7 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *= +info) +> ret =3D regmap_raw_write(info->regmap, S5M_ALARM0_CONF, data, 2); > break; -> +> =20 > + case S2MPS15X: > case S2MPS14X: > case S2MPS13X: -> data[0] = (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT); -> @@ -679,6 +706,7 @@ static int s5m_rtc_probe(struct platform_device *pdev) +> data[0] =3D (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT); +> @@ -679,6 +706,7 @@ static int s5m_rtc_probe(struct platform_device *pdev= +) > return -ENOMEM; -> +> =20 > switch (platform_get_device_id(pdev)->driver_data) { > + case S2MPS15X: > case S2MPS14X: > case S2MPS13X: -> regmap_cfg = &s2mps14_rtc_regmap_config; -> @@ -805,6 +833,7 @@ static const struct platform_device_id s5m_rtc_id[] = { +> regmap_cfg =3D &s2mps14_rtc_regmap_config; +> @@ -805,6 +833,7 @@ static const struct platform_device_id s5m_rtc_id[] = +=3D { > { "s5m-rtc", S5M8767X }, > { "s2mps13-rtc", S2MPS13X }, > { "s2mps14-rtc", S2MPS14X }, @@ -157,7 +174,8 @@ For the MFD change: > { }, > }; > MODULE_DEVICE_TABLE(platform, s5m_rtc_id); -> diff --git a/include/linux/mfd/samsung/rtc.h b/include/linux/mfd/samsung/rtc.h +> diff --git a/include/linux/mfd/samsung/rtc.h b/include/linux/mfd/samsung/= +rtc.h > index 29c30ac36020..a65e4655d470 100644 > --- a/include/linux/mfd/samsung/rtc.h > +++ b/include/linux/mfd/samsung/rtc.h @@ -171,8 +189,21 @@ For the MFD change: > #define S2MPS_RTC_RUDR_MASK (1 << S2MPS_RTC_RUDR_SHIFT) > #define RTC_TCON_SHIFT 1 --- +--=20 Lee Jones Linaro STMicroelectronics Landing Team Lead -Linaro.org │ Open source software for ARM SoCs +Linaro.org =E2=94=82 Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog + +--=20 +--=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 f6cb09a..8203ac1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01446186334-16510-1-git-send-email-alim.akhtar@samsung.com\0" "ref\01446186334-16510-5-git-send-email-alim.akhtar@samsung.com\0" "From\0Lee Jones <lee.jones@linaro.org>\0" - "Subject\0Re: [PATCH v5 4/4] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC\0" + "Subject\0[rtc-linux] Re: [PATCH v5 4/4] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC\0" "Date\0Fri, 30 Oct 2015 17:23:25 +0000\0" "To\0Alim Akhtar <alim.akhtar@samsung.com>\0" "Cc\0broonie@kernel.org" @@ -25,61 +25,66 @@ "> WDUR and ADUR high, whereas for s2mps15 only set AUDR to high.\n" "> 3> On s2mps15, WUDR, RUDR and AUDR functions should never be used\n" "> at the same time.\n" - "> \n" + ">=20\n" "> This patch add required changes to enable s2mps15 rtc timer.\n" - "> \n" + ">=20\n" "> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n" "> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>\n" "> ---\n" - "> drivers/rtc/rtc-s5m.c | 37 +++++++++++++++++++++++++++++++++----\n" + "> drivers/rtc/rtc-s5m.c | 37 +++++++++++++++++++++++++++++++++=\n" + "----\n" "> include/linux/mfd/samsung/rtc.h | 2 ++\n" "\n" "For the MFD change:\n" " Acked-by: Lee Jones <lee.jones@linaro.org>\n" "\n" "> 2 files changed, 35 insertions(+), 4 deletions(-)\n" - "> \n" + ">=20\n" "> diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c\n" "> index f2504b4eef34..0d68a85dd429 100644\n" "> --- a/drivers/rtc/rtc-s5m.c\n" "> +++ b/drivers/rtc/rtc-s5m.c\n" - "> @@ -188,6 +188,7 @@ static inline int s5m_check_peding_alarm_interrupt(struct s5m_rtc_info *info,\n" - "> \t\tret = regmap_read(info->regmap, S5M_RTC_STATUS, &val);\n" - "> \t\tval &= S5M_ALARM0_STATUS;\n" + "> @@ -188,6 +188,7 @@ static inline int s5m_check_peding_alarm_interrupt(st=\n" + "ruct s5m_rtc_info *info,\n" + "> \t\tret =3D regmap_read(info->regmap, S5M_RTC_STATUS, &val);\n" + "> \t\tval &=3D S5M_ALARM0_STATUS;\n" "> \t\tbreak;\n" "> +\tcase S2MPS15X:\n" "> \tcase S2MPS14X:\n" "> \tcase S2MPS13X:\n" - "> \t\tret = regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2,\n" - "> @@ -219,9 +220,22 @@ static inline int s5m8767_rtc_set_time_reg(struct s5m_rtc_info *info)\n" + "> \t\tret =3D regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2,\n" + "> @@ -219,9 +220,22 @@ static inline int s5m8767_rtc_set_time_reg(struct s5=\n" + "m_rtc_info *info)\n" "> \t\treturn ret;\n" "> \t}\n" - "> \n" - "> -\tdata |= info->regs->rtc_udr_mask;\n" - "> -\tif (info->device_type == S5M8763X || info->device_type == S5M8767X)\n" - "> -\t\tdata |= S5M_RTC_TIME_EN_MASK;\n" + "> =20\n" + "> -\tdata |=3D info->regs->rtc_udr_mask;\n" + "> -\tif (info->device_type =3D=3D S5M8763X || info->device_type =3D=3D S5M87=\n" + "67X)\n" + "> -\t\tdata |=3D S5M_RTC_TIME_EN_MASK;\n" "> +\tswitch (info->device_type) {\n" "> +\tcase S5M8763X:\n" "> +\tcase S5M8767X:\n" - "> +\t\tdata |= info->regs->rtc_udr_mask | S5M_RTC_TIME_EN_MASK;\n" + "> +\t\tdata |=3D info->regs->rtc_udr_mask | S5M_RTC_TIME_EN_MASK;\n" "> +\tcase S2MPS15X:\n" "> +\t\t/* As per UM, for write time register, set WUDR bit to high */\n" - "> +\t\tdata |= S2MPS15_RTC_WUDR_MASK;\n" + "> +\t\tdata |=3D S2MPS15_RTC_WUDR_MASK;\n" "> +\t\tbreak;\n" "> +\tcase S2MPS14X:\n" "> +\tcase S2MPS13X:\n" - "> +\t\tdata |= info->regs->rtc_udr_mask;\n" + "> +\t\tdata |=3D info->regs->rtc_udr_mask;\n" "> +\t\tbreak;\n" "> +\tdefault:\n" "> +\t\treturn -EINVAL;\n" "> +\t}\n" "> +\n" - "> \n" - "> \tret = regmap_write(info->regmap, info->regs->rtc_udr_update, data);\n" + "> =20\n" + "> \tret =3D regmap_write(info->regmap, info->regs->rtc_udr_update, data);\n" "> \tif (ret < 0) {\n" - "> @@ -252,6 +266,11 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)\n" + "> @@ -252,6 +266,11 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s=\n" + "5m_rtc_info *info)\n" "> \tcase S5M8767X:\n" - "> \t\tdata &= ~S5M_RTC_TIME_EN_MASK;\n" + "> \t\tdata &=3D ~S5M_RTC_TIME_EN_MASK;\n" "> \t\tbreak;\n" "> +\tcase S2MPS15X:\n" "> +\t\t/* As per UM, for write alarm, set A_UDR(bit[4]) to high\n" @@ -87,83 +92,95 @@ "> +\t\t */\n" "> +\t\tbreak;\n" "> \tcase S2MPS14X:\n" - "> \t\tdata |= S2MPS_RTC_RUDR_MASK;\n" + "> \t\tdata |=3D S2MPS_RTC_RUDR_MASK;\n" "> \t\tbreak;\n" - "> @@ -317,7 +336,8 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)\n" + "> @@ -317,7 +336,8 @@ static int s5m_rtc_read_time(struct device *dev, stru=\n" + "ct rtc_time *tm)\n" "> \tu8 data[info->regs->regs_count];\n" "> \tint ret;\n" - "> \n" - "> -\tif (info->device_type == S2MPS14X || info->device_type == S2MPS13X) {\n" - "> +\tif (info->device_type == S2MPS15X || info->device_type == S2MPS14X ||\n" - "> +\t\t\tinfo->device_type == S2MPS13X) {\n" - "> \t\tret = regmap_update_bits(info->regmap,\n" + "> =20\n" + "> -\tif (info->device_type =3D=3D S2MPS14X || info->device_type =3D=3D S2MPS=\n" + "13X) {\n" + "> +\tif (info->device_type =3D=3D S2MPS15X || info->device_type =3D=3D S2MPS=\n" + "14X ||\n" + "> +\t\t\tinfo->device_type =3D=3D S2MPS13X) {\n" + "> \t\tret =3D regmap_update_bits(info->regmap,\n" "> \t\t\t\tinfo->regs->rtc_udr_update,\n" "> \t\t\t\tS2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK);\n" - "> @@ -339,6 +359,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)\n" + "> @@ -339,6 +359,7 @@ static int s5m_rtc_read_time(struct device *dev, stru=\n" + "ct rtc_time *tm)\n" "> \t\tbreak;\n" - "> \n" + "> =20\n" "> \tcase S5M8767X:\n" "> +\tcase S2MPS15X:\n" "> \tcase S2MPS14X:\n" "> \tcase S2MPS13X:\n" "> \t\ts5m8767_data_to_tm(data, tm, info->rtc_24hr_mode);\n" - "> @@ -366,6 +387,7 @@ static int s5m_rtc_set_time(struct device *dev, struct rtc_time *tm)\n" + "> @@ -366,6 +387,7 @@ static int s5m_rtc_set_time(struct device *dev, struc=\n" + "t rtc_time *tm)\n" "> \t\ts5m8763_tm_to_data(tm, data);\n" "> \t\tbreak;\n" "> \tcase S5M8767X:\n" "> +\tcase S2MPS15X:\n" "> \tcase S2MPS14X:\n" "> \tcase S2MPS13X:\n" - "> \t\tret = s5m8767_tm_to_data(tm, data);\n" - "> @@ -414,6 +436,7 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)\n" + "> \t\tret =3D s5m8767_tm_to_data(tm, data);\n" + "> @@ -414,6 +436,7 @@ static int s5m_rtc_read_alarm(struct device *dev, str=\n" + "uct rtc_wkalrm *alrm)\n" "> \t\tbreak;\n" - "> \n" + "> =20\n" "> \tcase S5M8767X:\n" "> +\tcase S2MPS15X:\n" "> \tcase S2MPS14X:\n" "> \tcase S2MPS13X:\n" "> \t\ts5m8767_data_to_tm(data, &alrm->time, info->rtc_24hr_mode);\n" - "> @@ -463,6 +486,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info)\n" + "> @@ -463,6 +486,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *in=\n" + "fo)\n" "> \t\tbreak;\n" - "> \n" + "> =20\n" "> \tcase S5M8767X:\n" "> +\tcase S2MPS15X:\n" "> \tcase S2MPS14X:\n" "> \tcase S2MPS13X:\n" - "> \t\tfor (i = 0; i < info->regs->regs_count; i++)\n" - "> @@ -508,6 +532,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info)\n" + "> \t\tfor (i =3D 0; i < info->regs->regs_count; i++)\n" + "> @@ -508,6 +532,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *i=\n" + "nfo)\n" "> \t\tbreak;\n" - "> \n" + "> =20\n" "> \tcase S5M8767X:\n" "> +\tcase S2MPS15X:\n" "> \tcase S2MPS14X:\n" "> \tcase S2MPS13X:\n" - "> \t\tdata[RTC_SEC] |= ALARM_ENABLE_MASK;\n" - "> @@ -548,6 +573,7 @@ static int s5m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)\n" + "> \t\tdata[RTC_SEC] |=3D ALARM_ENABLE_MASK;\n" + "> @@ -548,6 +573,7 @@ static int s5m_rtc_set_alarm(struct device *dev, stru=\n" + "ct rtc_wkalrm *alrm)\n" "> \t\tbreak;\n" - "> \n" + "> =20\n" "> \tcase S5M8767X:\n" "> +\tcase S2MPS15X:\n" "> \tcase S2MPS14X:\n" "> \tcase S2MPS13X:\n" "> \t\ts5m8767_tm_to_data(&alrm->time, data);\n" - "> @@ -631,6 +657,7 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info)\n" - "> \t\tret = regmap_raw_write(info->regmap, S5M_ALARM0_CONF, data, 2);\n" + "> @@ -631,6 +657,7 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *=\n" + "info)\n" + "> \t\tret =3D regmap_raw_write(info->regmap, S5M_ALARM0_CONF, data, 2);\n" "> \t\tbreak;\n" - "> \n" + "> =20\n" "> +\tcase S2MPS15X:\n" "> \tcase S2MPS14X:\n" "> \tcase S2MPS13X:\n" - "> \t\tdata[0] = (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT);\n" - "> @@ -679,6 +706,7 @@ static int s5m_rtc_probe(struct platform_device *pdev)\n" + "> \t\tdata[0] =3D (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT);\n" + "> @@ -679,6 +706,7 @@ static int s5m_rtc_probe(struct platform_device *pdev=\n" + ")\n" "> \t\treturn -ENOMEM;\n" - "> \n" + "> =20\n" "> \tswitch (platform_get_device_id(pdev)->driver_data) {\n" "> +\tcase S2MPS15X:\n" "> \tcase S2MPS14X:\n" "> \tcase S2MPS13X:\n" - "> \t\tregmap_cfg = &s2mps14_rtc_regmap_config;\n" - "> @@ -805,6 +833,7 @@ static const struct platform_device_id s5m_rtc_id[] = {\n" + "> \t\tregmap_cfg =3D &s2mps14_rtc_regmap_config;\n" + "> @@ -805,6 +833,7 @@ static const struct platform_device_id s5m_rtc_id[] =\n" + "=3D {\n" "> \t{ \"s5m-rtc\",\t\tS5M8767X },\n" "> \t{ \"s2mps13-rtc\",\tS2MPS13X },\n" "> \t{ \"s2mps14-rtc\",\tS2MPS14X },\n" @@ -171,7 +188,8 @@ "> \t{ },\n" "> };\n" "> MODULE_DEVICE_TABLE(platform, s5m_rtc_id);\n" - "> diff --git a/include/linux/mfd/samsung/rtc.h b/include/linux/mfd/samsung/rtc.h\n" + "> diff --git a/include/linux/mfd/samsung/rtc.h b/include/linux/mfd/samsung/=\n" + "rtc.h\n" "> index 29c30ac36020..a65e4655d470 100644\n" "> --- a/include/linux/mfd/samsung/rtc.h\n" "> +++ b/include/linux/mfd/samsung/rtc.h\n" @@ -185,10 +203,23 @@ "> #define S2MPS_RTC_RUDR_MASK\t(1 << S2MPS_RTC_RUDR_SHIFT)\n" "> #define RTC_TCON_SHIFT\t\t1\n" "\n" - "-- \n" + "--=20\n" "Lee Jones\n" "Linaro STMicroelectronics Landing Team Lead\n" - "Linaro.org \342\224\202 Open source software for ARM SoCs\n" - Follow Linaro: Facebook | Twitter | Blog + "Linaro.org =E2=94=82 Open source software for ARM SoCs\n" + "Follow Linaro: Facebook | Twitter | Blog\n" + "\n" + "--=20\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. -bd5c764f760220715d84b9547b7b5d8c7f9fd01658c7ae370cc2f6047a2491ad +e442b8155ee2b7cb36ab3834ecd5a43a8cd9bea49316ff1f9910d0577cf3aec6
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.