]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
Drop mfd-tps6594-add-ti-tps652g1-support.patch
authorSasha Levin <sashal@kernel.org>
Tue, 19 Aug 2025 02:00:44 +0000 (22:00 -0400)
committerSasha Levin <sashal@kernel.org>
Tue, 19 Aug 2025 02:03:37 +0000 (22:03 -0400)
Signed-off-by: Sasha Levin <sashal@kernel.org>
queue-6.12/mfd-tps6594-add-ti-tps652g1-support.patch [deleted file]
queue-6.12/series
queue-6.15/mfd-tps6594-add-ti-tps652g1-support.patch [deleted file]
queue-6.15/series
queue-6.16/mfd-tps6594-add-ti-tps652g1-support.patch [deleted file]
queue-6.16/series

diff --git a/queue-6.12/mfd-tps6594-add-ti-tps652g1-support.patch b/queue-6.12/mfd-tps6594-add-ti-tps652g1-support.patch
deleted file mode 100644 (file)
index 6605ee5..0000000
+++ /dev/null
@@ -1,254 +0,0 @@
-From 7a317658568bdb0b1e860bc66a1786162029e7ff Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 13 Jun 2025 13:45:12 +0200
-Subject: mfd: tps6594: Add TI TPS652G1 support
-
-From: Michael Walle <mwalle@kernel.org>
-
-[ Upstream commit 626bb0a45584d544d84eab909795ccb355062bcc ]
-
-The TPS652G1 is a stripped down version of the TPS65224. From a software
-point of view, it lacks any voltage monitoring, the watchdog, the ESM
-and the ADC.
-
-Signed-off-by: Michael Walle <mwalle@kernel.org>
-Link: https://lore.kernel.org/r/20250613114518.1772109-2-mwalle@kernel.org
-Signed-off-by: Lee Jones <lee@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/mfd/tps6594-core.c  | 88 ++++++++++++++++++++++++++++++++++---
- drivers/mfd/tps6594-i2c.c   | 10 ++++-
- drivers/mfd/tps6594-spi.c   | 10 ++++-
- include/linux/mfd/tps6594.h |  1 +
- 4 files changed, 99 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/mfd/tps6594-core.c b/drivers/mfd/tps6594-core.c
-index a7223e873cd1..c16c37e36617 100644
---- a/drivers/mfd/tps6594-core.c
-+++ b/drivers/mfd/tps6594-core.c
-@@ -1,6 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * Core functions for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
-+ * Core functions for following TI PMICs:
-+ *  - LP8764
-+ *  - TPS65224
-+ *  - TPS652G1
-+ *  - TPS6593
-+ *  - TPS6594
-  *
-  * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
-  */
-@@ -414,6 +419,61 @@ static const unsigned int tps65224_irq_reg[] = {
-       TPS6594_REG_INT_FSM_ERR,
- };
-+/* TPS652G1 Resources */
-+
-+static const struct mfd_cell tps652g1_common_cells[] = {
-+      MFD_CELL_RES("tps6594-pfsm", tps65224_pfsm_resources),
-+      MFD_CELL_RES("tps6594-pinctrl", tps65224_pinctrl_resources),
-+      MFD_CELL_NAME("tps6594-regulator"),
-+};
-+
-+static const struct regmap_irq tps652g1_irqs[] = {
-+      /* INT_GPIO register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO1, 2, TPS65224_BIT_GPIO1_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO2, 2, TPS65224_BIT_GPIO2_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO3, 2, TPS65224_BIT_GPIO3_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO4, 2, TPS65224_BIT_GPIO4_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO5, 2, TPS65224_BIT_GPIO5_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO6, 2, TPS65224_BIT_GPIO6_INT),
-+
-+      /* INT_STARTUP register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_VSENSE, 3, TPS65224_BIT_VSENSE_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_ENABLE, 3, TPS6594_BIT_ENABLE_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_SHORT, 3, TPS65224_BIT_PB_SHORT_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_FSD, 3, TPS6594_BIT_FSD_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_SOFT_REBOOT, 3, TPS6594_BIT_SOFT_REBOOT_INT),
-+
-+      /* INT_MISC register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_BIST_PASS, 4, TPS6594_BIT_BIST_PASS_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_EXT_CLK, 4, TPS6594_BIT_EXT_CLK_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_REG_UNLOCK, 4, TPS65224_BIT_REG_UNLOCK_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_TWARN, 4, TPS6594_BIT_TWARN_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_LONG, 4, TPS65224_BIT_PB_LONG_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_FALL, 4, TPS65224_BIT_PB_FALL_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_RISE, 4, TPS65224_BIT_PB_RISE_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_ADC_CONV_READY, 4, TPS65224_BIT_ADC_CONV_READY_INT),
-+
-+      /* INT_MODERATE_ERR register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_TSD_ORD, 5, TPS6594_BIT_TSD_ORD_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_BIST_FAIL, 5, TPS6594_BIT_BIST_FAIL_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_REG_CRC_ERR, 5, TPS6594_BIT_REG_CRC_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_RECOV_CNT, 5, TPS6594_BIT_RECOV_CNT_INT),
-+
-+      /* INT_SEVERE_ERR register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_TSD_IMM, 6, TPS6594_BIT_TSD_IMM_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_VCCA_OVP, 6, TPS6594_BIT_VCCA_OVP_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PFSM_ERR, 6, TPS6594_BIT_PFSM_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_BG_XMON, 6, TPS65224_BIT_BG_XMON_INT),
-+
-+      /* INT_FSM_ERR register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_IMM_SHUTDOWN, 7, TPS6594_BIT_IMM_SHUTDOWN_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_ORD_SHUTDOWN, 7, TPS6594_BIT_ORD_SHUTDOWN_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_MCU_PWR_ERR, 7, TPS6594_BIT_MCU_PWR_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_SOC_PWR_ERR, 7, TPS6594_BIT_SOC_PWR_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_COMM_ERR, 7, TPS6594_BIT_COMM_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_I2C2_ERR, 7, TPS65224_BIT_I2C2_ERR_INT),
-+};
-+
- static inline unsigned int tps6594_get_irq_reg(struct regmap_irq_chip_data *data,
-                                              unsigned int base, int index)
- {
-@@ -443,7 +503,7 @@ static int tps6594_handle_post_irq(void *irq_drv_data)
-        * a new interrupt.
-        */
-       if (tps->use_crc) {
--              if (tps->chip_id == TPS65224) {
-+              if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
-                       regmap_reg = TPS6594_REG_INT_FSM_ERR;
-                       mask_val = TPS6594_BIT_COMM_ERR_INT;
-               } else {
-@@ -481,6 +541,18 @@ static struct regmap_irq_chip tps65224_irq_chip = {
-       .handle_post_irq = tps6594_handle_post_irq,
- };
-+static struct regmap_irq_chip tps652g1_irq_chip = {
-+      .ack_base = TPS6594_REG_INT_BUCK,
-+      .ack_invert = 1,
-+      .clear_ack = 1,
-+      .init_ack_masked = 1,
-+      .num_regs = ARRAY_SIZE(tps65224_irq_reg),
-+      .irqs = tps652g1_irqs,
-+      .num_irqs = ARRAY_SIZE(tps652g1_irqs),
-+      .get_irq_reg = tps65224_get_irq_reg,
-+      .handle_post_irq = tps6594_handle_post_irq,
-+};
-+
- static const struct regmap_range tps6594_volatile_ranges[] = {
-       regmap_reg_range(TPS6594_REG_INT_TOP, TPS6594_REG_STAT_READBACK_ERR),
-       regmap_reg_range(TPS6594_REG_RTC_STATUS, TPS6594_REG_RTC_STATUS),
-@@ -507,7 +579,7 @@ static int tps6594_check_crc_mode(struct tps6594 *tps, bool primary_pmic)
-       int ret;
-       unsigned int regmap_reg, mask_val;
--      if (tps->chip_id == TPS65224) {
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
-               regmap_reg = TPS6594_REG_CONFIG_2;
-               mask_val = TPS65224_BIT_I2C1_SPI_CRC_EN;
-       } else {
-@@ -537,7 +609,7 @@ static int tps6594_set_crc_feature(struct tps6594 *tps)
-       int ret;
-       unsigned int regmap_reg, mask_val;
--      if (tps->chip_id == TPS65224) {
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
-               regmap_reg = TPS6594_REG_CONFIG_2;
-               mask_val = TPS65224_BIT_I2C1_SPI_CRC_EN;
-       } else {
-@@ -628,6 +700,10 @@ int tps6594_device_init(struct tps6594 *tps, bool enable_crc)
-               irq_chip = &tps65224_irq_chip;
-               n_cells = ARRAY_SIZE(tps65224_common_cells);
-               cells = tps65224_common_cells;
-+      } else if (tps->chip_id == TPS652G1) {
-+              irq_chip = &tps652g1_irq_chip;
-+              n_cells = ARRAY_SIZE(tps652g1_common_cells);
-+              cells = tps652g1_common_cells;
-       } else {
-               irq_chip = &tps6594_irq_chip;
-               n_cells = ARRAY_SIZE(tps6594_common_cells);
-@@ -651,8 +727,8 @@ int tps6594_device_init(struct tps6594 *tps, bool enable_crc)
-       if (ret)
-               return dev_err_probe(dev, ret, "Failed to add common child devices\n");
--      /* No RTC for LP8764 and TPS65224 */
--      if (tps->chip_id != LP8764 && tps->chip_id != TPS65224) {
-+      /* No RTC for LP8764, TPS65224 and TPS652G1 */
-+      if (tps->chip_id != LP8764 && tps->chip_id != TPS65224 && tps->chip_id != TPS652G1) {
-               ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, tps6594_rtc_cells,
-                                          ARRAY_SIZE(tps6594_rtc_cells), NULL, 0,
-                                          regmap_irq_get_domain(tps->irq_data));
-diff --git a/drivers/mfd/tps6594-i2c.c b/drivers/mfd/tps6594-i2c.c
-index 4ab91c34d9fb..7ff7516286fd 100644
---- a/drivers/mfd/tps6594-i2c.c
-+++ b/drivers/mfd/tps6594-i2c.c
-@@ -1,6 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * I2C access driver for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
-+ * I2C access driver for the following TI PMICs:
-+ *  - LP8764
-+ *  - TPS65224
-+ *  - TPS652G1
-+ *  - TPS6593
-+ *  - TPS6594
-  *
-  * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
-  */
-@@ -197,6 +202,7 @@ static const struct of_device_id tps6594_i2c_of_match_table[] = {
-       { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, },
-       { .compatible = "ti,lp8764-q1",  .data = (void *)LP8764,  },
-       { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, },
-+      { .compatible = "ti,tps652g1", .data = (void *)TPS652G1, },
-       {}
- };
- MODULE_DEVICE_TABLE(of, tps6594_i2c_of_match_table);
-@@ -222,7 +228,7 @@ static int tps6594_i2c_probe(struct i2c_client *client)
-               return dev_err_probe(dev, -EINVAL, "Failed to find matching chip ID\n");
-       tps->chip_id = (unsigned long)match->data;
--      if (tps->chip_id == TPS65224)
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1)
-               tps6594_i2c_regmap_config.volatile_table = &tps65224_volatile_table;
-       tps->regmap = devm_regmap_init(dev, NULL, client, &tps6594_i2c_regmap_config);
-diff --git a/drivers/mfd/tps6594-spi.c b/drivers/mfd/tps6594-spi.c
-index 6ebccb79f0cc..944b7313a1d9 100644
---- a/drivers/mfd/tps6594-spi.c
-+++ b/drivers/mfd/tps6594-spi.c
-@@ -1,6 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * SPI access driver for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
-+ * SPI access driver for the following TI PMICs:
-+ *  - LP8764
-+ *  - TPS65224
-+ *  - TPS652G1
-+ *  - TPS6593
-+ *  - TPS6594
-  *
-  * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
-  */
-@@ -82,6 +87,7 @@ static const struct of_device_id tps6594_spi_of_match_table[] = {
-       { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, },
-       { .compatible = "ti,lp8764-q1",  .data = (void *)LP8764,  },
-       { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, },
-+      { .compatible = "ti,tps652g1", .data = (void *)TPS652G1, },
-       {}
- };
- MODULE_DEVICE_TABLE(of, tps6594_spi_of_match_table);
-@@ -107,7 +113,7 @@ static int tps6594_spi_probe(struct spi_device *spi)
-               return dev_err_probe(dev, -EINVAL, "Failed to find matching chip ID\n");
-       tps->chip_id = (unsigned long)match->data;
--      if (tps->chip_id == TPS65224)
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1)
-               tps6594_spi_regmap_config.volatile_table = &tps65224_volatile_table;
-       tps->regmap = devm_regmap_init(dev, NULL, spi, &tps6594_spi_regmap_config);
-diff --git a/include/linux/mfd/tps6594.h b/include/linux/mfd/tps6594.h
-index 16543fd4d83e..021db8875963 100644
---- a/include/linux/mfd/tps6594.h
-+++ b/include/linux/mfd/tps6594.h
-@@ -19,6 +19,7 @@ enum pmic_id {
-       TPS6593,
-       LP8764,
-       TPS65224,
-+      TPS652G1,
- };
- /* Macro to get page index from register address */
--- 
-2.39.5
-
index 2dd92b79970bc4fc2f785193bded9d590791f964..047afb62c1089956487b73497381bff08eae4a4f 100644 (file)
@@ -117,7 +117,6 @@ thermal-drivers-qcom-spmi-temp-alarm-enable-stage-2-.patch
 tools-nolibc-define-time_t-in-terms-of-__kernel_old_.patch
 iio-adc-ad_sigma_delta-don-t-overallocate-scan-buffe.patch
 gpio-tps65912-check-the-return-value-of-regmap_updat.patch
-mfd-tps6594-add-ti-tps652g1-support.patch
 arm-tegra-use-i-o-memcpy-to-write-to-iram.patch
 tools-build-fix-s390-x-cross-compilation-with-clang.patch
 selftests-tracing-use-mutex_unlock-for-testing-glob-.patch
diff --git a/queue-6.15/mfd-tps6594-add-ti-tps652g1-support.patch b/queue-6.15/mfd-tps6594-add-ti-tps652g1-support.patch
deleted file mode 100644 (file)
index 023b6a9..0000000
+++ /dev/null
@@ -1,254 +0,0 @@
-From a056de92ec4ceadab673eb297a7eea618b19d8db Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 13 Jun 2025 13:45:12 +0200
-Subject: mfd: tps6594: Add TI TPS652G1 support
-
-From: Michael Walle <mwalle@kernel.org>
-
-[ Upstream commit 626bb0a45584d544d84eab909795ccb355062bcc ]
-
-The TPS652G1 is a stripped down version of the TPS65224. From a software
-point of view, it lacks any voltage monitoring, the watchdog, the ESM
-and the ADC.
-
-Signed-off-by: Michael Walle <mwalle@kernel.org>
-Link: https://lore.kernel.org/r/20250613114518.1772109-2-mwalle@kernel.org
-Signed-off-by: Lee Jones <lee@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/mfd/tps6594-core.c  | 88 ++++++++++++++++++++++++++++++++++---
- drivers/mfd/tps6594-i2c.c   | 10 ++++-
- drivers/mfd/tps6594-spi.c   | 10 ++++-
- include/linux/mfd/tps6594.h |  1 +
- 4 files changed, 99 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/mfd/tps6594-core.c b/drivers/mfd/tps6594-core.c
-index a7223e873cd1..c16c37e36617 100644
---- a/drivers/mfd/tps6594-core.c
-+++ b/drivers/mfd/tps6594-core.c
-@@ -1,6 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * Core functions for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
-+ * Core functions for following TI PMICs:
-+ *  - LP8764
-+ *  - TPS65224
-+ *  - TPS652G1
-+ *  - TPS6593
-+ *  - TPS6594
-  *
-  * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
-  */
-@@ -414,6 +419,61 @@ static const unsigned int tps65224_irq_reg[] = {
-       TPS6594_REG_INT_FSM_ERR,
- };
-+/* TPS652G1 Resources */
-+
-+static const struct mfd_cell tps652g1_common_cells[] = {
-+      MFD_CELL_RES("tps6594-pfsm", tps65224_pfsm_resources),
-+      MFD_CELL_RES("tps6594-pinctrl", tps65224_pinctrl_resources),
-+      MFD_CELL_NAME("tps6594-regulator"),
-+};
-+
-+static const struct regmap_irq tps652g1_irqs[] = {
-+      /* INT_GPIO register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO1, 2, TPS65224_BIT_GPIO1_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO2, 2, TPS65224_BIT_GPIO2_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO3, 2, TPS65224_BIT_GPIO3_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO4, 2, TPS65224_BIT_GPIO4_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO5, 2, TPS65224_BIT_GPIO5_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO6, 2, TPS65224_BIT_GPIO6_INT),
-+
-+      /* INT_STARTUP register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_VSENSE, 3, TPS65224_BIT_VSENSE_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_ENABLE, 3, TPS6594_BIT_ENABLE_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_SHORT, 3, TPS65224_BIT_PB_SHORT_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_FSD, 3, TPS6594_BIT_FSD_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_SOFT_REBOOT, 3, TPS6594_BIT_SOFT_REBOOT_INT),
-+
-+      /* INT_MISC register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_BIST_PASS, 4, TPS6594_BIT_BIST_PASS_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_EXT_CLK, 4, TPS6594_BIT_EXT_CLK_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_REG_UNLOCK, 4, TPS65224_BIT_REG_UNLOCK_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_TWARN, 4, TPS6594_BIT_TWARN_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_LONG, 4, TPS65224_BIT_PB_LONG_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_FALL, 4, TPS65224_BIT_PB_FALL_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_RISE, 4, TPS65224_BIT_PB_RISE_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_ADC_CONV_READY, 4, TPS65224_BIT_ADC_CONV_READY_INT),
-+
-+      /* INT_MODERATE_ERR register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_TSD_ORD, 5, TPS6594_BIT_TSD_ORD_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_BIST_FAIL, 5, TPS6594_BIT_BIST_FAIL_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_REG_CRC_ERR, 5, TPS6594_BIT_REG_CRC_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_RECOV_CNT, 5, TPS6594_BIT_RECOV_CNT_INT),
-+
-+      /* INT_SEVERE_ERR register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_TSD_IMM, 6, TPS6594_BIT_TSD_IMM_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_VCCA_OVP, 6, TPS6594_BIT_VCCA_OVP_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PFSM_ERR, 6, TPS6594_BIT_PFSM_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_BG_XMON, 6, TPS65224_BIT_BG_XMON_INT),
-+
-+      /* INT_FSM_ERR register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_IMM_SHUTDOWN, 7, TPS6594_BIT_IMM_SHUTDOWN_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_ORD_SHUTDOWN, 7, TPS6594_BIT_ORD_SHUTDOWN_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_MCU_PWR_ERR, 7, TPS6594_BIT_MCU_PWR_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_SOC_PWR_ERR, 7, TPS6594_BIT_SOC_PWR_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_COMM_ERR, 7, TPS6594_BIT_COMM_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_I2C2_ERR, 7, TPS65224_BIT_I2C2_ERR_INT),
-+};
-+
- static inline unsigned int tps6594_get_irq_reg(struct regmap_irq_chip_data *data,
-                                              unsigned int base, int index)
- {
-@@ -443,7 +503,7 @@ static int tps6594_handle_post_irq(void *irq_drv_data)
-        * a new interrupt.
-        */
-       if (tps->use_crc) {
--              if (tps->chip_id == TPS65224) {
-+              if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
-                       regmap_reg = TPS6594_REG_INT_FSM_ERR;
-                       mask_val = TPS6594_BIT_COMM_ERR_INT;
-               } else {
-@@ -481,6 +541,18 @@ static struct regmap_irq_chip tps65224_irq_chip = {
-       .handle_post_irq = tps6594_handle_post_irq,
- };
-+static struct regmap_irq_chip tps652g1_irq_chip = {
-+      .ack_base = TPS6594_REG_INT_BUCK,
-+      .ack_invert = 1,
-+      .clear_ack = 1,
-+      .init_ack_masked = 1,
-+      .num_regs = ARRAY_SIZE(tps65224_irq_reg),
-+      .irqs = tps652g1_irqs,
-+      .num_irqs = ARRAY_SIZE(tps652g1_irqs),
-+      .get_irq_reg = tps65224_get_irq_reg,
-+      .handle_post_irq = tps6594_handle_post_irq,
-+};
-+
- static const struct regmap_range tps6594_volatile_ranges[] = {
-       regmap_reg_range(TPS6594_REG_INT_TOP, TPS6594_REG_STAT_READBACK_ERR),
-       regmap_reg_range(TPS6594_REG_RTC_STATUS, TPS6594_REG_RTC_STATUS),
-@@ -507,7 +579,7 @@ static int tps6594_check_crc_mode(struct tps6594 *tps, bool primary_pmic)
-       int ret;
-       unsigned int regmap_reg, mask_val;
--      if (tps->chip_id == TPS65224) {
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
-               regmap_reg = TPS6594_REG_CONFIG_2;
-               mask_val = TPS65224_BIT_I2C1_SPI_CRC_EN;
-       } else {
-@@ -537,7 +609,7 @@ static int tps6594_set_crc_feature(struct tps6594 *tps)
-       int ret;
-       unsigned int regmap_reg, mask_val;
--      if (tps->chip_id == TPS65224) {
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
-               regmap_reg = TPS6594_REG_CONFIG_2;
-               mask_val = TPS65224_BIT_I2C1_SPI_CRC_EN;
-       } else {
-@@ -628,6 +700,10 @@ int tps6594_device_init(struct tps6594 *tps, bool enable_crc)
-               irq_chip = &tps65224_irq_chip;
-               n_cells = ARRAY_SIZE(tps65224_common_cells);
-               cells = tps65224_common_cells;
-+      } else if (tps->chip_id == TPS652G1) {
-+              irq_chip = &tps652g1_irq_chip;
-+              n_cells = ARRAY_SIZE(tps652g1_common_cells);
-+              cells = tps652g1_common_cells;
-       } else {
-               irq_chip = &tps6594_irq_chip;
-               n_cells = ARRAY_SIZE(tps6594_common_cells);
-@@ -651,8 +727,8 @@ int tps6594_device_init(struct tps6594 *tps, bool enable_crc)
-       if (ret)
-               return dev_err_probe(dev, ret, "Failed to add common child devices\n");
--      /* No RTC for LP8764 and TPS65224 */
--      if (tps->chip_id != LP8764 && tps->chip_id != TPS65224) {
-+      /* No RTC for LP8764, TPS65224 and TPS652G1 */
-+      if (tps->chip_id != LP8764 && tps->chip_id != TPS65224 && tps->chip_id != TPS652G1) {
-               ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, tps6594_rtc_cells,
-                                          ARRAY_SIZE(tps6594_rtc_cells), NULL, 0,
-                                          regmap_irq_get_domain(tps->irq_data));
-diff --git a/drivers/mfd/tps6594-i2c.c b/drivers/mfd/tps6594-i2c.c
-index 4ab91c34d9fb..7ff7516286fd 100644
---- a/drivers/mfd/tps6594-i2c.c
-+++ b/drivers/mfd/tps6594-i2c.c
-@@ -1,6 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * I2C access driver for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
-+ * I2C access driver for the following TI PMICs:
-+ *  - LP8764
-+ *  - TPS65224
-+ *  - TPS652G1
-+ *  - TPS6593
-+ *  - TPS6594
-  *
-  * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
-  */
-@@ -197,6 +202,7 @@ static const struct of_device_id tps6594_i2c_of_match_table[] = {
-       { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, },
-       { .compatible = "ti,lp8764-q1",  .data = (void *)LP8764,  },
-       { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, },
-+      { .compatible = "ti,tps652g1", .data = (void *)TPS652G1, },
-       {}
- };
- MODULE_DEVICE_TABLE(of, tps6594_i2c_of_match_table);
-@@ -222,7 +228,7 @@ static int tps6594_i2c_probe(struct i2c_client *client)
-               return dev_err_probe(dev, -EINVAL, "Failed to find matching chip ID\n");
-       tps->chip_id = (unsigned long)match->data;
--      if (tps->chip_id == TPS65224)
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1)
-               tps6594_i2c_regmap_config.volatile_table = &tps65224_volatile_table;
-       tps->regmap = devm_regmap_init(dev, NULL, client, &tps6594_i2c_regmap_config);
-diff --git a/drivers/mfd/tps6594-spi.c b/drivers/mfd/tps6594-spi.c
-index 6ebccb79f0cc..944b7313a1d9 100644
---- a/drivers/mfd/tps6594-spi.c
-+++ b/drivers/mfd/tps6594-spi.c
-@@ -1,6 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * SPI access driver for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
-+ * SPI access driver for the following TI PMICs:
-+ *  - LP8764
-+ *  - TPS65224
-+ *  - TPS652G1
-+ *  - TPS6593
-+ *  - TPS6594
-  *
-  * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
-  */
-@@ -82,6 +87,7 @@ static const struct of_device_id tps6594_spi_of_match_table[] = {
-       { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, },
-       { .compatible = "ti,lp8764-q1",  .data = (void *)LP8764,  },
-       { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, },
-+      { .compatible = "ti,tps652g1", .data = (void *)TPS652G1, },
-       {}
- };
- MODULE_DEVICE_TABLE(of, tps6594_spi_of_match_table);
-@@ -107,7 +113,7 @@ static int tps6594_spi_probe(struct spi_device *spi)
-               return dev_err_probe(dev, -EINVAL, "Failed to find matching chip ID\n");
-       tps->chip_id = (unsigned long)match->data;
--      if (tps->chip_id == TPS65224)
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1)
-               tps6594_spi_regmap_config.volatile_table = &tps65224_volatile_table;
-       tps->regmap = devm_regmap_init(dev, NULL, spi, &tps6594_spi_regmap_config);
-diff --git a/include/linux/mfd/tps6594.h b/include/linux/mfd/tps6594.h
-index 16543fd4d83e..021db8875963 100644
---- a/include/linux/mfd/tps6594.h
-+++ b/include/linux/mfd/tps6594.h
-@@ -19,6 +19,7 @@ enum pmic_id {
-       TPS6593,
-       LP8764,
-       TPS65224,
-+      TPS652G1,
- };
- /* Macro to get page index from register address */
--- 
-2.39.5
-
index a7f6489176b1c3da62e1036d521e3ab84ebe91eb..5780a341676ef0317e2b572d1f07312ec76d5f9c 100644 (file)
@@ -140,7 +140,6 @@ thermal-drivers-qcom-spmi-temp-alarm-enable-stage-2-.patch
 tools-nolibc-define-time_t-in-terms-of-__kernel_old_.patch
 iio-adc-ad_sigma_delta-don-t-overallocate-scan-buffe.patch
 gpio-tps65912-check-the-return-value-of-regmap_updat.patch
-mfd-tps6594-add-ti-tps652g1-support.patch
 arm-tegra-use-i-o-memcpy-to-write-to-iram.patch
 tools-build-fix-s390-x-cross-compilation-with-clang.patch
 selftests-tracing-use-mutex_unlock-for-testing-glob-.patch
diff --git a/queue-6.16/mfd-tps6594-add-ti-tps652g1-support.patch b/queue-6.16/mfd-tps6594-add-ti-tps652g1-support.patch
deleted file mode 100644 (file)
index 9c83ab0..0000000
+++ /dev/null
@@ -1,254 +0,0 @@
-From 07a10bd9a3b9c066d866558ef77c2a62cc238aa0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 13 Jun 2025 13:45:12 +0200
-Subject: mfd: tps6594: Add TI TPS652G1 support
-
-From: Michael Walle <mwalle@kernel.org>
-
-[ Upstream commit 626bb0a45584d544d84eab909795ccb355062bcc ]
-
-The TPS652G1 is a stripped down version of the TPS65224. From a software
-point of view, it lacks any voltage monitoring, the watchdog, the ESM
-and the ADC.
-
-Signed-off-by: Michael Walle <mwalle@kernel.org>
-Link: https://lore.kernel.org/r/20250613114518.1772109-2-mwalle@kernel.org
-Signed-off-by: Lee Jones <lee@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/mfd/tps6594-core.c  | 88 ++++++++++++++++++++++++++++++++++---
- drivers/mfd/tps6594-i2c.c   | 10 ++++-
- drivers/mfd/tps6594-spi.c   | 10 ++++-
- include/linux/mfd/tps6594.h |  1 +
- 4 files changed, 99 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/mfd/tps6594-core.c b/drivers/mfd/tps6594-core.c
-index a7223e873cd1..c16c37e36617 100644
---- a/drivers/mfd/tps6594-core.c
-+++ b/drivers/mfd/tps6594-core.c
-@@ -1,6 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * Core functions for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
-+ * Core functions for following TI PMICs:
-+ *  - LP8764
-+ *  - TPS65224
-+ *  - TPS652G1
-+ *  - TPS6593
-+ *  - TPS6594
-  *
-  * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
-  */
-@@ -414,6 +419,61 @@ static const unsigned int tps65224_irq_reg[] = {
-       TPS6594_REG_INT_FSM_ERR,
- };
-+/* TPS652G1 Resources */
-+
-+static const struct mfd_cell tps652g1_common_cells[] = {
-+      MFD_CELL_RES("tps6594-pfsm", tps65224_pfsm_resources),
-+      MFD_CELL_RES("tps6594-pinctrl", tps65224_pinctrl_resources),
-+      MFD_CELL_NAME("tps6594-regulator"),
-+};
-+
-+static const struct regmap_irq tps652g1_irqs[] = {
-+      /* INT_GPIO register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO1, 2, TPS65224_BIT_GPIO1_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO2, 2, TPS65224_BIT_GPIO2_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO3, 2, TPS65224_BIT_GPIO3_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO4, 2, TPS65224_BIT_GPIO4_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO5, 2, TPS65224_BIT_GPIO5_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_GPIO6, 2, TPS65224_BIT_GPIO6_INT),
-+
-+      /* INT_STARTUP register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_VSENSE, 3, TPS65224_BIT_VSENSE_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_ENABLE, 3, TPS6594_BIT_ENABLE_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_SHORT, 3, TPS65224_BIT_PB_SHORT_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_FSD, 3, TPS6594_BIT_FSD_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_SOFT_REBOOT, 3, TPS6594_BIT_SOFT_REBOOT_INT),
-+
-+      /* INT_MISC register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_BIST_PASS, 4, TPS6594_BIT_BIST_PASS_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_EXT_CLK, 4, TPS6594_BIT_EXT_CLK_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_REG_UNLOCK, 4, TPS65224_BIT_REG_UNLOCK_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_TWARN, 4, TPS6594_BIT_TWARN_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_LONG, 4, TPS65224_BIT_PB_LONG_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_FALL, 4, TPS65224_BIT_PB_FALL_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PB_RISE, 4, TPS65224_BIT_PB_RISE_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_ADC_CONV_READY, 4, TPS65224_BIT_ADC_CONV_READY_INT),
-+
-+      /* INT_MODERATE_ERR register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_TSD_ORD, 5, TPS6594_BIT_TSD_ORD_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_BIST_FAIL, 5, TPS6594_BIT_BIST_FAIL_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_REG_CRC_ERR, 5, TPS6594_BIT_REG_CRC_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_RECOV_CNT, 5, TPS6594_BIT_RECOV_CNT_INT),
-+
-+      /* INT_SEVERE_ERR register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_TSD_IMM, 6, TPS6594_BIT_TSD_IMM_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_VCCA_OVP, 6, TPS6594_BIT_VCCA_OVP_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_PFSM_ERR, 6, TPS6594_BIT_PFSM_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_BG_XMON, 6, TPS65224_BIT_BG_XMON_INT),
-+
-+      /* INT_FSM_ERR register */
-+      REGMAP_IRQ_REG(TPS65224_IRQ_IMM_SHUTDOWN, 7, TPS6594_BIT_IMM_SHUTDOWN_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_ORD_SHUTDOWN, 7, TPS6594_BIT_ORD_SHUTDOWN_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_MCU_PWR_ERR, 7, TPS6594_BIT_MCU_PWR_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_SOC_PWR_ERR, 7, TPS6594_BIT_SOC_PWR_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_COMM_ERR, 7, TPS6594_BIT_COMM_ERR_INT),
-+      REGMAP_IRQ_REG(TPS65224_IRQ_I2C2_ERR, 7, TPS65224_BIT_I2C2_ERR_INT),
-+};
-+
- static inline unsigned int tps6594_get_irq_reg(struct regmap_irq_chip_data *data,
-                                              unsigned int base, int index)
- {
-@@ -443,7 +503,7 @@ static int tps6594_handle_post_irq(void *irq_drv_data)
-        * a new interrupt.
-        */
-       if (tps->use_crc) {
--              if (tps->chip_id == TPS65224) {
-+              if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
-                       regmap_reg = TPS6594_REG_INT_FSM_ERR;
-                       mask_val = TPS6594_BIT_COMM_ERR_INT;
-               } else {
-@@ -481,6 +541,18 @@ static struct regmap_irq_chip tps65224_irq_chip = {
-       .handle_post_irq = tps6594_handle_post_irq,
- };
-+static struct regmap_irq_chip tps652g1_irq_chip = {
-+      .ack_base = TPS6594_REG_INT_BUCK,
-+      .ack_invert = 1,
-+      .clear_ack = 1,
-+      .init_ack_masked = 1,
-+      .num_regs = ARRAY_SIZE(tps65224_irq_reg),
-+      .irqs = tps652g1_irqs,
-+      .num_irqs = ARRAY_SIZE(tps652g1_irqs),
-+      .get_irq_reg = tps65224_get_irq_reg,
-+      .handle_post_irq = tps6594_handle_post_irq,
-+};
-+
- static const struct regmap_range tps6594_volatile_ranges[] = {
-       regmap_reg_range(TPS6594_REG_INT_TOP, TPS6594_REG_STAT_READBACK_ERR),
-       regmap_reg_range(TPS6594_REG_RTC_STATUS, TPS6594_REG_RTC_STATUS),
-@@ -507,7 +579,7 @@ static int tps6594_check_crc_mode(struct tps6594 *tps, bool primary_pmic)
-       int ret;
-       unsigned int regmap_reg, mask_val;
--      if (tps->chip_id == TPS65224) {
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
-               regmap_reg = TPS6594_REG_CONFIG_2;
-               mask_val = TPS65224_BIT_I2C1_SPI_CRC_EN;
-       } else {
-@@ -537,7 +609,7 @@ static int tps6594_set_crc_feature(struct tps6594 *tps)
-       int ret;
-       unsigned int regmap_reg, mask_val;
--      if (tps->chip_id == TPS65224) {
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1) {
-               regmap_reg = TPS6594_REG_CONFIG_2;
-               mask_val = TPS65224_BIT_I2C1_SPI_CRC_EN;
-       } else {
-@@ -628,6 +700,10 @@ int tps6594_device_init(struct tps6594 *tps, bool enable_crc)
-               irq_chip = &tps65224_irq_chip;
-               n_cells = ARRAY_SIZE(tps65224_common_cells);
-               cells = tps65224_common_cells;
-+      } else if (tps->chip_id == TPS652G1) {
-+              irq_chip = &tps652g1_irq_chip;
-+              n_cells = ARRAY_SIZE(tps652g1_common_cells);
-+              cells = tps652g1_common_cells;
-       } else {
-               irq_chip = &tps6594_irq_chip;
-               n_cells = ARRAY_SIZE(tps6594_common_cells);
-@@ -651,8 +727,8 @@ int tps6594_device_init(struct tps6594 *tps, bool enable_crc)
-       if (ret)
-               return dev_err_probe(dev, ret, "Failed to add common child devices\n");
--      /* No RTC for LP8764 and TPS65224 */
--      if (tps->chip_id != LP8764 && tps->chip_id != TPS65224) {
-+      /* No RTC for LP8764, TPS65224 and TPS652G1 */
-+      if (tps->chip_id != LP8764 && tps->chip_id != TPS65224 && tps->chip_id != TPS652G1) {
-               ret = devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, tps6594_rtc_cells,
-                                          ARRAY_SIZE(tps6594_rtc_cells), NULL, 0,
-                                          regmap_irq_get_domain(tps->irq_data));
-diff --git a/drivers/mfd/tps6594-i2c.c b/drivers/mfd/tps6594-i2c.c
-index 4ab91c34d9fb..7ff7516286fd 100644
---- a/drivers/mfd/tps6594-i2c.c
-+++ b/drivers/mfd/tps6594-i2c.c
-@@ -1,6 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * I2C access driver for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
-+ * I2C access driver for the following TI PMICs:
-+ *  - LP8764
-+ *  - TPS65224
-+ *  - TPS652G1
-+ *  - TPS6593
-+ *  - TPS6594
-  *
-  * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
-  */
-@@ -197,6 +202,7 @@ static const struct of_device_id tps6594_i2c_of_match_table[] = {
-       { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, },
-       { .compatible = "ti,lp8764-q1",  .data = (void *)LP8764,  },
-       { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, },
-+      { .compatible = "ti,tps652g1", .data = (void *)TPS652G1, },
-       {}
- };
- MODULE_DEVICE_TABLE(of, tps6594_i2c_of_match_table);
-@@ -222,7 +228,7 @@ static int tps6594_i2c_probe(struct i2c_client *client)
-               return dev_err_probe(dev, -EINVAL, "Failed to find matching chip ID\n");
-       tps->chip_id = (unsigned long)match->data;
--      if (tps->chip_id == TPS65224)
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1)
-               tps6594_i2c_regmap_config.volatile_table = &tps65224_volatile_table;
-       tps->regmap = devm_regmap_init(dev, NULL, client, &tps6594_i2c_regmap_config);
-diff --git a/drivers/mfd/tps6594-spi.c b/drivers/mfd/tps6594-spi.c
-index 6ebccb79f0cc..944b7313a1d9 100644
---- a/drivers/mfd/tps6594-spi.c
-+++ b/drivers/mfd/tps6594-spi.c
-@@ -1,6 +1,11 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * SPI access driver for TI TPS65224/TPS6594/TPS6593/LP8764 PMICs
-+ * SPI access driver for the following TI PMICs:
-+ *  - LP8764
-+ *  - TPS65224
-+ *  - TPS652G1
-+ *  - TPS6593
-+ *  - TPS6594
-  *
-  * Copyright (C) 2023 BayLibre Incorporated - https://www.baylibre.com/
-  */
-@@ -82,6 +87,7 @@ static const struct of_device_id tps6594_spi_of_match_table[] = {
-       { .compatible = "ti,tps6593-q1", .data = (void *)TPS6593, },
-       { .compatible = "ti,lp8764-q1",  .data = (void *)LP8764,  },
-       { .compatible = "ti,tps65224-q1", .data = (void *)TPS65224, },
-+      { .compatible = "ti,tps652g1", .data = (void *)TPS652G1, },
-       {}
- };
- MODULE_DEVICE_TABLE(of, tps6594_spi_of_match_table);
-@@ -107,7 +113,7 @@ static int tps6594_spi_probe(struct spi_device *spi)
-               return dev_err_probe(dev, -EINVAL, "Failed to find matching chip ID\n");
-       tps->chip_id = (unsigned long)match->data;
--      if (tps->chip_id == TPS65224)
-+      if (tps->chip_id == TPS65224 || tps->chip_id == TPS652G1)
-               tps6594_spi_regmap_config.volatile_table = &tps65224_volatile_table;
-       tps->regmap = devm_regmap_init(dev, NULL, spi, &tps6594_spi_regmap_config);
-diff --git a/include/linux/mfd/tps6594.h b/include/linux/mfd/tps6594.h
-index 16543fd4d83e..021db8875963 100644
---- a/include/linux/mfd/tps6594.h
-+++ b/include/linux/mfd/tps6594.h
-@@ -19,6 +19,7 @@ enum pmic_id {
-       TPS6593,
-       LP8764,
-       TPS65224,
-+      TPS652G1,
- };
- /* Macro to get page index from register address */
--- 
-2.39.5
-
index 3d7297bed417cad41d9efaa6443efe13ee61d287..5e3e991ac42bc729502f4f3d58e53af51203ea18 100644 (file)
@@ -153,7 +153,6 @@ thermal-drivers-qcom-spmi-temp-alarm-enable-stage-2-.patch
 tools-nolibc-define-time_t-in-terms-of-__kernel_old_.patch
 iio-adc-ad_sigma_delta-don-t-overallocate-scan-buffe.patch
 gpio-tps65912-check-the-return-value-of-regmap_updat.patch
-mfd-tps6594-add-ti-tps652g1-support.patch
 arm-tegra-use-i-o-memcpy-to-write-to-iram.patch
 tools-build-fix-s390-x-cross-compilation-with-clang.patch
 selftests-tracing-use-mutex_unlock-for-testing-glob-.patch