mfd: max5970: Rename driver and remove wildcard
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
@@ -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
@@ -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
@@ -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
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
@@ -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
@@ -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
Mark Brown
maintainerRe: [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.
You've not copied me on the rest of the series so I don't know what's going on with dependencies. When sending a patch series it is important to ensure that all the various maintainers understand what the relationship between the patches as the expecation is that there will be interdependencies. Either copy everyone on the whole series or at least copy them on the cover letter and explain what's going on. If there are no strong interdependencies then it's generally simplest to just send the patches separately to avoid any possible confusion.
Re: [PATCH 2/2] regulator: max5970: Rename driver and remove wildcard
Hi Mark,
Quoted 5 lines · Mark Brown
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 8 lines
You've not copied me on the rest of the series so I don't know what's going on with dependencies. When sending a patch series it is important to ensure that all the various maintainers understand what the relationship between the patches as the expecation is that there will be interdependencies. Either copy everyone on the whole series or at least copy them on the cover letter and explain what's going on. If there are no strong interdependencies then it's generally simplest to just send the patches separately to avoid any possible confusion.
Thanks for letting me know.
Will resend with maintainers included in every patch.
Regards,
Naresh