Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

David Virag and committed by
Lee Jones
f736d2c0 7697c64b

-226
-46
drivers/mfd/sec-core.c
··· 24 24 #include <linux/mfd/samsung/s2mps14.h> 25 25 #include <linux/mfd/samsung/s2mps15.h> 26 26 #include <linux/mfd/samsung/s2mpu02.h> 27 - #include <linux/mfd/samsung/s5m8763.h> 28 27 #include <linux/mfd/samsung/s5m8767.h> 29 28 #include <linux/regmap.h> 30 - 31 - static const struct mfd_cell s5m8751_devs[] = { 32 - { .name = "s5m8751-pmic", }, 33 - { .name = "s5m-charger", }, 34 - { .name = "s5m8751-codec", }, 35 - }; 36 - 37 - static const struct mfd_cell s5m8763_devs[] = { 38 - { .name = "s5m8763-pmic", }, 39 - { .name = "s5m-rtc", }, 40 - { .name = "s5m-charger", }, 41 - }; 42 29 43 30 static const struct mfd_cell s5m8767_devs[] = { 44 31 { .name = "s5m8767-pmic", }, ··· 145 158 } 146 159 } 147 160 148 - static bool s5m8763_volatile(struct device *dev, unsigned int reg) 149 - { 150 - switch (reg) { 151 - case S5M8763_REG_IRQM1: 152 - case S5M8763_REG_IRQM2: 153 - case S5M8763_REG_IRQM3: 154 - case S5M8763_REG_IRQM4: 155 - return false; 156 - default: 157 - return true; 158 - } 159 - } 160 - 161 161 static const struct regmap_config sec_regmap_config = { 162 162 .reg_bits = 8, 163 163 .val_bits = 8, ··· 201 227 202 228 .max_register = S2MPU02_REG_DVSDATA, 203 229 .volatile_reg = s2mpu02_volatile, 204 - .cache_type = REGCACHE_FLAT, 205 - }; 206 - 207 - static const struct regmap_config s5m8763_regmap_config = { 208 - .reg_bits = 8, 209 - .val_bits = 8, 210 - 211 - .max_register = S5M8763_REG_LBCNFG2, 212 - .volatile_reg = s5m8763_volatile, 213 230 .cache_type = REGCACHE_FLAT, 214 231 }; 215 232 ··· 313 348 case S2MPS15X: 314 349 regmap = &s2mps15_regmap_config; 315 350 break; 316 - case S5M8763X: 317 - regmap = &s5m8763_regmap_config; 318 - break; 319 351 case S5M8767X: 320 352 regmap = &s5m8767_regmap_config; 321 353 break; ··· 337 375 pm_runtime_set_active(sec_pmic->dev); 338 376 339 377 switch (sec_pmic->device_type) { 340 - case S5M8751X: 341 - sec_devs = s5m8751_devs; 342 - num_sec_devs = ARRAY_SIZE(s5m8751_devs); 343 - break; 344 - case S5M8763X: 345 - sec_devs = s5m8763_devs; 346 - num_sec_devs = ARRAY_SIZE(s5m8763_devs); 347 - break; 348 378 case S5M8767X: 349 379 sec_devs = s5m8767_devs; 350 380 num_sec_devs = ARRAY_SIZE(s5m8767_devs);
-89
drivers/mfd/sec-irq.c
··· 14 14 #include <linux/mfd/samsung/s2mps11.h> 15 15 #include <linux/mfd/samsung/s2mps14.h> 16 16 #include <linux/mfd/samsung/s2mpu02.h> 17 - #include <linux/mfd/samsung/s5m8763.h> 18 17 #include <linux/mfd/samsung/s5m8767.h> 19 18 20 19 static const struct regmap_irq s2mps11_irqs[] = { ··· 296 297 }, 297 298 }; 298 299 299 - static const struct regmap_irq s5m8763_irqs[] = { 300 - [S5M8763_IRQ_DCINF] = { 301 - .reg_offset = 0, 302 - .mask = S5M8763_IRQ_DCINF_MASK, 303 - }, 304 - [S5M8763_IRQ_DCINR] = { 305 - .reg_offset = 0, 306 - .mask = S5M8763_IRQ_DCINR_MASK, 307 - }, 308 - [S5M8763_IRQ_JIGF] = { 309 - .reg_offset = 0, 310 - .mask = S5M8763_IRQ_JIGF_MASK, 311 - }, 312 - [S5M8763_IRQ_JIGR] = { 313 - .reg_offset = 0, 314 - .mask = S5M8763_IRQ_JIGR_MASK, 315 - }, 316 - [S5M8763_IRQ_PWRONF] = { 317 - .reg_offset = 0, 318 - .mask = S5M8763_IRQ_PWRONF_MASK, 319 - }, 320 - [S5M8763_IRQ_PWRONR] = { 321 - .reg_offset = 0, 322 - .mask = S5M8763_IRQ_PWRONR_MASK, 323 - }, 324 - [S5M8763_IRQ_WTSREVNT] = { 325 - .reg_offset = 1, 326 - .mask = S5M8763_IRQ_WTSREVNT_MASK, 327 - }, 328 - [S5M8763_IRQ_SMPLEVNT] = { 329 - .reg_offset = 1, 330 - .mask = S5M8763_IRQ_SMPLEVNT_MASK, 331 - }, 332 - [S5M8763_IRQ_ALARM1] = { 333 - .reg_offset = 1, 334 - .mask = S5M8763_IRQ_ALARM1_MASK, 335 - }, 336 - [S5M8763_IRQ_ALARM0] = { 337 - .reg_offset = 1, 338 - .mask = S5M8763_IRQ_ALARM0_MASK, 339 - }, 340 - [S5M8763_IRQ_ONKEY1S] = { 341 - .reg_offset = 2, 342 - .mask = S5M8763_IRQ_ONKEY1S_MASK, 343 - }, 344 - [S5M8763_IRQ_TOPOFFR] = { 345 - .reg_offset = 2, 346 - .mask = S5M8763_IRQ_TOPOFFR_MASK, 347 - }, 348 - [S5M8763_IRQ_DCINOVPR] = { 349 - .reg_offset = 2, 350 - .mask = S5M8763_IRQ_DCINOVPR_MASK, 351 - }, 352 - [S5M8763_IRQ_CHGRSTF] = { 353 - .reg_offset = 2, 354 - .mask = S5M8763_IRQ_CHGRSTF_MASK, 355 - }, 356 - [S5M8763_IRQ_DONER] = { 357 - .reg_offset = 2, 358 - .mask = S5M8763_IRQ_DONER_MASK, 359 - }, 360 - [S5M8763_IRQ_CHGFAULT] = { 361 - .reg_offset = 2, 362 - .mask = S5M8763_IRQ_CHGFAULT_MASK, 363 - }, 364 - [S5M8763_IRQ_LOBAT1] = { 365 - .reg_offset = 3, 366 - .mask = S5M8763_IRQ_LOBAT1_MASK, 367 - }, 368 - [S5M8763_IRQ_LOBAT2] = { 369 - .reg_offset = 3, 370 - .mask = S5M8763_IRQ_LOBAT2_MASK, 371 - }, 372 - }; 373 - 374 300 static const struct regmap_irq_chip s2mps11_irq_chip = { 375 301 .name = "s2mps11", 376 302 .irqs = s2mps11_irqs, ··· 349 425 .ack_base = S5M8767_REG_INT1, 350 426 }; 351 427 352 - static const struct regmap_irq_chip s5m8763_irq_chip = { 353 - .name = "s5m8763", 354 - .irqs = s5m8763_irqs, 355 - .num_irqs = ARRAY_SIZE(s5m8763_irqs), 356 - .num_regs = 4, 357 - .status_base = S5M8763_REG_IRQ1, 358 - .mask_base = S5M8763_REG_IRQM1, 359 - .ack_base = S5M8763_REG_IRQ1, 360 - }; 361 - 362 428 int sec_irq_init(struct sec_pmic_dev *sec_pmic) 363 429 { 364 430 int ret = 0; ··· 362 448 } 363 449 364 450 switch (type) { 365 - case S5M8763X: 366 - sec_irq_chip = &s5m8763_irq_chip; 367 - break; 368 451 case S5M8767X: 369 452 sec_irq_chip = &s5m8767_irq_chip; 370 453 break;
-1
include/linux/mfd/samsung/core.h
··· 36 36 struct gpio_desc; 37 37 38 38 enum sec_device_type { 39 - S5M8751X, 40 39 S5M8763X, 41 40 S5M8767X, 42 41 S2MPA01,
-90
include/linux/mfd/samsung/s5m8763.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0+ */ 2 - /* 3 - * Copyright (c) 2011 Samsung Electronics Co., Ltd 4 - * http://www.samsung.com 5 - */ 6 - 7 - #ifndef __LINUX_MFD_S5M8763_H 8 - #define __LINUX_MFD_S5M8763_H 9 - 10 - /* S5M8763 registers */ 11 - enum s5m8763_reg { 12 - S5M8763_REG_IRQ1, 13 - S5M8763_REG_IRQ2, 14 - S5M8763_REG_IRQ3, 15 - S5M8763_REG_IRQ4, 16 - S5M8763_REG_IRQM1, 17 - S5M8763_REG_IRQM2, 18 - S5M8763_REG_IRQM3, 19 - S5M8763_REG_IRQM4, 20 - S5M8763_REG_STATUS1, 21 - S5M8763_REG_STATUS2, 22 - S5M8763_REG_STATUSM1, 23 - S5M8763_REG_STATUSM2, 24 - S5M8763_REG_CHGR1, 25 - S5M8763_REG_CHGR2, 26 - S5M8763_REG_LDO_ACTIVE_DISCHARGE1, 27 - S5M8763_REG_LDO_ACTIVE_DISCHARGE2, 28 - S5M8763_REG_BUCK_ACTIVE_DISCHARGE3, 29 - S5M8763_REG_ONOFF1, 30 - S5M8763_REG_ONOFF2, 31 - S5M8763_REG_ONOFF3, 32 - S5M8763_REG_ONOFF4, 33 - S5M8763_REG_BUCK1_VOLTAGE1, 34 - S5M8763_REG_BUCK1_VOLTAGE2, 35 - S5M8763_REG_BUCK1_VOLTAGE3, 36 - S5M8763_REG_BUCK1_VOLTAGE4, 37 - S5M8763_REG_BUCK2_VOLTAGE1, 38 - S5M8763_REG_BUCK2_VOLTAGE2, 39 - S5M8763_REG_BUCK3, 40 - S5M8763_REG_BUCK4, 41 - S5M8763_REG_LDO1_LDO2, 42 - S5M8763_REG_LDO3, 43 - S5M8763_REG_LDO4, 44 - S5M8763_REG_LDO5, 45 - S5M8763_REG_LDO6, 46 - S5M8763_REG_LDO7, 47 - S5M8763_REG_LDO7_LDO8, 48 - S5M8763_REG_LDO9_LDO10, 49 - S5M8763_REG_LDO11, 50 - S5M8763_REG_LDO12, 51 - S5M8763_REG_LDO13, 52 - S5M8763_REG_LDO14, 53 - S5M8763_REG_LDO15, 54 - S5M8763_REG_LDO16, 55 - S5M8763_REG_BKCHR, 56 - S5M8763_REG_LBCNFG1, 57 - S5M8763_REG_LBCNFG2, 58 - }; 59 - 60 - /* S5M8763 regulator ids */ 61 - enum s5m8763_regulators { 62 - S5M8763_LDO1, 63 - S5M8763_LDO2, 64 - S5M8763_LDO3, 65 - S5M8763_LDO4, 66 - S5M8763_LDO5, 67 - S5M8763_LDO6, 68 - S5M8763_LDO7, 69 - S5M8763_LDO8, 70 - S5M8763_LDO9, 71 - S5M8763_LDO10, 72 - S5M8763_LDO11, 73 - S5M8763_LDO12, 74 - S5M8763_LDO13, 75 - S5M8763_LDO14, 76 - S5M8763_LDO15, 77 - S5M8763_LDO16, 78 - S5M8763_BUCK1, 79 - S5M8763_BUCK2, 80 - S5M8763_BUCK3, 81 - S5M8763_BUCK4, 82 - S5M8763_AP_EN32KHZ, 83 - S5M8763_CP_EN32KHZ, 84 - S5M8763_ENCHGVI, 85 - S5M8763_ESAFEUSB1, 86 - S5M8763_ESAFEUSB2, 87 - }; 88 - 89 - #define S5M8763_ENRAMP (1 << 4) 90 - #endif /* __LINUX_MFD_S5M8763_H */