mfd: sprd: populate sub-devices defined in DT
Subsystems (2)
Chunyan Zhang
reviewerPATCH v2 1/1 mfd: sprd: populate sub-devices defined in DT
From: Chunyan Zhang <[email protected]>
SC27XX-SPI added subdevices according to a pre-defined mfd_cell array, no matter these devices were really included on board. In this patch, switch to use devm_of_platform_populate() for adding sub-devices which are defined in devicetree.
---
Changes since v1:
* Address comments from Lee Jones:
- Switch to use devm_of_platform_populate() to add sub-devices.
--- drivers/mfd/sprd-sc27xx-spi.c | 75 ++--------------------------------- 1 file changed, 3 insertions(+), 72 deletions(-)
drivers/mfd/sprd-sc27xx-spi.c +3 -72
@@ -8,6 +8,7 @@#include <linux/module.h> #include <linux/mfd/core.h> #include <linux/of_device.h> +#include <linux/of_platform.h> #include <linux/regmap.h> #include <linux/spi/spi.h> #include <uapi/linux/usb/charger.h>
@@ -93,73 +94,6 @@ enum usb_charger_type sprd_pmic_detect_charger_type(struct device *dev) }EXPORT_SYMBOL_GPL (sprd_pmic_detect_charger_type); -static const struct mfd_cell sprd_pmic_devs[] = { - { - .name ="sc27xx-wdt" , - .of_compatible ="sprd,sc2731-wdt" , - }, { - .name ="sc27xx-rtc" , - .of_compatible ="sprd,sc2731-rtc" , - }, { - .name ="sc27xx-charger" , - .of_compatible ="sprd,sc2731-charger" , - }, { - .name ="sc27xx-chg-timer" , - .of_compatible ="sprd,sc2731-chg-timer" , - }, { - .name ="sc27xx-fast-chg" , - .of_compatible ="sprd,sc2731-fast-chg" , - }, { - .name ="sc27xx-chg-wdt" , - .of_compatible ="sprd,sc2731-chg-wdt" , - }, { - .name ="sc27xx-typec" , - .of_compatible ="sprd,sc2731-typec" , - }, { - .name ="sc27xx-flash" , - .of_compatible ="sprd,sc2731-flash" , - }, { - .name ="sc27xx-eic" , - .of_compatible ="sprd,sc2731-eic" , - }, { - .name ="sc27xx-efuse" , - .of_compatible ="sprd,sc2731-efuse" , - }, { - .name ="sc27xx-thermal" , - .of_compatible ="sprd,sc2731-thermal" , - }, { - .name ="sc27xx-adc" , - .of_compatible ="sprd,sc2731-adc" , - }, { - .name ="sc27xx-audio-codec" , - .of_compatible ="sprd,sc2731-audio-codec" , - }, { - .name ="sc27xx-regulator" , - .of_compatible ="sprd,sc2731-regulator" , - }, { - .name ="sc27xx-vibrator" , - .of_compatible ="sprd,sc2731-vibrator" , - }, { - .name ="sc27xx-keypad-led" , - .of_compatible ="sprd,sc2731-keypad-led" , - }, { - .name ="sc27xx-bltc" , - .of_compatible ="sprd,sc2731-bltc" , - }, { - .name ="sc27xx-fgu" , - .of_compatible ="sprd,sc2731-fgu" , - }, { - .name ="sc27xx-7sreset" , - .of_compatible ="sprd,sc2731-7sreset" , - }, { - .name ="sc27xx-poweroff" , - .of_compatible ="sprd,sc2731-poweroff" , - }, { - .name ="sc27xx-syscon" , - .of_compatible ="sprd,sc2731-syscon" , - }, -}; -static int sprd_pmic_spi_write (void *context,const void *data,size_t count) {struct device *dev = context;
@@ -263,12 +197,9 @@ static int sprd_pmic_probe(struct spi_device *spi)return ret; } - ret =devm_mfd_add_devices (&spi->dev,PLATFORM_DEVID_AUTO , - sprd_pmic_devs,ARRAY_SIZE (sprd_pmic_devs), -NULL ,0 , -regmap_irq_get_domain (ddata->irq_data)); + ret =devm_of_platform_populate (&spi->dev);if (ret) { -dev_err (&spi->dev,"Failed to register device %d\n" , ret); +dev_err (&spi->dev,"Failed to populate sub-devices %d\n" , ret);return ret; }
Signature · 1 line
2.20.1
Lee Jones
AppliedQuoted 7 lines · Chunyan Zhang
From: Chunyan Zhang <[email protected]>
SC27XX-SPI added subdevices according to a pre-defined
mfd_cellarray, no matter these devices were really included on board. In this patch, switch to usedevm_of_platform_populate()for adding sub-devices which are defined in devicetree.
Quoted 8 lines
Signed-off-by Chunyan Zhang <[email protected]>---
Changes since v1:
* Address comments from Lee Jones:
- Switch to usedevm_of_platform_populate()to add sub-devices.--- drivers/mfd/sprd-sc27xx-spi.c | 75 ++--------------------------------- 1 file changed, 3 insertions(+), 72 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog