Skip to content

Commit 823543b

Browse files
committed
Merge series "mfd/rtc/regulator: Drop board file support for Samsung PMIC" from Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>:
Hi, The Samsung PMIC drivers since long time are used only on devicetree platforms (Samsung Exynos) and there are no users with board files. Drop the support for board files entirely and depend on OF for matching. This makes the code smaller and simpler. Dependencies ============ The MFD pieces are rebased on my previous sec-core dirver changes: mfd: sec: Simplify getting of_device_id match data https://lore.kernel.org/linux-samsung-soc/20210420113929.278082-1-krzysztof.kozlowski@canonical.com/T/#t Applying - can be independent ============================= The last RTC and regulator patches can be picked up independently via regulator and rtc trees. There are no board files currently, so the code in these drivers is basically dead code and feature-bisection is preserved. Best regards, Krzysztof Krzysztof Kozlowski (9): mfd: sec: Drop support for board files and require devicetree mfd: sec: Remove unused cfg_pmic_irq in platform data mfd: sec: Remove unused device_type in platform data mfd: sec: Remove unused irq_base in platform data mfd: sec: Enable wakeup from suspend via devicetree property mfd: sec: Remove unused platform data members rtc: s5m: Remove reference to parent's device pdata regulator: s2mpa01: Drop initialization via platform data regulator: s2mps11: Drop initialization via platform data drivers/mfd/Kconfig | 1 + drivers/mfd/sec-core.c | 64 +++++--------------------------- drivers/mfd/sec-irq.c | 4 +- drivers/regulator/s2mpa01.c | 4 -- drivers/regulator/s2mps11.c | 22 +---------- drivers/rtc/rtc-s5m.c | 6 --- include/linux/mfd/samsung/core.h | 33 ---------------- 7 files changed, 14 insertions(+), 120 deletions(-) -- 2.25.1
2 parents 72241e3 + beeab9b commit 823543b

2 files changed

Lines changed: 2 additions & 24 deletions

File tree

drivers/regulator/s2mpa01.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ static const struct regulator_desc regulators[] = {
340340
static int s2mpa01_pmic_probe(struct platform_device *pdev)
341341
{
342342
struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
343-
struct sec_platform_data *pdata = dev_get_platdata(iodev->dev);
344343
struct regulator_config config = { };
345344
struct s2mpa01_info *s2mpa01;
346345
int i;
@@ -356,9 +355,6 @@ static int s2mpa01_pmic_probe(struct platform_device *pdev)
356355
for (i = 0; i < S2MPA01_REGULATOR_MAX; i++) {
357356
struct regulator_dev *rdev;
358357

359-
if (pdata)
360-
config.init_data = pdata->regulators[i].initdata;
361-
362358
rdev = devm_regulator_register(&pdev->dev,
363359
&regulators[i], &config);
364360
if (IS_ERR(rdev)) {

drivers/regulator/s2mps11.c

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,6 @@ static const struct regulator_desc s2mpu02_regulators[] = {
11201120
static int s2mps11_pmic_probe(struct platform_device *pdev)
11211121
{
11221122
struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
1123-
struct sec_platform_data *pdata = NULL;
11241123
struct of_regulator_match *rdata = NULL;
11251124
struct regulator_config config = { };
11261125
struct s2mps11_info *s2mps11;
@@ -1171,17 +1170,6 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
11711170
if (!s2mps11->ext_control_gpiod)
11721171
return -ENOMEM;
11731172

1174-
if (!iodev->dev->of_node) {
1175-
if (iodev->pdata) {
1176-
pdata = iodev->pdata;
1177-
goto common_reg;
1178-
} else {
1179-
dev_err(pdev->dev.parent,
1180-
"Platform data or DT node not supplied\n");
1181-
return -ENODEV;
1182-
}
1183-
}
1184-
11851173
rdata = kcalloc(rdev_num, sizeof(*rdata), GFP_KERNEL);
11861174
if (!rdata)
11871175
return -ENOMEM;
@@ -1193,7 +1181,6 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
11931181
if (ret)
11941182
goto out;
11951183

1196-
common_reg:
11971184
platform_set_drvdata(pdev, s2mps11);
11981185

11991186
config.dev = &pdev->dev;
@@ -1202,13 +1189,8 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
12021189
for (i = 0; i < rdev_num; i++) {
12031190
struct regulator_dev *regulator;
12041191

1205-
if (pdata) {
1206-
config.init_data = pdata->regulators[i].initdata;
1207-
config.of_node = pdata->regulators[i].reg_node;
1208-
} else {
1209-
config.init_data = rdata[i].init_data;
1210-
config.of_node = rdata[i].of_node;
1211-
}
1192+
config.init_data = rdata[i].init_data;
1193+
config.of_node = rdata[i].of_node;
12121194
config.ena_gpiod = s2mps11->ext_control_gpiod[i];
12131195
/*
12141196
* Hand the GPIO descriptor management over to the regulator

0 commit comments

Comments
 (0)