Skip to contentSkip to conversation

mfd: max5970: Rename driver and remove wildcard

PATCH In review Naresh Solanki 3 participants 11 messages Apr 27, 2023 – Jun 8, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mfd: max5970: Rename driver and remove wildcard

The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports.

---
 drivers/mfd/Kconfig                        |  4 ++--
 drivers/mfd/simple-mfd-i2c.c               | 18 +++++++++---------
 include/linux/mfd/{max597x.h => max5970.h} | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)
 rename include/linux/mfd/{max597x.h => max5970.h} (92%)
drivers/mfd/Kconfig +2 -2
index e90463c4441c..71231388e03c 100644
@@ -266,8 +266,8 @@ config MFD_MADERA_SPI
 	  Support for the Cirrus Logic Madera platform audio SoC
 	  core functionality controlled via SPI.
 
-config MFD_MAX597X
-	tristate "Maxim 597x power switch and monitor"
+config MFD_MAX5970
+	tristate "Maxim 5970/5978 power switch and monitor"
 	depends on (I2C && OF)
 	select MFD_SIMPLE_MFD_I2C
 	help
drivers/mfd/simple-mfd-i2c.c +9 -9
index 20782b4dd172..1f1c007560d8 100644
@@ -72,22 +72,22 @@ static const struct simple_mfd_data silergy_sy7636a = {
 	.mfd_cell_size = ARRAY_SIZE(sy7636a_cells),
 };
 
-static const struct mfd_cell max597x_cells[] = {
-	{ .name = "max597x-regulator", },
-	{ .name = "max597x-iio", },
-	{ .name = "max597x-led", },
+static const struct mfd_cell max5970_cells[] = {
+	{ .name = "max5970-regulator", },
+	{ .name = "max5970-iio", },
+	{ .name = "max5970-led", },
 };
 
-static const struct simple_mfd_data maxim_max597x = {
-	.mfd_cell = max597x_cells,
-	.mfd_cell_size = ARRAY_SIZE(max597x_cells),
+static const struct simple_mfd_data maxim_max5970 = {
+	.mfd_cell = max5970_cells,
+	.mfd_cell_size = ARRAY_SIZE(max5970_cells),
 };
 
 static const struct of_device_id simple_mfd_i2c_of_match[] = {
 	{ .compatible = "kontron,sl28cpld" },
 	{ .compatible = "silergy,sy7636a", .data = &silergy_sy7636a},
-	{ .compatible = "maxim,max5970", .data = &maxim_max597x},
-	{ .compatible = "maxim,max5978", .data = &maxim_max597x},
+	{ .compatible = "maxim,max5970", .data = &maxim_max5970},
+	{ .compatible = "maxim,max5978", .data = &maxim_max5970},
 	{}
 };
 MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match);
include/linux/mfd/max5970.h renamed from include/linux/mfd/max597x.h +8 -8
similarity index 92%
rename from include/linux/mfd/max597x.h
rename to include/linux/mfd/max5970.h
index a850b2e02e6a..762a7d40c843 100644
@@ -7,25 +7,25 @@
  * Author: Patrick Rudolph <[email protected]>
  */
 
-#ifndef _MFD_MAX597X_H
-#define _MFD_MAX597X_H
+#ifndef _MFD_MAX5970_H
+#define _MFD_MAX5970_H
 
 #include <linux/regmap.h>
 
 #define MAX5970_NUM_SWITCHES 2
 #define MAX5978_NUM_SWITCHES 1
-#define MAX597X_NUM_LEDS     4
+#define MAX5970_NUM_LEDS     4
 
-struct max597x_data {
+struct max5970_data {
 	int num_switches;
 	u32 irng[MAX5970_NUM_SWITCHES];
 	u32 mon_rng[MAX5970_NUM_SWITCHES];
 	u32 shunt_micro_ohms[MAX5970_NUM_SWITCHES];
 };
 
-enum max597x_chip_type {
-	MAX597x_TYPE_MAX5978 = 1,
-	MAX597x_TYPE_MAX5970,
+enum max5970_chip_type {
+	TYPE_MAX5978 = 1,
+	TYPE_MAX5970,
 };
 
 #define MAX5970_REG_CURRENT_L(ch)		(0x01 + (ch) * 4)
@@ -93,4 +93,4 @@ enum max597x_chip_type {
 #define MAX_REGISTERS			0x49
 #define ADC_MASK			0x3FF
 
-#endif				/* _MFD_MAX597X_H */
+#endif				/* _MFD_MAX5970_H */

base-commit: b4c288cfd2f84c44994330c408e14645d45dee5b

Signature · 1 line
2.39.1
#1 lore raw

PATCH 2/2 regulator: max5970: Rename driver and remove wildcard

The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports.

---
 drivers/regulator/Kconfig                     |   6 +-
 drivers/regulator/Makefile                    |   2 +-
 ...ax597x-regulator.c => max5970-regulator.c} | 126 +++++++++---------
 3 files changed, 67 insertions(+), 67 deletions(-)
 rename drivers/regulator/{max597x-regulator.c => max5970-regulator.c} (76%)
drivers/regulator/Kconfig +3 -3
index aae28d0a489c..36465aeb4e21 100644
@@ -546,11 +546,11 @@ config REGULATOR_MAX1586
 	  regulator via I2C bus. The provided regulator is suitable
 	  for PXA27x chips to control VCC_CORE and VCC_USIM voltages.
 
-config REGULATOR_MAX597X
-	tristate "Maxim 597x power switch and monitor"
+config REGULATOR_MAX5970
+	tristate "Maxim 5970/5978 power switch and monitor"
 	depends on I2C
 	depends on OF
-	depends on MFD_MAX597X
+	depends on MFD_MAX5970
 	help
 	  This driver controls a Maxim 5970/5978 switch via I2C bus.
 	  The MAX5970/5978 is a smart switch with no output regulation, but
drivers/regulator/Makefile +1 -1
index ee383d8fc835..aed1b7c2eb78 100644
@@ -67,7 +67,7 @@ obj-$(CONFIG_REGULATOR_LTC3589) += ltc3589.o
 obj-$(CONFIG_REGULATOR_LTC3676) += ltc3676.o
 obj-$(CONFIG_REGULATOR_MAX14577) += max14577-regulator.o
 obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o
-obj-$(CONFIG_REGULATOR_MAX597X) += max597x-regulator.o
+obj-$(CONFIG_REGULATOR_MAX5970) += max5970-regulator.o
 obj-$(CONFIG_REGULATOR_MAX77620) += max77620-regulator.o
 obj-$(CONFIG_REGULATOR_MAX77650) += max77650-regulator.o
 obj-$(CONFIG_REGULATOR_MAX8649)	+= max8649.o
drivers/regulator/max5970-regulator.c renamed from drivers/regulator/max597x-regulator.c +63 -63

318 lines not on this page · raw message

Signature · 1 line
2.39.1
maintainer Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] regulator: max5970: Rename driver and remove wildcard

Quoted 3 lines · Naresh Solanki

The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports.

maintainer
#3 lore raw

Re: [PATCH 2/2] regulator: max5970: Rename driver and remove wildcard

In reply to Naresh Solanki
Quoted 11 lines · Naresh Solanki

The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports.

---
 drivers/regulator/Kconfig                     |   6 +-
 drivers/regulator/Makefile                    |   2 +-
 ...ax597x-regulator.c => max5970-regulator.c} | 126 +++++++++---------
 3 files changed, 67 insertions(+), 67 deletions(-)
 rename drivers/regulator/{max597x-regulator.c => max5970-regulator.c} (76%)

This does not apply cleanly. Rather than mess you around, I'll apply the MFD driver and provide a PR for Mark. Perhaps this will apply to the regulator tree.

Testing now - please stand-by.

Signature · 1 line
Lee Jones [李琼斯]
#4 lore raw
In reply to Naresh Solanki

Hi Lee,

I hope this email finds you well. I am writing to inquire about the status of my patch.

The purpose of this patch set was to rename the driver to remove the wildcard and make it specific to avoid confusion with different similar devices. I want to emphasize that this patch set does not include any functional changes.

I would appreciate it if you could kindly provide an update on the status. Please let me know if there is anything else you need from my end to help move things forward.

Thank you for your time and attention.

Best regards,
Naresh Solanki

Quoted 111 lines · Naresh Solanki

The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports.

---
  drivers/mfd/Kconfig                        |  4 ++--
  drivers/mfd/simple-mfd-i2c.c               | 18 +++++++++---------
  include/linux/mfd/{max597x.h => max5970.h} | 16 ++++++++--------
  3 files changed, 19 insertions(+), 19 deletions(-)

rename include/linux/mfd/{max597x.h => max5970.h} (92%)

drivers/mfd/Kconfig +2 -2
index e90463c4441c..71231388e03c 100644
@@ -266,8 +266,8 @@ config MFD_MADERA_SPI
  	  Support for the Cirrus Logic Madera platform audio SoC
  	  core functionality controlled via SPI.
 
-config MFD_MAX597X
-	tristate "Maxim 597x power switch and monitor"
+config MFD_MAX5970
+	tristate "Maxim 5970/5978 power switch and monitor"
  	depends on (I2C && OF)
  	select MFD_SIMPLE_MFD_I2C
  	help
drivers/mfd/simple-mfd-i2c.c +9 -9
index 20782b4dd172..1f1c007560d8 100644
@@ -72,22 +72,22 @@ static const struct simple_mfd_data silergy_sy7636a = {
  	.mfd_cell_size = ARRAY_SIZE(sy7636a_cells),
  };
 
-static const struct mfd_cell max597x_cells[] = {
-	{ .name = "max597x-regulator", },
-	{ .name = "max597x-iio", },
-	{ .name = "max597x-led", },
+static const struct mfd_cell max5970_cells[] = {
+	{ .name = "max5970-regulator", },
+	{ .name = "max5970-iio", },
+	{ .name = "max5970-led", },
  };
 
-static const struct simple_mfd_data maxim_max597x = {
-	.mfd_cell = max597x_cells,
-	.mfd_cell_size = ARRAY_SIZE(max597x_cells),
+static const struct simple_mfd_data maxim_max5970 = {
+	.mfd_cell = max5970_cells,
+	.mfd_cell_size = ARRAY_SIZE(max5970_cells),
  };
 
  static const struct of_device_id simple_mfd_i2c_of_match[] = {
  	{ .compatible = "kontron,sl28cpld" },
  	{ .compatible = "silergy,sy7636a", .data = &silergy_sy7636a},
-	{ .compatible = "maxim,max5970", .data = &maxim_max597x},
-	{ .compatible = "maxim,max5978", .data = &maxim_max597x},
+	{ .compatible = "maxim,max5970", .data = &maxim_max5970},
+	{ .compatible = "maxim,max5978", .data = &maxim_max5970},
  	{}
  };
  MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match);
include/linux/mfd/max5970.h renamed from include/linux/mfd/max597x.h +8 -8
similarity index 92%
rename from include/linux/mfd/max597x.h
rename to include/linux/mfd/max5970.h
index a850b2e02e6a..762a7d40c843 100644
@@ -7,25 +7,25 @@
   * Author: Patrick Rudolph <[email protected]>
   */
 
-#ifndef _MFD_MAX597X_H
-#define _MFD_MAX597X_H
+#ifndef _MFD_MAX5970_H
+#define _MFD_MAX5970_H
 
  #include <linux/regmap.h>
 
  #define MAX5970_NUM_SWITCHES 2
  #define MAX5978_NUM_SWITCHES 1
-#define MAX597X_NUM_LEDS     4
+#define MAX5970_NUM_LEDS     4
 
-struct max597x_data {
+struct max5970_data {
  	int num_switches;
  	u32 irng[MAX5970_NUM_SWITCHES];
  	u32 mon_rng[MAX5970_NUM_SWITCHES];
  	u32 shunt_micro_ohms[MAX5970_NUM_SWITCHES];
  };
 
-enum max597x_chip_type {
-	MAX597x_TYPE_MAX5978 = 1,
-	MAX597x_TYPE_MAX5970,
+enum max5970_chip_type {
+	TYPE_MAX5978 = 1,
+	TYPE_MAX5970,
  };
 
  #define MAX5970_REG_CURRENT_L(ch)		(0x01 + (ch) * 4)
@@ -93,4 +93,4 @@ enum max597x_chip_type {
  #define MAX_REGISTERS			0x49
  #define ADC_MASK			0x3FF
 
-#endif				/* _MFD_MAX597X_H */
+#endif				/* _MFD_MAX5970_H */

base-commit: b4c288cfd2f84c44994330c408e14645d45dee5b

maintainer
#5 lore raw
Quoted 10 lines · Naresh Solanki

Hi Lee,

I hope this email finds you well. I am writing to inquire about the status of my patch.

The purpose of this patch set was to rename the driver to remove the wildcard and make it specific to avoid confusion with different similar devices. I want to emphasize that this patch set does not include any functional changes.

Quoted 5 lines

I would appreciate it if you could kindly provide an update on the status. Please let me know if there is anything else you need from my end to help move things forward.

Thank you for your time and attention.

Please refrain from top-posting.

If you think your patch has fallen through the gaps (it hasn't) please submit a [RESEND].

The merge-window has been open for the last 2 weeks. I'm just ramping up again on my backlog.

I'll get to you soon.

Quoted 101 lines · Naresh Solanki
Quoted 100 lines

The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports.

---
  drivers/mfd/Kconfig                        |  4 ++--
  drivers/mfd/simple-mfd-i2c.c               | 18 +++++++++---------
  include/linux/mfd/{max597x.h => max5970.h} | 16 ++++++++--------
  3 files changed, 19 insertions(+), 19 deletions(-)

rename include/linux/mfd/{max597x.h => max5970.h} (92%)

drivers/mfd/Kconfig +2 -2
index e90463c4441c..71231388e03c 100644
@@ -266,8 +266,8 @@ config MFD_MADERA_SPI
  	  Support for the Cirrus Logic Madera platform audio SoC
  	  core functionality controlled via SPI.
-config MFD_MAX597X
-	tristate "Maxim 597x power switch and monitor"
+config MFD_MAX5970
+	tristate "Maxim 5970/5978 power switch and monitor"
  	depends on (I2C && OF)
  	select MFD_SIMPLE_MFD_I2C
  	help
drivers/mfd/simple-mfd-i2c.c +9 -9
index 20782b4dd172..1f1c007560d8 100644
@@ -72,22 +72,22 @@ static const struct simple_mfd_data silergy_sy7636a = {
  	.mfd_cell_size = ARRAY_SIZE(sy7636a_cells),
  };
-static const struct mfd_cell max597x_cells[] = {
-	{ .name = "max597x-regulator", },
-	{ .name = "max597x-iio", },
-	{ .name = "max597x-led", },
+static const struct mfd_cell max5970_cells[] = {
+	{ .name = "max5970-regulator", },
+	{ .name = "max5970-iio", },
+	{ .name = "max5970-led", },
  };
-static const struct simple_mfd_data maxim_max597x = {
-	.mfd_cell = max597x_cells,
-	.mfd_cell_size = ARRAY_SIZE(max597x_cells),
+static const struct simple_mfd_data maxim_max5970 = {
+	.mfd_cell = max5970_cells,
+	.mfd_cell_size = ARRAY_SIZE(max5970_cells),
  };
  static const struct of_device_id simple_mfd_i2c_of_match[] = {
  	{ .compatible = "kontron,sl28cpld" },
  	{ .compatible = "silergy,sy7636a", .data = &silergy_sy7636a},
-	{ .compatible = "maxim,max5970", .data = &maxim_max597x},
-	{ .compatible = "maxim,max5978", .data = &maxim_max597x},
+	{ .compatible = "maxim,max5970", .data = &maxim_max5970},
+	{ .compatible = "maxim,max5978", .data = &maxim_max5970},
  	{}
  };
  MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match);
include/linux/mfd/max5970.h renamed from include/linux/mfd/max597x.h +8 -8
similarity index 92%
rename from include/linux/mfd/max597x.h
rename to include/linux/mfd/max5970.h
index a850b2e02e6a..762a7d40c843 100644
@@ -7,25 +7,25 @@
   * Author: Patrick Rudolph <[email protected]>
   */
-#ifndef _MFD_MAX597X_H
-#define _MFD_MAX597X_H
+#ifndef _MFD_MAX5970_H
+#define _MFD_MAX5970_H
  #include <linux/regmap.h>
  #define MAX5970_NUM_SWITCHES 2
  #define MAX5978_NUM_SWITCHES 1
-#define MAX597X_NUM_LEDS     4
+#define MAX5970_NUM_LEDS     4
-struct max597x_data {
+struct max5970_data {
  	int num_switches;
  	u32 irng[MAX5970_NUM_SWITCHES];
  	u32 mon_rng[MAX5970_NUM_SWITCHES];
  	u32 shunt_micro_ohms[MAX5970_NUM_SWITCHES];
  };
-enum max597x_chip_type {
-	MAX597x_TYPE_MAX5978 = 1,
-	MAX597x_TYPE_MAX5970,
+enum max5970_chip_type {
+	TYPE_MAX5978 = 1,
+	TYPE_MAX5970,
  };
  #define MAX5970_REG_CURRENT_L(ch)		(0x01 + (ch) * 4)
@@ -93,4 +93,4 @@ enum max597x_chip_type {
  #define MAX_REGISTERS			0x49
  #define ADC_MASK			0x3FF
-#endif				/* _MFD_MAX597X_H */
+#endif				/* _MFD_MAX5970_H */
 

base-commit: b4c288cfd2f84c44994330c408e14645d45dee5b

Signature · 1 line
Lee Jones [李琼斯]
maintainer
#6 lore raw
In reply to Naresh Solanki
Quoted 3 lines · Naresh Solanki

The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports.

So multiple devices are supported:

  MAX5970  ... AND
  MAX5978  ... thus
  MAX597X  ... does make sense, no?

What are you trying to achieve?

Quoted 110 lines
---
 drivers/mfd/Kconfig                        |  4 ++--
 drivers/mfd/simple-mfd-i2c.c               | 18 +++++++++---------
 include/linux/mfd/{max597x.h => max5970.h} | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)
 rename include/linux/mfd/{max597x.h => max5970.h} (92%)
drivers/mfd/Kconfig +2 -2
index e90463c4441c..71231388e03c 100644
@@ -266,8 +266,8 @@ config MFD_MADERA_SPI
 	  Support for the Cirrus Logic Madera platform audio SoC
 	  core functionality controlled via SPI.
 
-config MFD_MAX597X
-	tristate "Maxim 597x power switch and monitor"
+config MFD_MAX5970
+	tristate "Maxim 5970/5978 power switch and monitor"
 	depends on (I2C && OF)
 	select MFD_SIMPLE_MFD_I2C
 	help
drivers/mfd/simple-mfd-i2c.c +9 -9
index 20782b4dd172..1f1c007560d8 100644
@@ -72,22 +72,22 @@ static const struct simple_mfd_data silergy_sy7636a = {
 	.mfd_cell_size = ARRAY_SIZE(sy7636a_cells),
 };
 
-static const struct mfd_cell max597x_cells[] = {
-	{ .name = "max597x-regulator", },
-	{ .name = "max597x-iio", },
-	{ .name = "max597x-led", },
+static const struct mfd_cell max5970_cells[] = {
+	{ .name = "max5970-regulator", },
+	{ .name = "max5970-iio", },
+	{ .name = "max5970-led", },
 };
 
-static const struct simple_mfd_data maxim_max597x = {
-	.mfd_cell = max597x_cells,
-	.mfd_cell_size = ARRAY_SIZE(max597x_cells),
+static const struct simple_mfd_data maxim_max5970 = {
+	.mfd_cell = max5970_cells,
+	.mfd_cell_size = ARRAY_SIZE(max5970_cells),
 };
 
 static const struct of_device_id simple_mfd_i2c_of_match[] = {
 	{ .compatible = "kontron,sl28cpld" },
 	{ .compatible = "silergy,sy7636a", .data = &silergy_sy7636a},
-	{ .compatible = "maxim,max5970", .data = &maxim_max597x},
-	{ .compatible = "maxim,max5978", .data = &maxim_max597x},
+	{ .compatible = "maxim,max5970", .data = &maxim_max5970},
+	{ .compatible = "maxim,max5978", .data = &maxim_max5970},
 	{}
 };
 MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match);
include/linux/mfd/max5970.h renamed from include/linux/mfd/max597x.h +8 -8
similarity index 92%
rename from include/linux/mfd/max597x.h
rename to include/linux/mfd/max5970.h
index a850b2e02e6a..762a7d40c843 100644
@@ -7,25 +7,25 @@
  * Author: Patrick Rudolph <[email protected]>
  */
 
-#ifndef _MFD_MAX597X_H
-#define _MFD_MAX597X_H
+#ifndef _MFD_MAX5970_H
+#define _MFD_MAX5970_H
 
 #include <linux/regmap.h>
 
 #define MAX5970_NUM_SWITCHES 2
 #define MAX5978_NUM_SWITCHES 1
-#define MAX597X_NUM_LEDS     4
+#define MAX5970_NUM_LEDS     4
 
-struct max597x_data {
+struct max5970_data {
 	int num_switches;
 	u32 irng[MAX5970_NUM_SWITCHES];
 	u32 mon_rng[MAX5970_NUM_SWITCHES];
 	u32 shunt_micro_ohms[MAX5970_NUM_SWITCHES];
 };
 
-enum max597x_chip_type {
-	MAX597x_TYPE_MAX5978 = 1,
-	MAX597x_TYPE_MAX5970,
+enum max5970_chip_type {
+	TYPE_MAX5978 = 1,
+	TYPE_MAX5970,
 };
 
 #define MAX5970_REG_CURRENT_L(ch)		(0x01 + (ch) * 4)
@@ -93,4 +93,4 @@ enum max597x_chip_type {
 #define MAX_REGISTERS			0x49
 #define ADC_MASK			0x3FF
 
-#endif				/* _MFD_MAX597X_H */
+#endif				/* _MFD_MAX5970_H */

base-commit: b4c288cfd2f84c44994330c408e14645d45dee5b

Signature · 1 line
2.39.1
Signature · 1 line
Lee Jones [李琼斯]
#7 lore raw

Hi Lee,

Quoted 6 lines · Lee Jones
Quoted 3 lines · Naresh Solanki

The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports.

Quoted 7 lines

So multiple devices are supported:

   MAX5970  ... AND
   MAX5978  ... thus
   MAX597X  ... does make sense, no?

What are you trying to achieve?

Understood. It is important to note that there are indeed other unrelated chips in addition to MAX5970 and MAX5978. Examples include MAX5971, which is a Single-Port, 40W, IEEE 802.3af/at PSE Controller with Integrated MOSFET, and MAX5974A, an Active-Clamped, Spread-Spectrum, Current-Mode PWM Controller, among others.

With this change, the intention is to be specific about the chips the driver supports. Instead of using wildcards or a broad "MAX597X" designation, the patch aims to exclusively support the MAX5970 and MAX5978 chips.

Quoted 104 lines
Quoted 104 lines
---
  drivers/mfd/Kconfig                        |  4 ++--
  drivers/mfd/simple-mfd-i2c.c               | 18 +++++++++---------
  include/linux/mfd/{max597x.h => max5970.h} | 16 ++++++++--------
  3 files changed, 19 insertions(+), 19 deletions(-)

rename include/linux/mfd/{max597x.h => max5970.h} (92%)

drivers/mfd/Kconfig +2 -2
index e90463c4441c..71231388e03c 100644
@@ -266,8 +266,8 @@ config MFD_MADERA_SPI
  	  Support for the Cirrus Logic Madera platform audio SoC
  	  core functionality controlled via SPI.
 
-config MFD_MAX597X
-	tristate "Maxim 597x power switch and monitor"
+config MFD_MAX5970
+	tristate "Maxim 5970/5978 power switch and monitor"
  	depends on (I2C && OF)
  	select MFD_SIMPLE_MFD_I2C
  	help
drivers/mfd/simple-mfd-i2c.c +9 -9
index 20782b4dd172..1f1c007560d8 100644
@@ -72,22 +72,22 @@ static const struct simple_mfd_data silergy_sy7636a = {
  	.mfd_cell_size = ARRAY_SIZE(sy7636a_cells),
  };
 
-static const struct mfd_cell max597x_cells[] = {
-	{ .name = "max597x-regulator", },
-	{ .name = "max597x-iio", },
-	{ .name = "max597x-led", },
+static const struct mfd_cell max5970_cells[] = {
+	{ .name = "max5970-regulator", },
+	{ .name = "max5970-iio", },
+	{ .name = "max5970-led", },
  };
 
-static const struct simple_mfd_data maxim_max597x = {
-	.mfd_cell = max597x_cells,
-	.mfd_cell_size = ARRAY_SIZE(max597x_cells),
+static const struct simple_mfd_data maxim_max5970 = {
+	.mfd_cell = max5970_cells,
+	.mfd_cell_size = ARRAY_SIZE(max5970_cells),
  };
 
  static const struct of_device_id simple_mfd_i2c_of_match[] = {
  	{ .compatible = "kontron,sl28cpld" },
  	{ .compatible = "silergy,sy7636a", .data = &silergy_sy7636a},
-	{ .compatible = "maxim,max5970", .data = &maxim_max597x},
-	{ .compatible = "maxim,max5978", .data = &maxim_max597x},
+	{ .compatible = "maxim,max5970", .data = &maxim_max5970},
+	{ .compatible = "maxim,max5978", .data = &maxim_max5970},
  	{}
  };
  MODULE_DEVICE_TABLE(of, simple_mfd_i2c_of_match);
include/linux/mfd/max5970.h renamed from include/linux/mfd/max597x.h +7 -7
similarity index 92%
rename from include/linux/mfd/max597x.h
rename to include/linux/mfd/max5970.h
index a850b2e02e6a..762a7d40c843 100644
@@ -7,25 +7,25 @@
   * Author: Patrick Rudolph <[email protected]>
   */
 
-#ifndef _MFD_MAX597X_H
-#define _MFD_MAX597X_H
+#ifndef _MFD_MAX5970_H
+#define _MFD_MAX5970_H
 
  #include <linux/regmap.h>
 
  #define MAX5970_NUM_SWITCHES 2
  #define MAX5978_NUM_SWITCHES 1
-#define MAX597X_NUM_LEDS     4
+#define MAX5970_NUM_LEDS     4
 
-struct max597x_data {
+struct max5970_data {
  	int num_switches;
  	u32 irng[MAX5970_NUM_SWITCHES];
  	u32 mon_rng[MAX5970_NUM_SWITCHES];
  	u32 shunt_micro_ohms[MAX5970_NUM_SWITCHES];
  };
 
-enum max597x_chip_type {
-	MAX597x_TYPE_MAX5978 = 1,
-	MAX597x_TYPE_MAX5970,
+enum max5970_chip_type {
+	TYPE_MAX5978 = 1,
+	TYPE_MAX5970,
  };
 
  #define MAX5970_REG_CURRENT_L(ch)		(0x01 + (ch) * 4)
@@ -93,4 +93,4 @@ enum max597x_chip_type {
  #define MAX_REGISTERS			0x49
  #define ADC_MASK			0x3FF
 
Quoted 8 lines
Quoted 7 lines
include/linux/mfd/max5970.h renamed from include/linux/mfd/max597x.h +1 -1
-#endif				/* _MFD_MAX597X_H */
+#endif				/* _MFD_MAX5970_H */

base-commit: b4c288cfd2f84c44994330c408e14645d45dee5b

Signature · 1 line
2.39.1

Regards,
Naresh

maintainer
#8 lore raw
Quoted 21 lines · Naresh Solanki

Hi Lee,

Quoted 6 lines · Lee Jones
Quoted 3 lines · Naresh Solanki

The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports.

Quoted 6 lines

So multiple devices are supported:

   MAX5970  ... AND
   MAX5978  ... thus
   MAX597X  ... does make sense, no?

What are you trying to achieve?

Understood. It is important to note that there are indeed other unrelated chips in addition to MAX5970 and MAX5978. Examples include MAX5971, which is a Single-Port, 40W, IEEE 802.3af/at PSE Controller with Integrated MOSFET, and MAX5974A, an Active-Clamped, Spread-Spectrum, Current-Mode PWM Controller, among others.

Quoted 3 lines

With this change, the intention is to be specific about the chips the driver supports. Instead of using wildcards or a broad "MAX597X" designation, the patch aims to exclusively support the MAX5970 and MAX5978 chips.

It's a tricky situation when engineers/marketing people name devices in a nonsensical manner. However, "max5970" just as misleading in this context as "max597x", thus the patch doesn't improve anything. It's more of a maneuver side-ways.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
---
  drivers/mfd/Kconfig                        |  4 ++--
  drivers/mfd/simple-mfd-i2c.c               | 18 +++++++++---------
  include/linux/mfd/{max597x.h => max5970.h} | 16 ++++++++--------
  3 files changed, 19 insertions(+), 19 deletions(-)

rename include/linux/mfd/{max597x.h => max5970.h} (92%)

Signature · 1 line
Lee Jones [李琼斯]
#9 lore raw

Hi Lee,

Quoted 23 lines · Lee Jones
Quoted 21 lines · Naresh Solanki

Hi Lee,

Quoted 6 lines · Lee Jones
Quoted 3 lines · Naresh Solanki

The previous version of this driver included wildcards in file names and descriptions. This patch renames the driver to only support MAX5970 and MAX5978, which are the only chips that the driver actually supports.

Quoted 6 lines

So multiple devices are supported:

    MAX5970  ... AND
    MAX5978  ... thus
    MAX597X  ... does make sense, no?

What are you trying to achieve?

Understood. It is important to note that there are indeed other unrelated chips in addition to MAX5970 and MAX5978. Examples include MAX5971, which is a Single-Port, 40W, IEEE 802.3af/at PSE Controller with Integrated MOSFET, and MAX5974A, an Active-Clamped, Spread-Spectrum, Current-Mode PWM Controller, among others.

Quoted 8 lines
Quoted 3 lines

With this change, the intention is to be specific about the chips the driver supports. Instead of using wildcards or a broad "MAX597X" designation, the patch aims to exclusively support the MAX5970 and MAX5978 chips.

It's a tricky situation when engineers/marketing people name devices in a nonsensical manner. However, "max5970" just as misleading in this context as "max597x", thus the patch doesn't improve anything. It's more of a maneuver side-ways.

After considering the feedback received regarding the context of the leaf driver for max5970, it has been recommended to specifically use "max5970" instead of a general designation like "max597x." However, for support related to max5978, the documentation can be referred to.

Therefore, this change is necessary in order to unblock the leaf driver and address the feedback received.

Regards,
Naresh

Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
---
   drivers/mfd/Kconfig                        |  4 ++--
   drivers/mfd/simple-mfd-i2c.c               | 18 +++++++++---------
   include/linux/mfd/{max597x.h => max5970.h} | 16 ++++++++--------
   3 files changed, 19 insertions(+), 19 deletions(-)

rename include/linux/mfd/{max597x.h => max5970.h} (92%)

maintainer
#10 lore raw

[GIT PULL] Immutable branch between MFD and Regulator due for the v6.5 merge window

In reply to Naresh Solanki

Mark,

The following changes since commit ac9a78681b921877518763ba0e89202254349d1b:

Linux 6.4-rc1 (2023-05-07 13:34:35 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-regulator-max5970-v6.5

for you to fetch changes up to 49f661ba99324a3f7eef0befbdaa4f22dee02b97:

mfd: max5970: Rename driver and remove wildcard (2023-06-02 09:09:45 +0100)

----------------------------------------------------------------
Immutable branch between MFD and Regulator due for the v6.5 merge window

----------------------------------------------------------------
Naresh Solanki (1):
mfd: max5970: Rename driver and remove wildcard

 drivers/mfd/Kconfig                        |  4 ++--
 drivers/mfd/simple-mfd-i2c.c               | 18 +++++++++---------
 include/linux/mfd/{max597x.h => max5970.h} | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)
 rename include/linux/mfd/{max597x.h => max5970.h} (92%)
Signature · 1 line
Lee Jones [李琼斯]