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.

Signed-off-by: David Virag <virag.david003@gmail.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20230131183008.4451-2-virag.david003@gmail.com

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index b03edda56009ffe2f12ceca5f04afb4e0b2df1cf..c2d0ed4969596069d847d5684e3c12d3c558f247 100644 (file)
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -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);

diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index f5f59fdc72fec6ffa5fabd8e3e8e7fd646aec895..e191aeb0c07c58a3bc4850d94af39dfe085a33e5 100644 (file)
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -14,7 +14,6 @@
 #include <linux/mfd/samsung/s2mps11.h>
 #include <linux/mfd/samsung/s2mps14.h>
 #include <linux/mfd/samsung/s2mpu02.h>
-#include <linux/mfd/samsung/s5m8763.h>
 #include <linux/mfd/samsung/s5m8767.h>
 
 static const struct regmap_irq s2mps11_irqs[] = {
@@ -297,81 +296,6 @@ static const struct regmap_irq s5m8767_irqs[] = {
        },
 };
 
-static const struct regmap_irq s5m8763_irqs[] = {
-       [S5M8763_IRQ_DCINF] = {
-               .reg_offset = 0,
-               .mask = S5M8763_IRQ_DCINF_MASK,
-       },
-       [S5M8763_IRQ_DCINR] = {
-               .reg_offset = 0,
-               .mask = S5M8763_IRQ_DCINR_MASK,
-       },
-       [S5M8763_IRQ_JIGF] = {
-               .reg_offset = 0,
-               .mask = S5M8763_IRQ_JIGF_MASK,
-       },
-       [S5M8763_IRQ_JIGR] = {
-               .reg_offset = 0,
-               .mask = S5M8763_IRQ_JIGR_MASK,
-       },
-       [S5M8763_IRQ_PWRONF] = {
-               .reg_offset = 0,
-               .mask = S5M8763_IRQ_PWRONF_MASK,
-       },
-       [S5M8763_IRQ_PWRONR] = {
-               .reg_offset = 0,
-               .mask = S5M8763_IRQ_PWRONR_MASK,
-       },
-       [S5M8763_IRQ_WTSREVNT] = {
-               .reg_offset = 1,
-               .mask = S5M8763_IRQ_WTSREVNT_MASK,
-       },
-       [S5M8763_IRQ_SMPLEVNT] = {
-               .reg_offset = 1,
-               .mask = S5M8763_IRQ_SMPLEVNT_MASK,
-       },
-       [S5M8763_IRQ_ALARM1] = {
-               .reg_offset = 1,
-               .mask = S5M8763_IRQ_ALARM1_MASK,
-       },
-       [S5M8763_IRQ_ALARM0] = {
-               .reg_offset = 1,
-               .mask = S5M8763_IRQ_ALARM0_MASK,
-       },
-       [S5M8763_IRQ_ONKEY1S] = {
-               .reg_offset = 2,
-               .mask = S5M8763_IRQ_ONKEY1S_MASK,
-       },
-       [S5M8763_IRQ_TOPOFFR] = {
-               .reg_offset = 2,
-               .mask = S5M8763_IRQ_TOPOFFR_MASK,
-       },
-       [S5M8763_IRQ_DCINOVPR] = {
-               .reg_offset = 2,
-               .mask = S5M8763_IRQ_DCINOVPR_MASK,
-       },
-       [S5M8763_IRQ_CHGRSTF] = {
-               .reg_offset = 2,
-               .mask = S5M8763_IRQ_CHGRSTF_MASK,
-       },
-       [S5M8763_IRQ_DONER] = {
-               .reg_offset = 2,
-               .mask = S5M8763_IRQ_DONER_MASK,
-       },
-       [S5M8763_IRQ_CHGFAULT] = {
-               .reg_offset = 2,
-               .mask = S5M8763_IRQ_CHGFAULT_MASK,
-       },
-       [S5M8763_IRQ_LOBAT1] = {
-               .reg_offset = 3,
-               .mask = S5M8763_IRQ_LOBAT1_MASK,
-       },
-       [S5M8763_IRQ_LOBAT2] = {
-               .reg_offset = 3,
-               .mask = S5M8763_IRQ_LOBAT2_MASK,
-       },
-};
-
 static const struct regmap_irq_chip s2mps11_irq_chip = {
        .name = "s2mps11",
        .irqs = s2mps11_irqs,
@@ -425,16 +349,6 @@ static const struct regmap_irq_chip s5m8767_irq_chip = {
        .ack_base = S5M8767_REG_INT1,
 };
 
-static const struct regmap_irq_chip s5m8763_irq_chip = {
-       .name = "s5m8763",
-       .irqs = s5m8763_irqs,
-       .num_irqs = ARRAY_SIZE(s5m8763_irqs),
-       .num_regs = 4,
-       .status_base = S5M8763_REG_IRQ1,
-       .mask_base = S5M8763_REG_IRQM1,
-       .ack_base = S5M8763_REG_IRQ1,
-};
-
 int sec_irq_init(struct sec_pmic_dev *sec_pmic)
 {
        int 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;

diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index f92fe090473d4136a3f9ebeb0b7dde6ad1a5ff48..07aae649a86ff7f26b4a40d5f851a951c7dbbfad 100644 (file)
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -36,7 +36,6 @@
 struct gpio_desc;
 
 enum sec_device_type {
-       S5M8751X,
        S5M8763X,
        S5M8767X,
        S2MPA01,

diff --git a/include/linux/mfd/samsung/s5m8763.h b/include/linux/mfd/samsung/s5m8763.h
deleted file mode 100644 (file)
index c534f08..0000000
--- a/include/linux/mfd/samsung/s5m8763.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd
- *              http://www.samsung.com
- */
-
-#ifndef __LINUX_MFD_S5M8763_H
-#define __LINUX_MFD_S5M8763_H
-
-/* S5M8763 registers */
-enum s5m8763_reg {
-       S5M8763_REG_IRQ1,
-       S5M8763_REG_IRQ2,
-       S5M8763_REG_IRQ3,
-       S5M8763_REG_IRQ4,
-       S5M8763_REG_IRQM1,
-       S5M8763_REG_IRQM2,
-       S5M8763_REG_IRQM3,
-       S5M8763_REG_IRQM4,
-       S5M8763_REG_STATUS1,
-       S5M8763_REG_STATUS2,
-       S5M8763_REG_STATUSM1,
-       S5M8763_REG_STATUSM2,
-       S5M8763_REG_CHGR1,
-       S5M8763_REG_CHGR2,
-       S5M8763_REG_LDO_ACTIVE_DISCHARGE1,
-       S5M8763_REG_LDO_ACTIVE_DISCHARGE2,
-       S5M8763_REG_BUCK_ACTIVE_DISCHARGE3,
-       S5M8763_REG_ONOFF1,
-       S5M8763_REG_ONOFF2,
-       S5M8763_REG_ONOFF3,
-       S5M8763_REG_ONOFF4,
-       S5M8763_REG_BUCK1_VOLTAGE1,
-       S5M8763_REG_BUCK1_VOLTAGE2,
-       S5M8763_REG_BUCK1_VOLTAGE3,
-       S5M8763_REG_BUCK1_VOLTAGE4,
-       S5M8763_REG_BUCK2_VOLTAGE1,
-       S5M8763_REG_BUCK2_VOLTAGE2,
-       S5M8763_REG_BUCK3,
-       S5M8763_REG_BUCK4,
-       S5M8763_REG_LDO1_LDO2,
-       S5M8763_REG_LDO3,
-       S5M8763_REG_LDO4,
-       S5M8763_REG_LDO5,
-       S5M8763_REG_LDO6,
-       S5M8763_REG_LDO7,
-       S5M8763_REG_LDO7_LDO8,
-       S5M8763_REG_LDO9_LDO10,
-       S5M8763_REG_LDO11,
-       S5M8763_REG_LDO12,
-       S5M8763_REG_LDO13,
-       S5M8763_REG_LDO14,
-       S5M8763_REG_LDO15,
-       S5M8763_REG_LDO16,
-       S5M8763_REG_BKCHR,
-       S5M8763_REG_LBCNFG1,
-       S5M8763_REG_LBCNFG2,
-};
-
-/* S5M8763 regulator ids */
-enum s5m8763_regulators {
-       S5M8763_LDO1,
-       S5M8763_LDO2,
-       S5M8763_LDO3,
-       S5M8763_LDO4,
-       S5M8763_LDO5,
-       S5M8763_LDO6,
-       S5M8763_LDO7,
-       S5M8763_LDO8,
-       S5M8763_LDO9,
-       S5M8763_LDO10,
-       S5M8763_LDO11,
-       S5M8763_LDO12,
-       S5M8763_LDO13,
-       S5M8763_LDO14,
-       S5M8763_LDO15,
-       S5M8763_LDO16,
-       S5M8763_BUCK1,
-       S5M8763_BUCK2,
-       S5M8763_BUCK3,
-       S5M8763_BUCK4,
-       S5M8763_AP_EN32KHZ,
-       S5M8763_CP_EN32KHZ,
-       S5M8763_ENCHGVI,
-       S5M8763_ESAFEUSB1,
-       S5M8763_ESAFEUSB2,
-};
-
-#define S5M8763_ENRAMP                  (1 << 4)
-#endif /* __LINUX_MFD_S5M8763_H */