Remove SEC S5M MFDs with no compatibles
Subsystems (4)
cover Remove SEC S5M MFDs with no compatibles
The S5M8751 and S5M8763 MFD PMICs have no compatibles, and board file support for them was removed, resulting in essentially no way for these chips to be used anymore (unless they get dt compatibles). They seemingly have never been in any board files upstream and I only found references to the SM8751 being on the SMDK6450 board (which has been unsupported for many years now) in a downstream Samsung Galaxy S2 kernel tree.
The patches should be applied in order.
David Virag (2):
mfd: sec: Remove PMICs without compatibles
rtc: s5m: Drop S5M8763 support
drivers/mfd/sec-core.c | 46 --------------- drivers/mfd/sec-irq.c | 89 ---------------------------- drivers/rtc/rtc-s5m.c | 82 +------------------------- include/linux/mfd/samsung/core.h | 2 - include/linux/mfd/samsung/irq.h | 50 ---------------- include/linux/mfd/samsung/s5m8763.h | 90 ----------------------------- 6 files changed, 3 insertions(+), 356 deletions(-) delete mode 100644 include/linux/mfd/samsung/s5m8763.h
Signature · 1 line
2.39.0
PATCH 1/2 mfd: sec: Remove PMICs without compatibles
The S5M8751 and S5M8763 PMIC chips have no corresponding compatible values, so since board file support was removed for this driver, there is no way to specify these PMICs as present in boards anymore. Remove leftovers of these chips since it's dead code.
--- drivers/mfd/sec-core.c | 46 --------------- drivers/mfd/sec-irq.c | 89 ---------------------------- include/linux/mfd/samsung/core.h | 1 - include/linux/mfd/samsung/s5m8763.h | 90 ----------------------------- 4 files changed, 226 deletions(-) delete mode 100644 include/linux/mfd/samsung/s5m8763.h
drivers/mfd/sec-core.c +0 -46
@@ -24,22 +24,9 @@#include <linux/mfd/samsung/s2mps14.h> #include <linux/mfd/samsung/s2mps15.h> #include <linux/mfd/samsung/s2mpu02.h> -#include <linux/mfd/samsung/s5m8763.h> #include <linux/mfd/samsung/s5m8767.h> #include <linux/regmap.h> -static const struct mfd_cell s5m8751_devs[] = { - { .name ="s5m8751-pmic" , }, - { .name ="s5m-charger" , }, - { .name ="s5m8751-codec" , }, -}; - -static const struct mfd_cell s5m8763_devs[] = { - { .name ="s5m8763-pmic" , }, - { .name ="s5m-rtc" , }, - { .name ="s5m-charger" , }, -}; -static const struct mfd_cell s5m8767_devs[] = { { .name ="s5m8767-pmic" , }, { .name ="s5m-rtc" , },
@@ -158,19 +145,6 @@ static bool s2mpu02_volatile(struct device *dev, unsigned int reg) } } -static bool s5m8763_volatile (struct device *dev,unsigned int reg) -{ -switch (reg) { -case S5M8763_REG_IRQM1 : -case S5M8763_REG_IRQM2 : -case S5M8763_REG_IRQM3 : -case S5M8763_REG_IRQM4 : -return false; -default : -return true; - } -} -static const struct regmap_config sec_regmap_config = { .reg_bits =8 , .val_bits =8 ,
@@ -230,15 +204,6 @@ static const struct regmap_config s2mpu02_regmap_config = { .cache_type = REGCACHE_FLAT, }; -static const struct regmap_config s5m8763_regmap_config = { - .reg_bits =8 , - .val_bits =8 , - - .max_register =S5M8763_REG_LBCNFG2 , - .volatile_reg = s5m8763_volatile, - .cache_type =REGCACHE_FLAT , -}; -static const struct regmap_config s5m8767_regmap_config = { .reg_bits =8 , .val_bits =8 ,
@@ -348,9 +313,6 @@ static int sec_pmic_probe(struct i2c_client *i2c)case S2MPS15X : regmap = &s2mps15_regmap_config;break ; -case S5M8763X : - regmap = &s5m8763_regmap_config; -break ;case S5M8767X : regmap = &s5m8767_regmap_config;break ;
@@ -375,14 +337,6 @@ static int sec_pmic_probe(struct i2c_client *i2c)pm_runtime_set_active (sec_pmic->dev);switch (sec_pmic->device_type) { -case S5M8751X : - sec_devs = s5m8751_devs; - num_sec_devs =ARRAY_SIZE (s5m8751_devs); -break ; -case S5M8763X : - sec_devs = s5m8763_devs; - num_sec_devs =ARRAY_SIZE (s5m8763_devs); -break ;case S5M8767X : sec_devs = s5m8767_devs; num_sec_devs =ARRAY_SIZE (s5m8767_devs);
drivers/mfd/sec-irq.c +0 -89
113 lines not on this page · raw message
include/linux/mfd/samsung/core.h +0 -1
@@ -36,7 +36,6 @@struct gpio_desc ;enum sec_device_type { -S5M8751X ,S5M8763X ,S5M8767X ,S2MPA01 ,
include/linux/mfd/samsung/s5m8763.h deleted +0 -90
90 lines not on this page · raw message
Signature · 1 line
2.39.0
Re: [PATCH 1/2] mfd: sec: Remove PMICs without compatibles
Quoted 7 lines · David Virag
The S5M8751 and S5M8763 PMIC chips have no corresponding compatible values, so since board file support was removed for this driver, there is no way to specify these PMICs as present in boards anymore. Remove leftovers of these chips since it's dead code.
Signed-off-by David Virag <[email protected]>---
Thank you for your patch. There is something to discuss/improve.
Quoted 18 lines
int
sec_irq_init(struct sec_pmic_dev *sec_pmic)
{drivers/mfd/sec-irq.c +0
-3int ret =0 ;@@ -448,9 +362,6 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) }switch (type) { -case S5M8763X : - sec_irq_chip = &s5m8763_irq_chip; -break ;case S5M8767X : sec_irq_chip = &s5m8767_irq_chip;break ;include/linux/mfd/samsung/core.h +0
-0
include/linux/mfd/samsung/core.h line 39
Quoted 5 lines
include/linux/mfd/samsung/core.h +0
-1@@ -36,7 +36,6 @@struct gpio_desc ;enum sec_device_type { -S5M8751X ,S5M8763X ,
Drop also S5M8763X
include/linux/mfd/samsung/s5m8763.h
Quoted 4 lines
include/linux/mfd/samsung/core.h +0
-0S5M8767X , S2MPA01,include/linux/mfd/samsung/s5m8763.h deleted +0
-0
Best regards,
Krzysztof
Re: [PATCH 1/2] mfd: sec: Remove PMICs without compatibles
Quoted 30 lines · Krzysztof Kozlowski
Quoted 8 lines · David Virag
The S5M8751 and S5M8763 PMIC chips have no corresponding compatible values, so since board file support was removed for this driver, there
is no way to specify these PMICs as present in boards anymore. Remove leftovers of these chips since it's dead code.Signed-off-by David Virag <[email protected]>---
Thank you for your patch. There is something to discuss/improve.
Quoted 18 lines
int
sec_irq_init(struct sec_pmic_dev *sec_pmic)
{
int ret = 0;(quoted diff) +0
-0@@ -448,9 +362,6 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic) }
switch (type) {
- case S5M8763X:
- sec_irq_chip =&s5m8763_irq_chip;
- break;
case S5M8767X:
sec_irq_chip =&s5m8767_irq_chip;
break;include/linux/mfd/samsung/core.h +0
-0
Quoted 8 lines
Quoted 6 lines
include/linux/mfd/samsung/core.h +0
-0@@ -36,7 +36,6 @@ struct gpio_desc;
enumsec_device_type{
- S5M8751X,
S5M8763X,Drop also S5M8763X
Dropping it in the first patch would lead to build errors in the RTC driver, so I do it in the second patch, but I see that you already realized this in the 2nd reply.
Quoted 11 lines
include/linux/mfd/samsung/s5m8763.h
Quoted 6 lines
S5M8767X,
S2MPA01,include/linux/mfd/samsung/s5m8763.h deleted +0
-0Best regards,
Krzysztof
Best regards,
David
Re: [PATCH 1/2] mfd: sec: Remove PMICs without compatibles
In reply to David ViragQuoted 6 lines · David Virag
The S5M8751 and S5M8763 PMIC chips have no corresponding compatible values, so since board file support was removed for this driver, there is no way to specify these PMICs as present in boards anymore. Remove leftovers of these chips since it's dead code.
Signed-off-by David Virag <[email protected]>
I see removal of define in patch 2, so:
Best regards,
Krzysztof
Re: [PATCH 1/2] mfd: sec: Remove PMICs without compatibles
In reply to David ViragQuoted 5 lines · David Virag
The S5M8751 and S5M8763 PMIC chips have no corresponding compatible values, so since board file support was removed for this driver, there is no way to specify these PMICs as present in boards anymore. Remove leftovers of these chips since it's dead code.
Quoted 8 lines
Signed-off-by David Virag <[email protected]>--- drivers/mfd/sec-core.c | 46 --------------- drivers/mfd/sec-irq.c | 89 ---------------------------- include/linux/mfd/samsung/core.h | 1 - include/linux/mfd/samsung/s5m8763.h | 90 ----------------------------- 4 files changed, 226 deletions(-) delete mode 100644 include/linux/mfd/samsung/s5m8763.h
Applied, thanks
--
Lee Jones [李琼斯]
PATCH 2/2 rtc: s5m: Drop S5M8763 support
In reply to David ViragThe S5M8763 MFD has no device tree compatible, and since board file support for it was removed, there's no way to use this MFD. After removing the remaining code for it from the MFD driver, also remove support for it in the s5m RTC driver, and all remaining references to it.
--- drivers/rtc/rtc-s5m.c | 82 ++------------------------------ include/linux/mfd/samsung/core.h | 1 - include/linux/mfd/samsung/irq.h | 50 ------------------- 3 files changed, 3 insertions(+), 130 deletions(-)
drivers/rtc/rtc-s5m.c +3 -79
@@ -85,7 +85,7 @@ struct s5m_rtc_reg_config {unsigned int write_alarm_udr_mask; }; -/* Register map for S5M8763 and S5M8767 */ +/* Register map for S5M8767 */ static const struct s5m_rtc_reg_config s5m_rtc_regs = { .regs_count =8 , .time =S5M_RTC_SEC ,
@@ -236,7 +236,6 @@ static int s5m_check_peding_alarm_interrupt(struct s5m_rtc_info *info,switch (info->device_type) {case S5M8767X : -case S5M8763X : ret =regmap_read (info->regmap,S5M_RTC_STATUS , &val); val &=S5M_ALARM0_STATUS ;break ;
@@ -299,7 +298,6 @@ static int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info) data |= info->regs->write_alarm_udr_mask;switch (info->device_type) { -case S5M8763X :case S5M8767X : data &= ~S5M_RTC_TIME_EN_MASK ;break ;
@@ -329,38 +327,6 @@ static int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)return ret; } -static void s5m8763_data_to_tm (u8 *data,struct rtc_time *tm) -{ - tm->tm_sec =bcd2bin (data[RTC_SEC ]); - tm->tm_min =bcd2bin (data[RTC_MIN ]); - -if (data[RTC_HOUR ] &HOUR_12 ) { - tm->tm_hour =bcd2bin (data[RTC_HOUR ] &0x1f ); -if (data[RTC_HOUR ] &HOUR_PM ) - tm->tm_hour +=12 ; - }else { - tm->tm_hour =bcd2bin (data[RTC_HOUR ] &0x3f ); - } - - tm->tm_wday = data[RTC_WEEKDAY ] &0x07 ; - tm->tm_mday =bcd2bin (data[RTC_DATE ]); - tm->tm_mon =bcd2bin (data[RTC_MONTH ]); - tm->tm_year =bcd2bin (data[RTC_YEAR1 ]) +bcd2bin (data[RTC_YEAR2 ]) *100 ; - tm->tm_year -=1900 ; -} - -static void s5m8763_tm_to_data (struct rtc_time *tm,u8 *data) -{ - data[RTC_SEC ] =bin2bcd (tm->tm_sec); - data[RTC_MIN ] =bin2bcd (tm->tm_min); - data[RTC_HOUR ] =bin2bcd (tm->tm_hour); - data[RTC_WEEKDAY ] = tm->tm_wday; - data[RTC_DATE ] =bin2bcd (tm->tm_mday); - data[RTC_MONTH ] =bin2bcd (tm->tm_mon); - data[RTC_YEAR1 ] =bin2bcd (tm->tm_year %100 ); - data[RTC_YEAR2 ] =bin2bcd ((tm->tm_year +1900 ) /100 ); -} -static int s5m_rtc_read_time (struct device *dev,struct rtc_time *tm) {struct s5m_rtc_info *info =dev_get_drvdata (dev);
@@ -385,10 +351,6 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)return ret;switch (info->device_type) { -case S5M8763X : -s5m8763_data_to_tm (data, tm); -break ; -case S5M8767X :case S2MPS15X :case S2MPS14X :
@@ -412,9 +374,6 @@ static int s5m_rtc_set_time(struct device *dev, struct rtc_time *tm)int ret =0 ;switch (info->device_type) { -case S5M8763X : -s5m8763_tm_to_data (tm, data); -break ;case S5M8767X :case S2MPS15X :case S2MPS14X :
@@ -444,7 +403,6 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) {struct s5m_rtc_info *info =dev_get_drvdata (dev);u8 data[RTC_MAX_NUM_TIME_REGS ]; -unsigned int val;int ret, i; ret = regmap_bulk_read(info->regmap, info->regs->alarm0, data,
@@ -453,15 +411,6 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)return ret;switch (info->device_type) { -case S5M8763X : -s5m8763_data_to_tm (data, &alrm->time); - ret =regmap_read (info->regmap,S5M_ALARM0_CONF , &val); -if (ret <0 ) -return ret; - - alrm->enabled = !!val; -break ; -case S5M8767X :case S2MPS15X :case S2MPS14X :
@@ -500,10 +449,6 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info)dev_dbg (info->dev,"%s: %ptR(%d)\n" , __func__, &tm, tm.tm_wday);switch (info->device_type) { -case S5M8763X : - ret =regmap_write (info->regmap,S5M_ALARM0_CONF ,0 ); -break ; -case S5M8767X :case S2MPS15X :case S2MPS14X :
@@ -531,7 +476,6 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info) {int ret;u8 data[RTC_MAX_NUM_TIME_REGS ]; -u8 alarm0_conf;struct rtc_time tm; ret = regmap_bulk_read(info->regmap, info->regs->alarm0, data,
@@ -543,11 +487,6 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info)dev_dbg (info->dev,"%s: %ptR(%d)\n" , __func__, &tm, tm.tm_wday);switch (info->device_type) { -case S5M8763X : - alarm0_conf =0x77 ; - ret =regmap_write (info->regmap,S5M_ALARM0_CONF , alarm0_conf); -break ; -case S5M8767X :case S2MPS15X :case S2MPS14X :
@@ -585,10 +524,6 @@ static int s5m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)int ret;switch (info->device_type) { -case S5M8763X : -s5m8763_tm_to_data (&alrm->time, data); -break ; -case S5M8767X :case S2MPS15X :case S2MPS14X :
@@ -655,7 +590,6 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info)int ret;switch (info->device_type) { -case S5M8763X :case S5M8767X :/* UDR update time. Default of 7.32 ms is too long. */ ret = regmap_update_bits(info->regmap, S5M_RTC_UDR_CON,
@@ -729,11 +663,6 @@ static int s5m_rtc_probe(struct platform_device *pdev) info->regs = &s2mps13_rtc_regs; alarm_irq =S2MPS14_IRQ_RTCA0 ;break ; -case S5M8763X : - regmap_cfg = &s5m_rtc_regmap_config; - info->regs = &s5m_rtc_regs; - alarm_irq =S5M8763_IRQ_ALARM0 ; -break ;case S5M8767X : regmap_cfg = &s5m_rtc_regmap_config; info->regs = &s5m_rtc_regs;
@@ -786,13 +715,8 @@ static int s5m_rtc_probe(struct platform_device *pdev) info->rtc_dev->ops = &s5m_rtc_ops; -if (info->device_type ==S5M8763X ) { - info->rtc_dev->range_min =RTC_TIMESTAMP_BEGIN_0000 ; - info->rtc_dev->range_max =RTC_TIMESTAMP_END_9999 ; - }else { - info->rtc_dev->range_min =RTC_TIMESTAMP_BEGIN_2000 ; - info->rtc_dev->range_max =RTC_TIMESTAMP_END_2099 ; - } + info->rtc_dev->range_min =RTC_TIMESTAMP_BEGIN_2000 ; + info->rtc_dev->range_max =RTC_TIMESTAMP_END_2099 ;if (!info->irq) {clear_bit (RTC_FEATURE_ALARM , info->rtc_dev->features);
include/linux/mfd/samsung/core.h +0 -1
@@ -36,7 +36,6 @@struct gpio_desc ;enum sec_device_type { -S5M8763X ,S5M8767X ,S2MPA01 ,S2MPS11X ,
include/linux/mfd/samsung/irq.h +0 -50
54 lines not on this page · raw message
Signature · 1 line
2.39.0
Re: [PATCH 2/2] rtc: s5m: Drop S5M8763 support
Quoted 7 lines · David Virag
The S5M8763 MFD has no device tree compatible, and since board file support for it was removed, there's no way to use this MFD. After removing the remaining code for it from the MFD driver, also remove support for it in the s5m RTC driver, and all remaining references to it.
Signed-off-by David Virag <[email protected]>
Best regards,
Krzysztof
Re: [PATCH 2/2] rtc: s5m: Drop S5M8763 support
In reply to David ViragQuoted 6 lines · David Virag
The S5M8763 MFD has no device tree compatible, and since board file support for it was removed, there's no way to use this MFD. After removing the remaining code for it from the MFD driver, also remove support for it in the s5m RTC driver, and all remaining references to it.
Quoted 6 lines
Signed-off-by David Virag <[email protected]>--- drivers/rtc/rtc-s5m.c | 82 ++------------------------------include/linux/mfd/samsung/core.h | 1 - include/linux/mfd/samsung/irq.h | 50 -------------------
Quoted 1 line
3 files changed, 3 insertions(+), 130 deletions(-)
Signature · 1 line
Lee Jones [李琼斯]
Lee Jones
maintainerRe: [PATCH 2/2] rtc: s5m: Drop S5M8763 support
Quoted 8 lines · Lee Jones
Quoted 6 lines · David Virag
The S5M8763 MFD has no device tree compatible, and since board file support for it was removed, there's no way to use this MFD. After removing the remaining code for it from the MFD driver, also remove support for it in the s5m RTC driver, and all remaining references to it.
Quoted 8 lines
Quoted 6 lines
Signed-off-by David Virag <[email protected]>--- drivers/rtc/rtc-s5m.c | 82 ++------------------------------include/linux/mfd/samsung/core.h | 1 - include/linux/mfd/samsung/irq.h | 50 -------------------Acked-by Lee Jones <[email protected]>
Actually, looks like this should probably go in via MFD, so I need an RTC Ack.
Quoted 1 line
Quoted 1 line
3 files changed, 3 insertions(+), 130 deletions(-)
Signature · 1 line
Lee Jones [李琼斯]
Alexandre Belloni
maintainerRe: [PATCH 2/2] rtc: s5m: Drop S5M8763 support
Quoted 14 lines · Lee Jones
Quoted 12 lines · Lee Jones
Quoted 9 lines · David Virag
The S5M8763 MFD has no device tree compatible, and since board file support for it was removed, there's no way to use this MFD. After removing the remaining code for it from the MFD driver, also remove support for it in the s5m RTC driver, and all remaining references to it.
Signed-off-by David Virag <[email protected]>--- drivers/rtc/rtc-s5m.c | 82 ++------------------------------
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
include/linux/mfd/samsung/core.h | 1 - include/linux/mfd/samsung/irq.h | 50 -------------------Acked-by Lee Jones <[email protected]>Actually, looks like this should probably go in via MFD, so I need an RTC Ack.
There were comments on 1/2 so I was expecting a v2.
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH 2/2] rtc: s5m: Drop S5M8763 support
Quoted 23 lines · Alexandre Belloni
Quoted 22 lines · Lee Jones
Quoted 20 lines · Lee Jones
Quoted 17 lines · David Virag
The S5M8763 MFD has no device tree compatible, and since board file
support for it was removed, there's no way to use this MFD. After
removing the remaining code for it from the MFD driver, also remove
support for it in the s5m RTC driver, and all remaining references to
it.Signed-off-by David Virag <[email protected]>---
drivers/rtc/rtc-s5m.c | 82 ++----------------------
--------include/linux/mfd/samsung/core.h | 1 - include/linux/mfd/samsung/irq.h | 50 -------------------
Quoted 9 lines
Quoted 5 lines
Quoted 1 line
Acked-by Lee Jones <[email protected]>Actually, looks like this should probably go in via MFD, so I need an
RTC Ack.There were comments on 1/2 so I was expecting a v2.
Krzysztof commented there about the removal of an enum value that's actually removed in 2/2 since it would break the RTC driver if it was removed in 1/2. He realised that and corrected himself. No need for v2 AFAIK, unless something else is found.
The patch should definitely go via one tree (or by waiting for it to be merged upstream, I guess) since the order has to be kept.
Best regards,
David
Re: [PATCH 2/2] rtc: s5m: Drop S5M8763 support
Quoted 30 lines · David Virag
Quoted 29 lines · Alexandre Belloni
Quoted 27 lines · Lee Jones
Quoted 17 lines · Lee Jones
Quoted 14 lines · David Virag
The S5M8763 MFD has no device tree compatible, and since board file
support for it was removed, there's no way to use this MFD. After
removing the remaining code for it from the MFD driver, also remove
support for it in the s5m RTC driver, and all remaining references to
it.Signed-off-by David Virag <[email protected]>---
drivers/rtc/rtc-s5m.c | 82 ++----------------------
--------Quoted 4 lines
Quoted 2 lines
include/linux/mfd/samsung/core.h | 1 - include/linux/mfd/samsung/irq.h | 50 -------------------
Acked-by Lee Jones <[email protected]>Actually, looks like this should probably go in via MFD, so I need an
RTC Ack.
Quoted 8 lines
Quoted 3 lines
There were comments on 1/2 so I was expecting a v2.
Krzysztof commented there about the removal of an enum value that's actually removed in 2/2 since it would break the RTC driver if it was removed in 1/2. He realised that and corrected himself. No need for v2 AFAIK, unless something else is found.
Yep. I also gave review tags for both of these.
Best regards,
Krzysztof
Re: [PATCH 2/2] rtc: s5m: Drop S5M8763 support
In reply to David ViragQuoted 7 lines · David Virag
The S5M8763 MFD has no device tree compatible, and since board file support for it was removed, there's no way to use this MFD. After removing the remaining code for it from the MFD driver, also remove support for it in the s5m RTC driver, and all remaining references to it.
Signed-off-by David Virag <[email protected]>
Quoted 271 lines
--- drivers/rtc/rtc-s5m.c | 82 ++------------------------------ include/linux/mfd/samsung/core.h | 1 - include/linux/mfd/samsung/irq.h | 50 ------------------- 3 files changed, 3 insertions(+), 130 deletions(-)drivers/rtc/rtc-s5m.c +3
-79@@ -85,7 +85,7 @@ struct s5m_rtc_reg_config {unsigned int write_alarm_udr_mask; }; -/* Register map for S5M8763 and S5M8767 */ +/* Register map for S5M8767 */ static const struct s5m_rtc_reg_config s5m_rtc_regs = { .regs_count =8 , .time =S5M_RTC_SEC ,@@ -236,7 +236,6 @@ static int s5m_check_peding_alarm_interrupt(struct s5m_rtc_info *info,switch (info->device_type) {case S5M8767X : -case S5M8763X : ret =regmap_read (info->regmap,S5M_RTC_STATUS , &val); val &=S5M_ALARM0_STATUS ;break ;@@ -299,7 +298,6 @@ static int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info) data |= info->regs->write_alarm_udr_mask;switch (info->device_type) { -case S5M8763X :case S5M8767X : data &= ~S5M_RTC_TIME_EN_MASK ;break ;@@ -329,38 +327,6 @@ static int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)return ret; } -static void s5m8763_data_to_tm (u8 *data,struct rtc_time *tm) -{ - tm->tm_sec =bcd2bin (data[RTC_SEC ]); - tm->tm_min =bcd2bin (data[RTC_MIN ]); - -if (data[RTC_HOUR ] &HOUR_12 ) { - tm->tm_hour =bcd2bin (data[RTC_HOUR ] &0x1f ); -if (data[RTC_HOUR ] &HOUR_PM ) - tm->tm_hour +=12 ; - }else { - tm->tm_hour =bcd2bin (data[RTC_HOUR ] &0x3f ); - } - - tm->tm_wday = data[RTC_WEEKDAY ] &0x07 ; - tm->tm_mday =bcd2bin (data[RTC_DATE ]); - tm->tm_mon =bcd2bin (data[RTC_MONTH ]); - tm->tm_year =bcd2bin (data[RTC_YEAR1 ]) +bcd2bin (data[RTC_YEAR2 ]) *100 ; - tm->tm_year -=1900 ; -} - -static void s5m8763_tm_to_data (struct rtc_time *tm,u8 *data) -{ - data[RTC_SEC ] =bin2bcd (tm->tm_sec); - data[RTC_MIN ] =bin2bcd (tm->tm_min); - data[RTC_HOUR ] =bin2bcd (tm->tm_hour); - data[RTC_WEEKDAY ] = tm->tm_wday; - data[RTC_DATE ] =bin2bcd (tm->tm_mday); - data[RTC_MONTH ] =bin2bcd (tm->tm_mon); - data[RTC_YEAR1 ] =bin2bcd (tm->tm_year %100 ); - data[RTC_YEAR2 ] =bin2bcd ((tm->tm_year +1900 ) /100 ); -} -static int s5m_rtc_read_time (struct device *dev,struct rtc_time *tm) {struct s5m_rtc_info *info =dev_get_drvdata (dev);@@ -385,10 +351,6 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)return ret;switch (info->device_type) { -case S5M8763X : -s5m8763_data_to_tm (data, tm); -break ; -case S5M8767X :case S2MPS15X :case S2MPS14X :@@ -412,9 +374,6 @@ static int s5m_rtc_set_time(struct device *dev, struct rtc_time *tm)int ret =0 ;switch (info->device_type) { -case S5M8763X : -s5m8763_tm_to_data (tm, data); -break ;case S5M8767X :case S2MPS15X :case S2MPS14X :@@ -444,7 +403,6 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) {struct s5m_rtc_info *info =dev_get_drvdata (dev);u8 data[RTC_MAX_NUM_TIME_REGS ]; -unsigned int val;int ret, i; ret = regmap_bulk_read(info->regmap, info->regs->alarm0, data,@@ -453,15 +411,6 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)return ret;switch (info->device_type) { -case S5M8763X : -s5m8763_data_to_tm (data, &alrm->time); - ret =regmap_read (info->regmap,S5M_ALARM0_CONF , &val); -if (ret <0 ) -return ret; - - alrm->enabled = !!val; -break ; -case S5M8767X :case S2MPS15X :case S2MPS14X :@@ -500,10 +449,6 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info)dev_dbg (info->dev,"%s: %ptR(%d)\n" , __func__, &tm, tm.tm_wday);switch (info->device_type) { -case S5M8763X : - ret =regmap_write (info->regmap,S5M_ALARM0_CONF ,0 ); -break ; -case S5M8767X :case S2MPS15X :case S2MPS14X :@@ -531,7 +476,6 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info) {int ret;u8 data[RTC_MAX_NUM_TIME_REGS ]; -u8 alarm0_conf;struct rtc_time tm; ret = regmap_bulk_read(info->regmap, info->regs->alarm0, data,@@ -543,11 +487,6 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info)dev_dbg (info->dev,"%s: %ptR(%d)\n" , __func__, &tm, tm.tm_wday);switch (info->device_type) { -case S5M8763X : - alarm0_conf =0x77 ; - ret =regmap_write (info->regmap,S5M_ALARM0_CONF , alarm0_conf); -break ; -case S5M8767X :case S2MPS15X :case S2MPS14X :@@ -585,10 +524,6 @@ static int s5m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)int ret;switch (info->device_type) { -case S5M8763X : -s5m8763_tm_to_data (&alrm->time, data); -break ; -case S5M8767X :case S2MPS15X :case S2MPS14X :@@ -655,7 +590,6 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info)int ret;switch (info->device_type) { -case S5M8763X :case S5M8767X :/* UDR update time. Default of 7.32 ms is too long. */ ret = regmap_update_bits(info->regmap, S5M_RTC_UDR_CON,@@ -729,11 +663,6 @@ static int s5m_rtc_probe(struct platform_device *pdev) info->regs = &s2mps13_rtc_regs; alarm_irq =S2MPS14_IRQ_RTCA0 ;break ; -case S5M8763X : - regmap_cfg = &s5m_rtc_regmap_config; - info->regs = &s5m_rtc_regs; - alarm_irq =S5M8763_IRQ_ALARM0 ; -break ;case S5M8767X : regmap_cfg = &s5m_rtc_regmap_config; info->regs = &s5m_rtc_regs;@@ -786,13 +715,8 @@ static int s5m_rtc_probe(struct platform_device *pdev) info->rtc_dev->ops = &s5m_rtc_ops; -if (info->device_type ==S5M8763X ) { - info->rtc_dev->range_min =RTC_TIMESTAMP_BEGIN_0000 ; - info->rtc_dev->range_max =RTC_TIMESTAMP_END_9999 ; - }else { - info->rtc_dev->range_min =RTC_TIMESTAMP_BEGIN_2000 ; - info->rtc_dev->range_max =RTC_TIMESTAMP_END_2099 ; - } + info->rtc_dev->range_min =RTC_TIMESTAMP_BEGIN_2000 ; + info->rtc_dev->range_max =RTC_TIMESTAMP_END_2099 ;if (!info->irq) {clear_bit (RTC_FEATURE_ALARM , info->rtc_dev->features);include/linux/mfd/samsung/core.h +0
-1@@ -36,7 +36,6 @@struct gpio_desc ;enum sec_device_type { -S5M8763X ,S5M8767X ,S2MPA01 ,S2MPS11X ,include/linux/mfd/samsung/irq.h +0
-50@@ -194,54 +194,4 @@ enum s5m8767_irq {#define S5M8767_IRQ_RTC1S_MASK (1 << 4)#define S5M8767_IRQ_WTSR_MASK (1 << 5) -enum s5m8763_irq { -S5M8763_IRQ_DCINF , -S5M8763_IRQ_DCINR , -S5M8763_IRQ_JIGF , -S5M8763_IRQ_JIGR , -S5M8763_IRQ_PWRONF , -S5M8763_IRQ_PWRONR , - -S5M8763_IRQ_WTSREVNT , -S5M8763_IRQ_SMPLEVNT , -S5M8763_IRQ_ALARM1 , -S5M8763_IRQ_ALARM0 , - -S5M8763_IRQ_ONKEY1S , -S5M8763_IRQ_TOPOFFR , -S5M8763_IRQ_DCINOVPR , -S5M8763_IRQ_CHGRSTF , -S5M8763_IRQ_DONER , -S5M8763_IRQ_CHGFAULT , - -S5M8763_IRQ_LOBAT1 , -S5M8763_IRQ_LOBAT2 , - -S5M8763_IRQ_NR , -}; - -#define S5M8763_IRQ_DCINF_MASK (1 << 2) -#define S5M8763_IRQ_DCINR_MASK (1 << 3) -#define S5M8763_IRQ_JIGF_MASK (1 << 4) -#define S5M8763_IRQ_JIGR_MASK (1 << 5) -#define S5M8763_IRQ_PWRONF_MASK (1 << 6) -#define S5M8763_IRQ_PWRONR_MASK (1 << 7) - -#define S5M8763_IRQ_WTSREVNT_MASK (1 << 0) -#define S5M8763_IRQ_SMPLEVNT_MASK (1 << 1) -#define S5M8763_IRQ_ALARM1_MASK (1 << 2) -#define S5M8763_IRQ_ALARM0_MASK (1 << 3) - -#define S5M8763_IRQ_ONKEY1S_MASK (1 << 0) -#define S5M8763_IRQ_TOPOFFR_MASK (1 << 2) -#define S5M8763_IRQ_DCINOVPR_MASK (1 << 3) -#define S5M8763_IRQ_CHGRSTF_MASK (1 << 4) -#define S5M8763_IRQ_DONER_MASK (1 << 5) -#define S5M8763_IRQ_CHGFAULT_MASK (1 << 7) - -#define S5M8763_IRQ_LOBAT1_MASK (1 << 0) -#define S5M8763_IRQ_LOBAT2_MASK (1 << 1) - -#define S5M8763_ENRAMP (1 << 4) -#endif /* __LINUX_MFD_SEC_IRQ_H */ Signature · 1 line
2.39.0
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH 2/2] rtc: s5m: Drop S5M8763 support
In reply to David ViragQuoted 6 lines · David Virag
The S5M8763 MFD has no device tree compatible, and since board file support for it was removed, there's no way to use this MFD. After removing the remaining code for it from the MFD driver, also remove support for it in the s5m RTC driver, and all remaining references to it.
Quoted 6 lines
Signed-off-by David Virag <[email protected]>--- drivers/rtc/rtc-s5m.c | 82 ++------------------------------ include/linux/mfd/samsung/core.h | 1 - include/linux/mfd/samsung/irq.h | 50 ------------------- 3 files changed, 3 insertions(+), 130 deletions(-)
Applied, thanks
--
Lee Jones [李琼斯]
Lee Jones
maintainerQuoted 14 lines · David Virag
The S5M8751 and S5M8763 MFD PMICs have no compatibles, and board file support for them was removed, resulting in essentially no way for these chips to be used anymore (unless they get dt compatibles). They seemingly have never been in any board files upstream and I only found references to the SM8751 being on the SMDK6450 board (which has been unsupported for many years now) in a downstream Samsung Galaxy S2 kernel tree.
The patches should be applied in order.
David Virag (2):
mfd: sec: Remove PMICs without compatibles
rtc: s5m: Drop S5M8763 support
Quoted 8 lines
drivers/mfd/sec-core.c | 46 --------------- drivers/mfd/sec-irq.c | 89 ---------------------------- drivers/rtc/rtc-s5m.c | 82 +------------------------- include/linux/mfd/samsung/core.h | 2 - include/linux/mfd/samsung/irq.h | 50 ---------------- include/linux/mfd/samsung/s5m8763.h | 90 ----------------------------- 6 files changed, 3 insertions(+), 356 deletions(-) delete mode 100644 include/linux/mfd/samsung/s5m8763.h
Pull-request to follow, once it passes build testing.
--
Lee Jones [李琼斯]
Lee Jones
maintainerImmutable branch between MFD and RTC due for the v6.4 merge window
In reply to David ViragEnjoy!
The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6:
Linux 6.3-rc1 (2023-03-05 14:52:03 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-rtc-v6.4
for you to fetch changes up to bb7929626c4f57f590b6028540a4bbd2a73809cb:
rtc: s5m: Drop S5M8763 support (2023-03-16 15:12:03 +0000)
----------------------------------------------------------------
Immutable branch between MFD and RTC due for the v6.4 merge window
----------------------------------------------------------------
David Virag (2):
mfd: sec: Remove PMICs without compatibles
rtc: s5m: Drop S5M8763 support
drivers/mfd/sec-core.c | 46 ------------------- drivers/mfd/sec-irq.c | 89 ------------------------------------ drivers/rtc/rtc-s5m.c | 82 ++------------------------------- include/linux/mfd/samsung/core.h | 2 - include/linux/mfd/samsung/irq.h | 50 --------------------- include/linux/mfd/samsung/s5m8763.h | 90 ------------------------------------- 6 files changed, 3 insertions(+), 356 deletions(-) delete mode 100644 include/linux/mfd/samsung/s5m8763.h
--
Lee Jones [李琼斯]