mfd: add support for max77650 PMIC
Subsystems (9)
v2 cover mfd: add support for max77650 PMIC
From: Bartosz Golaszewski <[email protected]>
This series adds support for max77650 ultra low-power PMIC. It provides the core mfd driver and a set of five sub-drivers for the regulator, power supply, gpio, leds and input subsystems.
Patches 1-6 add the DT binding documents. Patches 7-12 add all drivers. Last patch adds a MAINTAINERS entry for this device.
Note that patch 8/13 depends on commit 03c87b95ac04 ("regulator: provide rdev_get_regmap()") which was picked up by Mark Brown for v5.1.
v1 -> v2:
General:
- use C++ style comments for the SPDX license identifier and the copyright header
- s/MODULE_LICENSE("GPL")/MODULE_LICENSE("GPL v2")/
- lookup the virtual interrupt numbers in the MFD driver, setup resources for child devices and use platform_get_irq_byname() in sub-drivers
- picked up review tags
- use devm_request_any_context_irq() for interrupt requests
LEDs:
- changed the max77650_leds_ prefix to max77650_led_
- drop the max77650_leds structure as the only field it held was the regmap pointer, move said pointer to struct max77650_led
- change the driver name to "max77650-led"
- drop the last return value check and return the result of regmap_write() directly
- change the labeling scheme to one consistent with other LED drivers
ONKEY:
- drop the key reporting helper and call the input functions directly from interrupt handlers
- rename the rv local variable to error
- drop parent device asignment
Regulator:
- drop the unnecessary init_data lookup from the driver code
- drop unnecessary include
Charger:
- disable the charger on driver remove
- change the power supply type to POWER_SUPPLY_TYPE_USB
GPIO:
- drop interrupt support until we have correct implementation of hierarchical irqs in gpiolib
Bartosz Golaszewski (13):
dt-bindings: mfd: add DT bindings for max77650
dt-bindings: regulator: add DT bindings for max77650
dt-bindings: power: supply: add DT bindings for max77650
dt-bindings: gpio: add DT bindings for max77650
dt-bindings: leds: add DT bindings for max77650
dt-bindings: input: add DT bindings for max77650
mfd: max77650: new core mfd driver
regulator: max77650: add regulator support
power: supply: max77650: add support for battery charger
gpio: max77650: add GPIO support
leds: max77650: add LEDs support
input: max77650: add onkey support
MAINTAINERS: add an entry for max77650 mfd driver
.../bindings/gpio/gpio-max77650.txt | 34 ++ .../bindings/input/max77650-onkey.txt | 26 + .../bindings/leds/leds-max77650.txt | 57 ++ .../devicetree/bindings/mfd/max77650.txt | 28 + .../power/supply/max77650-charger.txt | 27 + .../bindings/regulator/max77650-regulator.txt | 41 ++ MAINTAINERS | 14 + drivers/gpio/Kconfig | 7 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-max77650.c | 189 +++++++ drivers/input/misc/Kconfig | 9 + drivers/input/misc/Makefile | 1 + drivers/input/misc/max77650-onkey.c | 127 +++++ drivers/leds/Kconfig | 6 + drivers/leds/Makefile | 1 + drivers/leds/leds-max77650.c | 152 +++++ drivers/mfd/Kconfig | 11 + drivers/mfd/Makefile | 1 + drivers/mfd/max77650.c | 338 ++++++++++++ drivers/power/supply/Kconfig | 7 + drivers/power/supply/Makefile | 1 + drivers/power/supply/max77650-charger.c | 355 ++++++++++++ drivers/regulator/Kconfig | 8 + drivers/regulator/Makefile | 1 + drivers/regulator/max77650-regulator.c | 518 ++++++++++++++++++ include/linux/mfd/max77650.h | 59 ++ 26 files changed, 2019 insertions(+) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-max77650.txt create mode 100644 Documentation/devicetree/bindings/input/max77650-onkey.txt create mode 100644 Documentation/devicetree/bindings/leds/leds-max77650.txt create mode 100644 Documentation/devicetree/bindings/mfd/max77650.txt create mode 100644 Documentation/devicetree/bindings/power/supply/max77650-charger.txt create mode 100644 Documentation/devicetree/bindings/regulator/max77650-regulator.txt create mode 100644 drivers/gpio/gpio-max77650.c create mode 100644 drivers/input/misc/max77650-onkey.c create mode 100644 drivers/leds/leds-max77650.c create mode 100644 drivers/mfd/max77650.c create mode 100644 drivers/power/supply/max77650-charger.c create mode 100644 drivers/regulator/max77650-regulator.c create mode 100644 include/linux/mfd/max77650.h
Signature · 1 line
2.20.1
PATCH v2 1/13 dt-bindings: mfd: add DT bindings for max77650
From: Bartosz Golaszewski <[email protected]>
Add a DT binding document for max77650 ultra-low power PMIC. This describes the core mfd device.
--- .../devicetree/bindings/mfd/max77650.txt | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/max77650.txt
Documentation/devicetree/bindings/mfd/max77650.txt new file +28 -0
@@ -0,0 +1,28 @@ +MAX77650 ultra low-power PMIC from Maxim Integrated. + +Required properties: +------------------- +- compatible: Must be "maxim,max77650" +- reg: I2C device address. +- interrupts: The interrupt on the parent the controller is + connected to. +- interrupt-parent: phandle of the parent interrupt controller. +- interrupt-controller: Marks the device node as an interrupt controller. +- #interrupt-cells: Must be <2>. + +For device-tree bindings of sub-modules (regulator, power supply, GPIO, LEDs +and onkey) refer to the binding documents under the respective sub-system +directories. + +Example: +-------- + + pmic: max77650@48 { + compatible = "maxim,max77650"; + reg = <0x48>; + + interrupt-controller; + interrupt-parent = <&gpio2>; + #interrupt-cells = <2>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; + };
Signature · 1 line
2.20.1
PATCH 1/1 gpio fixup domain
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
--- arch/arm/boot/dts/am335x-bone-common.dtsi | 4 + drivers/gpio/gpio-max77650.c | 138 +++++++++++++++++++++- 2 files changed, 136 insertions(+), 6 deletions(-)
arch/arm/boot/dts/am335x-bone-common.dtsi +4 -0
@@ -276,6 +276,10 @@ gpio-controller; #gpio-cells = <2>; + + interrupt-parent = <&pmic>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "GPI"; }; leds {
drivers/gpio/gpio-max77650.c +132 -6
191 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH] gpio fixup domain
wt., 29 sty 2019 o 14:35 Bartosz Golaszewski <[email protected]> napisał(a):
Quoted 225 lines
From: Bartosz Golaszewski <[email protected]>
--- arch/arm/boot/dts/am335x-bone-common.dtsi | 4 + drivers/gpio/gpio-max77650.c | 138 +++++++++++++++++++++- 2 files changed, 136 insertions(+), 6 deletions(-)arch/arm/boot/dts/am335x-bone-common.dtsi +4
-0@@ -276,6 +276,10 @@ gpio-controller; #gpio-cells = <2>; + + interrupt-parent = <&pmic>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "GPI"; }; leds {drivers/gpio/gpio-max77650.c +132
-7@@ -9,6 +9,7 @@#include <linux/i2c.h> #include <linux/mfd/max77650.h> #include <linux/module.h> +#include <linux/of_irq.h> #include <linux/platform_device.h> #include <linux/regmap.h> @@ -34,7 +35,8 @@struct max77650_gpio_chip {struct regmap *map;struct gpio_chip gc; -int irq; +struct fwnode_handle *fwnode; +struct irq_domain *domain; }; static int max77650_gpio_direction_input(struct gpio_chip *gc,@@ -130,20 +132,114 @@ static int max77650_gpio_set_config(struct gpio_chip *gc, } } +static struct irq_chip max77650_gpio_irq_chip = { + .name ="max77650-gpio" , + .irq_ack = irq_chip_ack_parent, + .irq_mask = irq_chip_mask_parent, + .irq_unmask = irq_chip_unmask_parent, + .irq_set_type = irq_chip_set_type_parent, +}; + +static int max77650_gpio_irq_domain_activate (struct irq_domain *domain, +struct irq_data *data, +bool reserve) +{ +struct max77650_gpio_chip *chip = domain->host_data; + +return gpiochip_lock_as_irq (&chip->gc, data->hwirq); +} + +static void max77650_gpio_irq_domain_deactivate (struct irq_domain *domain, +struct irq_data *data) +{ +struct max77650_gpio_chip *chip = domain->host_data; + +return gpiochip_unlock_as_irq (&chip->gc, data->hwirq); +} + +static int max77650_gpio_domain_translate (struct irq_domain *domain, +struct irq_fwspec *fwspec, +unsigned long *hwirq, +unsigned int *type) +{ +struct max77650_gpio_chip *chip = domain->host_data; + +if (fwspec->param_count !=2 || fwspec->param[0 ] >= chip->gc.ngpio) +return -EINVAL ; + + *hwirq = fwspec->param[0 ]; + *type = fwspec->param[1 ]; + +return 0 ; +} + +static int max77650_gpio_domain_alloc (struct irq_domain *domain, +unsigned int virq, +unsigned int nr_irqs,void *data) +{ +struct max77650_gpio_chip *chip = domain->host_data; +struct irq_fwspec *fwspec = data; +struct irq_fwspec parent_fwspec; +irq_hw_number_t hwirq; +unsigned int type; +int ret; + +if (nr_irqs !=1 ) +return -EINVAL ; + + ret =max77650_gpio_domain_translate (domain, fwspec, &hwirq, &type); +if (ret) +return ret; + +irq_domain_set_info (domain, virq, hwirq, + &max77650_gpio_irq_chip, chip, + handle_level_irq,NULL ,NULL ); + + parent_fwspec.fwnode = domain->parent->fwnode; + parent_fwspec.param_count =4 ; + parent_fwspec.param[0 ] =0 ; + parent_fwspec.param[1 ] = hwirq; + parent_fwspec.param[2 ] =0 ; + parent_fwspec.param[3 ] = fwspec->param[1 ]; + +return irq_domain_alloc_irqs_parent (domain, virq, nr_irqs, + &parent_fwspec); + +return 0 ; +} + +static const struct irq_domain_ops max77650_gpio_irq_domain_ops = { + .activate = max77650_gpio_irq_domain_activate, + .deactivate = max77650_gpio_irq_domain_deactivate, + .alloc = max77650_gpio_domain_alloc, + .free = irq_domain_free_irqs_common, + .translate = max77650_gpio_domain_translate, +}; +static int max77650_gpio_to_irq (struct gpio_chip *gc,unsigned int offset) {struct max77650_gpio_chip *chip =gpiochip_get_data (gc); +struct irq_fwspec fwspec; + + fwspec.fwnode = chip->fwnode; + fwspec.param_count =2 ; + fwspec.param[0 ] =0 ; + fwspec.param[1 ] =IRQ_TYPE_LEVEL_LOW ; -return chip->irq; +return irq_create_fwspec_mapping (&fwspec); }static int max77650_gpio_probe (struct platform_device *pdev) { +struct device_node *of_node, *parent_node; +struct irq_domain *parent_domain;struct max77650_gpio_chip *chip;struct device *dev, *parent;struct i2c_client *i2c; +int rv; dev = &pdev->dev; + of_node = dev->of_node; parent = dev->parent; i2c =to_i2c_client (parent);@@ -151,13 +247,29 @@ static int max77650_gpio_probe(struct platform_device *pdev)if (!chip)return -ENOMEM ; + chip->fwnode = dev->fwnode; +platform_set_drvdata (pdev, chip); + chip->map =dev_get_regmap (parent,NULL );if (!chip->map)return -ENODEV ; - chip->irq =platform_get_irq_byname (pdev,"GPI" ); -if (chip->irq <0 ) -return chip->irq; + parent_node =of_irq_find_parent (of_node); +if (!parent_node) +return -ENXIO ; + + parent_domain =irq_find_host (parent_node); +of_node_put (parent_node); +if (!parent_domain) +return -ENXIO ; + + chip->fwnode =of_node_to_fwnode (of_node); + chip->domain =irq_domain_create_hierarchy (parent_domain,0 ,1 , + chip->fwnode, + &max77650_gpio_irq_domain_ops, + chip); +if (!chip->domain) +return -ENODEV ; chip->gc.base =-1 ; chip->gc.ngpio =1 ;@@ -174,7 +286,20 @@ static int max77650_gpio_probe(struct platform_device *pdev) chip->gc.set_config = max77650_gpio_set_config; chip->gc.to_irq = max77650_gpio_to_irq; -return devm_gpiochip_add_data (dev, &chip->gc, chip); + rv =devm_gpiochip_add_data (dev, &chip->gc, chip); +if (rv) +irq_domain_remove (chip->domain); + +return rv; +} + +static int max77650_gpio_remove (struct platform_device *pdev) +{ +struct max77650_gpio_chip *chip =platform_get_drvdata (pdev); + +irq_domain_remove (chip->domain); + +return 0 ; }static struct platform_driver max77650_gpio_driver = {@@ -182,6 +307,7 @@ static struct platform_driver max77650_gpio_driver = { .name = "max77650-gpio", }, .probe = max77650_gpio_probe, + .remove = max77650_gpio_remove, };module_platform_driver (max77650_gpio_driver); --
Quoted 2 lines
2.20.1
Please ignore this one, it got lost on the way. It was just experimentation.
Bart
Re: [PATCH] gpio fixup domain
Quoted 3 lines · Bartosz Golaszewski
wt., 29 sty 2019 o 14:35 Bartosz Golaszewski <[email protected]> napisał(a):
Please ignore this one, it got lost on the way. It was just experimentation.
Pretty interesting experiment anyways! Now both GPIO maintainers know the intricacies of the hierarchical irq domains, which is a win in itself when we try to come up with some generic handling here.
Yours,
Linus Walleij
PATCH v2 2/13 dt-bindings: regulator: add DT bindings for max77650
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add the DT binding document for max77650 regulators.
--- .../bindings/regulator/max77650-regulator.txt | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/max77650-regulator.txt
Documentation/devicetree/bindings/regulator/max77650-regulator.txt new file +41 -0
@@ -0,0 +1,41 @@ +Regulator driver for MAX77650 PMIC from Maxim Integrated. + +This module is part of the MAX77650 MFD device. For more details +see Documentation/devicetree/bindings/mfd/max77650.txt. + +The regulator controller is represented as a sub-node of the PMIC node +on the device tree. + +The device has a single LDO regulator and a SIMO buck-boost regulator with +three independent power rails. + +Required properties: +-------------------- +- compatible: Must be "maxim,max77650-regulator" + +Each rail must be instantiated under the regulators subnode of the top PMIC +node. Up to four regulators can be defined. For standard regulator properties +refer to Documentation/devicetree/bindings/regulator/regulator.txt. + +Available regulator compatible strings are: "ldo", "sbb0", "sbb1", "sbb2". + +Example: +-------- + + regulators { + compatible = "maxim,max77650-regulator"; + + max77650_ldo: regulator@0 { + regulator-compatible = "ldo"; + regulator-name = "max77650-ldo"; + regulator-min-microvolt = <1350000>; + regulator-max-microvolt = <2937500>; + }; + + max77650_sbb0: regulator@1 { + regulator-compatible = "sbb0"; + regulator-name = "max77650-sbb0"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1587500>; + }; + };
Signature · 1 line
2.20.1
PATCH v2 3/13 dt-bindings: power: supply: add DT bindings for max77650
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add the DT binding document for the battery charger module of max77650.
--- .../power/supply/max77650-charger.txt | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/supply/max77650-charger.txt
Documentation/devicetree/bindings/power/supply/max77650-charger.txt new file +27 -0
@@ -0,0 +1,27 @@ +Battery charger driver for MAX77650 PMIC from Maxim Integrated. + +This module is part of the MAX77650 MFD device. For more details +see Documentation/devicetree/bindings/mfd/max77650.txt. + +The charger is represented as a sub-node of the PMIC node on the device tree. + +Required properties: +-------------------- +- compatible: Must be "maxim,max77650-charger" + +Optional properties: +-------------------- +- maxim,vchgin-min: Minimum CHGIN regulation voltage (in microvolts). Must be + one of: 4000000, 4100000, 4200000, 4300000, 4400000, + 4500000, 4600000, 4700000. +- maxim,ichgin-lim: CHGIN input current limit (in microamps). Must be one of: + 95000, 190000, 285000, 380000, 475000. + +Example: +-------- + + charger { + compatible = "maxim,max77650-charger"; + maxim,vchgin-min = <4200000>; + maxim,ichgin-lim = <285000>; + };
Signature · 1 line
2.20.1
PATCH v2 4/13 dt-bindings: gpio: add DT bindings for max77650
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add the DT binding document for the GPIO module of max77650.
--- .../bindings/gpio/gpio-max77650.txt | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Documentation/devicetree/bindings/gpio/gpio-max77650.txt
Documentation/devicetree/bindings/gpio/gpio-max77650.txt new file +34 -0
@@ -0,0 +1,34 @@ +GPIO driver for MAX77650 PMIC from Maxim Integrated. + +This module is part of the MAX77650 MFD device. For more details +see Documentation/devicetree/bindings/mfd/max77650.txt. + +The GPIO controller is represented as a sub-node of the PMIC node on +the device tree. + +This device has a single GPIO pin. + +Required properties: +-------------------- +- compatible: Must be "maxim,max77650-gpio" +- gpio-controller : Marks the device node as a gpio controller. +- #gpio-cells : Must be <2>. The first cell is the pin number and + the second cell is used to specify the gpio active + state. + +Optional properties: +-------------------- +gpio-line-names: Single string containing the name of the GPIO line. + +For more details, please refer to the generic GPIO DT binding document +<devicetree/bindings/gpio/gpio.txt>. + +Example: +-------- + + gpio { + compatible = "maxim,max77650-gpio"; + gpio-line-names = "max77650-charger"; + gpio-controller; + #gpio-cells = <2>; + };
Signature · 1 line
2.20.1
PATCH v2 5/13 dt-bindings: leds: add DT bindings for max77650
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add the DT binding document for the LEDs module of max77650.
--- .../bindings/leds/leds-max77650.txt | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 Documentation/devicetree/bindings/leds/leds-max77650.txt
Documentation/devicetree/bindings/leds/leds-max77650.txt new file +57 -0
@@ -0,0 +1,57 @@ +LED driver for MAX77650 PMIC from Maxim Integrated. + +This module is part of the MAX77650 MFD device. For more details +see Documentation/devicetree/bindings/mfd/max77650.txt. + +The LED controller is represented as a sub-node of the PMIC node on +the device tree. + +This device has three current sinks. + +Required properties: +-------------------- +- compatible: Must be "maxim,max77650-led" +- #address-cells: Must be <1>. +- #size-cells: Must be <0>. + +Each LED is represented as a sub-node of the LED-controller node. Up to +three sub-nodes can be defined. + +Required properties of the sub-node: +------------------------------------ + +- reg: Must be <0>, <1> or <2>. + +Optional properties of the sub-node: +------------------------------------ + +- label: See Documentation/devicetree/bindings/leds/common.txt +- linux,default-trigger: See Documentation/devicetree/bindings/leds/common.txt + +For more details, please refer to the generic GPIO DT binding document +<devicetree/bindings/gpio/gpio.txt>. + +Example: +-------- + + leds { + compatible = "maxim,max77650-leds"; + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + label = "blue:usr0"; + }; + + led@1 { + reg = <1>; + label = "red:usr1"; + linux,default-trigger = "heartbeat"; + }; + + led@2 { + reg = <2>; + label = "green:usr2"; + }; + };
Signature · 1 line
2.20.1
Re: [PATCH v2 05/13] dt-bindings: leds: add DT bindings for max77650
Hi Bartosz,
Thank you for addressing my remarks.
Quoted 44 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Add the DT binding document for the LEDs module of max77650.
Signed-off-by Bartosz Golaszewski <[email protected]>--- .../bindings/leds/leds-max77650.txt | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+)create mode 100644
Documentation/devicetree/bindings/leds/leds-max77650.txtDocumentation/devicetree/bindings/leds/leds-max77650.txt new file +28
-0@@ -0,0 +1,57 @@ +LED driver for MAX77650 PMIC from Maxim Integrated. + +This module is part of the MAX77650 MFD device. For more details +see Documentation/devicetree/bindings/mfd/max77650.txt. + +The LED controller is represented as a sub-node of the PMIC node on +the device tree. + +This device has three current sinks. + +Required properties: +-------------------- +- compatible: Must be "maxim,max77650-led" +- #address-cells: Must be <1>. +- #size-cells: Must be <0>. + +Each LED is represented as a sub-node of the LED-controller node. Up to +three sub-nodes can be defined. + +Required properties of the sub-node: +------------------------------------ + +- reg: Must be <0>, <1> or <2>. + +Optional properties of the sub-node: +------------------------------------ + +- label: See Documentation/devicetree/bindings/leds/common.txt
Documentation/devicetree/bindings/leds/leds-max77650.txt line 38
Quoted 10 lines
Documentation/devicetree/bindings/leds/leds-max77650.txt new file +10
-0+- linux,default-trigger: See Documentation/devicetree/bindings/leds/common.txt + +For more details, please refer to the generic GPIO DT binding document +<devicetree/bindings/gpio/gpio.txt>. + +Example: +-------- + + leds { + compatible = "maxim,max77650-leds";
s/leds/led/
With that:
Quoted 20 lines
Documentation/devicetree/bindings/leds/leds-max77650.txt new file +19
-0+ #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + label = "blue:usr0"; + }; + + led@1 { + reg = <1>; + label = "red:usr1"; + linux,default-trigger = "heartbeat"; + }; + + led@2 { + reg = <2>; + label = "green:usr2"; + }; + };
Signature · 2 lines
Best regards, Jacek Anaszewski
PATCH v2 6/13 dt-bindings: input: add DT bindings for max77650
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add the DT binding document for the onkey module of max77650.
--- .../bindings/input/max77650-onkey.txt | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/max77650-onkey.txt
Documentation/devicetree/bindings/input/max77650-onkey.txt new file +26 -0
@@ -0,0 +1,26 @@ +Onkey driver for MAX77650 PMIC from Maxim Integrated. + +This module is part of the MAX77650 MFD device. For more details +see Documentation/devicetree/bindings/mfd/max77650.txt. + +The onkey controller is represented as a sub-node of the PMIC node on +the device tree. + +Required properties: +-------------------- +- compatible: Must be "maxim,max77650-onkey". + +Optional properties: +- linux,code: The key-code to be reported when the key is pressed. + Defaults to KEY_POWER. +- maxim,onkey-mode: Must be "push" or "slide" depending on the type of + button used by the system. Defaults to "push". + +Example: +-------- + + onkey { + compatible = "maxim,max77650-onkey"; + linux,code = <KEY_END>; + maxim,onkey-mode = "slide"; + };
Signature · 1 line
2.20.1
PATCH v2 7/13 mfd: max77650: new core mfd driver
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add the core mfd driver for max77650 PMIC. We define five sub-devices for which the drivers will be added in subsequent patches.
--- drivers/mfd/Kconfig | 11 ++ drivers/mfd/Makefile | 1 + drivers/mfd/max77650.c | 338 +++++++++++++++++++++++++++++++++++ include/linux/mfd/max77650.h | 59 ++++++ 4 files changed, 409 insertions(+) create mode 100644 drivers/mfd/max77650.c create mode 100644 include/linux/mfd/max77650.h
drivers/mfd/Kconfig +11 -0
@@ -734,6 +734,17 @@ config MFD_MAX77620 provides common support for accessing the device; additional drivers must be enabled in order to use the functionality of the device. +config MFD_MAX77650 + tristate "Maxim MAX77650/77651 PMIC Support" + depends on I2C + depends on OF || COMPILE_TEST + select MFD_CORE + select REGMAP_I2C + help + Say yes here to add support for Maxim Semiconductor MAX77650 and + MAX77651 Power Management ICs. This is the core multifunction + driver for interacting with the device. + config MFD_MAX77686 tristate "Maxim Semiconductor MAX77686/802 PMIC Support" depends on I2C
drivers/mfd/Makefile +1 -0
@@ -151,6 +151,7 @@ obj-$(CONFIG_MFD_DA9150) += da9150-core.o obj-$(CONFIG_MFD_MAX14577) += max14577.o obj-$(CONFIG_MFD_MAX77620) += max77620.o +obj-$(CONFIG_MFD_MAX77650) += max77650.o obj-$(CONFIG_MFD_MAX77686) += max77686.o obj-$(CONFIG_MFD_MAX77693) += max77693.o obj-$(CONFIG_MFD_MAX77843) += max77843.o
drivers/mfd/max77650.c new file +338 -0
338 lines not on this page · raw message
include/linux/mfd/max77650.h new file +59 -0
59 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 8/13 regulator: max77650: add regulator support
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add regulator support for max77650. We support all four variants of this PMIC including non-linear voltage table for max77651 SBB1 rail.
--- drivers/regulator/Kconfig | 8 + drivers/regulator/Makefile | 1 + drivers/regulator/max77650-regulator.c | 518 +++++++++++++++++++++++++ 3 files changed, 527 insertions(+) create mode 100644 drivers/regulator/max77650-regulator.c
drivers/regulator/Kconfig +8 -0
@@ -457,6 +457,14 @@ config REGULATOR_MAX77620 chip to control Step-Down DC-DC and LDOs. Say Y here to enable the regulator driver. +config REGULATOR_MAX77650 + tristate "Maxim MAX77650/77651 regulator support" + depends on MFD_MAX77650 + help + Regulator driver for MAX77650/77651 PMIC from Maxim + Semiconductor. This device has a SIMO with three independent + power rails and an LDO. + config REGULATOR_MAX8649 tristate "Maxim 8649 voltage regulator" depends on I2C
drivers/regulator/Makefile +1 -0
@@ -60,6 +60,7 @@ obj-$(CONFIG_REGULATOR_LTC3676) += ltc3676.o obj-$(CONFIG_REGULATOR_MAX14577) += max14577-regulator.o obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o obj-$(CONFIG_REGULATOR_MAX77620) += max77620-regulator.o +obj-$(CONFIG_REGULATOR_MAX77650) += max77650-regulator.o obj-$(CONFIG_REGULATOR_MAX8649) += max8649.o obj-$(CONFIG_REGULATOR_MAX8660) += max8660.o obj-$(CONFIG_REGULATOR_MAX8907) += max8907-regulator.o
drivers/regulator/max77650-regulator.c new file +518 -0
518 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 9/13 power: supply: max77650: add support for battery charger
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add basic support for the battery charger for max77650 PMIC.
--- drivers/power/supply/Kconfig | 7 + drivers/power/supply/Makefile | 1 + drivers/power/supply/max77650-charger.c | 355 ++++++++++++++++++++++++ 3 files changed, 363 insertions(+) create mode 100644 drivers/power/supply/max77650-charger.c
drivers/power/supply/Kconfig +7 -0
@@ -499,6 +499,13 @@ config CHARGER_DETECTOR_MAX14656 Revision 1.2 and can be found e.g. in Kindle 4/5th generation readers and certain LG devices. +config CHARGER_MAX77650 + tristate "Maxim MAX77650 battery charger driver" + depends on MFD_MAX77650 + help + Say Y to enable support for the battery charger control of MAX77650 + PMICs. + config CHARGER_MAX77693 tristate "Maxim MAX77693 battery charger driver" depends on MFD_MAX77693
drivers/power/supply/Makefile +1 -0
@@ -70,6 +70,7 @@ obj-$(CONFIG_CHARGER_MANAGER) += charger-manager.o obj-$(CONFIG_CHARGER_LTC3651) += ltc3651-charger.o obj-$(CONFIG_CHARGER_MAX14577) += max14577_charger.o obj-$(CONFIG_CHARGER_DETECTOR_MAX14656) += max14656_charger_detector.o +obj-$(CONFIG_CHARGER_MAX77650) += max77650-charger.o obj-$(CONFIG_CHARGER_MAX77693) += max77693_charger.o obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o
drivers/power/supply/max77650-charger.c new file +355 -0
355 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 10/13 gpio: max77650: add GPIO support
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add GPIO support for max77650 mfd device. This PMIC exposes a single GPIO line.
--- drivers/gpio/Kconfig | 7 ++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-max77650.c | 189 +++++++++++++++++++++++++++++++++++ 3 files changed, 197 insertions(+) create mode 100644 drivers/gpio/gpio-max77650.c
drivers/gpio/Kconfig +7 -0
@@ -1095,6 +1095,13 @@ config GPIO_MAX77620 driver also provides interrupt support for each of the gpios. Say yes here to enable the max77620 to be used as gpio controller. +config GPIO_MAX77650 + tristate "Maxim MAX77650/77651 GPIO support" + depends on MFD_MAX77650 + help + GPIO driver for MAX77650/77651 PMIC from Maxim Semiconductor. + These chips have a single pin that can be configured as GPIO. + config GPIO_MSIC bool "Intel MSIC mixed signal gpio support" depends on (X86 || COMPILE_TEST) && MFD_INTEL_MSIC
drivers/gpio/Makefile +1 -0
@@ -78,6 +78,7 @@ obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o obj-$(CONFIG_GPIO_MAX732X) += gpio-max732x.o obj-$(CONFIG_GPIO_MAX77620) += gpio-max77620.o +obj-$(CONFIG_GPIO_MAX77650) += gpio-max77650.o obj-$(CONFIG_GPIO_MB86S7X) += gpio-mb86s7x.o obj-$(CONFIG_GPIO_MENZ127) += gpio-menz127.o obj-$(CONFIG_GPIO_MERRIFIELD) += gpio-merrifield.o
drivers/gpio/gpio-max77650.c new file +189 -0
189 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v2 10/13] gpio: max77650: add GPIO support
Quoted 6 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Add GPIO support for max77650 mfd device. This PMIC exposes a single GPIO line.
Signed-off-by Bartosz Golaszewski <[email protected]>
Yours,
Linus Walleij
PATCH v2 11/13 leds: max77650: add LEDs support
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
This adds basic support for LEDs for the max77650 PMIC. The device has three current sinks for driving LEDs.
--- drivers/leds/Kconfig | 6 ++ drivers/leds/Makefile | 1 + drivers/leds/leds-max77650.c | 152 +++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+) create mode 100644 drivers/leds/leds-max77650.c
drivers/leds/Kconfig +6 -0
@@ -608,6 +608,12 @@ config LEDS_TLC591XX This option enables support for Texas Instruments TLC59108 and TLC59116 LED controllers. +config LEDS_MAX77650 + tristate "LED support for Maxim MAX77650 PMIC" + depends on MFD_MAX77650 + help + LEDs driver for MAX77650 family of PMICs from Maxim Integrated." + config LEDS_MAX77693 tristate "LED support for MAX77693 Flash" depends on LEDS_CLASS_FLASH
drivers/leds/Makefile +1 -0
@@ -61,6 +61,7 @@ obj-$(CONFIG_LEDS_MC13783) += leds-mc13783.o obj-$(CONFIG_LEDS_NS2) += leds-ns2.o obj-$(CONFIG_LEDS_NETXBIG) += leds-netxbig.o obj-$(CONFIG_LEDS_ASIC3) += leds-asic3.o +obj-$(CONFIG_LEDS_MAX77650) += leds-max77650.o obj-$(CONFIG_LEDS_MAX77693) += leds-max77693.o obj-$(CONFIG_LEDS_MAX8997) += leds-max8997.o obj-$(CONFIG_LEDS_LM355x) += leds-lm355x.o
drivers/leds/leds-max77650.c new file +152 -0
152 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v2 11/13] leds: max77650: add LEDs support
Hi Bartosz,
Thank you for the update.
One more thing drew my attention, please refer below.
Quoted 102 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
This adds basic support for LEDs for the max77650 PMIC. The device has three current sinks for driving LEDs.
Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/leds/Kconfig | 6 ++ drivers/leds/Makefile | 1 + drivers/leds/leds-max77650.c | 152 +++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+)create mode 100644
drivers/leds/leds-max77650.cdrivers/leds/Kconfig +6
-0@@ -608,6 +608,12 @@ config LEDS_TLC591XX This option enables support for Texas Instruments TLC59108 and TLC59116 LED controllers. +config LEDS_MAX77650 + tristate "LED support for Maxim MAX77650 PMIC" + depends on MFD_MAX77650 + help + LEDs driver for MAX77650 family of PMICs from Maxim Integrated." + config LEDS_MAX77693 tristate "LED support for MAX77693 Flash" depends on LEDS_CLASS_FLASHdrivers/leds/Makefile +1
-0@@ -61,6 +61,7 @@ obj-$(CONFIG_LEDS_MC13783) += leds-mc13783.o obj-$(CONFIG_LEDS_NS2) += leds-ns2.o obj-$(CONFIG_LEDS_NETXBIG) += leds-netxbig.o obj-$(CONFIG_LEDS_ASIC3) += leds-asic3.o +obj-$(CONFIG_LEDS_MAX77650) += leds-max77650.o obj-$(CONFIG_LEDS_MAX77693) += leds-max77693.o obj-$(CONFIG_LEDS_MAX8997) += leds-max8997.o obj-$(CONFIG_LEDS_LM355x) += leds-lm355x.odrivers/leds/leds-max77650.c new file +54
-0@@ -0,0 +1,152 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2018 BayLibre SAS +// Author: Bartosz Golaszewski <[email protected]> +// +// LED driver for MAXIM 77650/77651 charger/power-supply. + +#include <linux/i2c.h> +#include <linux/leds.h> +#include <linux/mfd/max77650.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#define MAX77650_NUM_LEDS 3 + +#define MAX77650_LED_A_BASE 0x40 +#define MAX77650_LED_B_BASE 0x43 + +#define MAX77650_LED_BR_MASK GENMASK(4, 0) +#define MAX77650_LED_EN_MASK GENMASK(7, 6) + +/* Enable EN_LED_MSTR. */ +#define MAX77650_LED_TOP_DEFAULT BIT(0) + +#define MAX77650_LED_ENABLE GENMASK(7, 6) +#define MAX77650_LED_DISABLE 0x00 + +#define MAX77650_LED_A_DEFAULT MAX77650_LED_DISABLE +/* 100% on duty */ +#define MAX77650_LED_B_DEFAULT GENMASK(3, 0) + +struct max77650_led { +struct led_classdev cdev; +struct regmap *map; +unsigned int regA; +unsigned int regB; +}; + +static struct max77650_led *max77650_to_led (struct led_classdev *cdev) +{ + return container_of(cdev, struct max77650_led, cdev); +} + +static int max77650_led_brightness_set (struct led_classdev *cdev, +enum led_brightness brightness) +{ +struct max77650_led *led =max77650_to_led (cdev); +int val, mask; + + mask =MAX77650_LED_BR_MASK |MAX77650_LED_EN_MASK ; + +if (brightness ==LED_OFF ) { + val =MAX77650_LED_DISABLE ;
drivers/leds/leds-max77650.c line 64
Quoted 10 lines
drivers/leds/leds-max77650.c new file +10
-0+ }else { + val =MAX77650_LED_ENABLE ; +/* +* We can set the brightness with 5-bit resolution. +* +* For brightness == 1, the bits we're writing will be 0, but +* since we keep LED_FS0 set to 12.8mA full-scale range, the +* LED will be lit slightly. +*/ + val |= brightness /8 ;
We have max_brightness property and you seem not to use it. With 5-bit brightness resolution it should be initialized to 32 and then we will be able to avoid the division here.
Quoted 89 lines
drivers/leds/leds-max77650.c new file +88
-0+ } + +return regmap_update_bits (led->map, led->regA, mask, val); +} + +static int max77650_led_probe (struct platform_device *pdev) +{ +struct device_node *of_node, *child; +struct max77650_led *leds, *led; +struct device *parent; +struct device *dev; +struct regmap *map; +const char *label; +int rv, num_leds; +u32 reg; + + dev = &pdev->dev; + parent = dev->parent; + of_node = dev->of_node; + +if (!of_node) +return -ENODEV ; + + leds =devm_kcalloc (dev,sizeof (*leds),MAX77650_NUM_LEDS ,GFP_KERNEL ); +if (!leds) +return -ENOMEM ; + + map =dev_get_regmap (dev->parent,NULL ); +if (!map) +return -ENODEV ; + + num_leds =of_get_child_count (of_node); +if (!num_leds || num_leds >MAX77650_NUM_LEDS ) +return -ENODEV ; + +for_each_child_of_node (of_node, child) { + rv =of_property_read_u32 (child,"reg" , ®); +if (rv || reg >=MAX77650_NUM_LEDS ) +return -EINVAL ; + + led = &leds[reg]; + led->map = map; + led->regA =MAX77650_LED_A_BASE + reg; + led->regB =MAX77650_LED_B_BASE + reg; + led->cdev.brightness_set_blocking = max77650_led_brightness_set; + + label =of_get_property (child,"label" ,NULL ); +if (!label) { + led->cdev.name ="max77650::" ; + }else { + led->cdev.name =devm_kasprintf (dev,GFP_KERNEL , +"max77650:%s" , label); +if (!led->cdev.name) +return -ENOMEM ; + } + +of_property_read_string (child,"linux,default-trigger" , + &led->cdev.default_trigger); + + rv =devm_of_led_classdev_register (dev, child, &led->cdev); +if (rv) +return rv; + + rv =regmap_write (map, led->regA,MAX77650_LED_A_DEFAULT ); +if (rv) +return rv; + + rv =regmap_write (map, led->regB,MAX77650_LED_B_DEFAULT ); +if (rv) +return rv; + } + +return regmap_write (map, +MAX77650_REG_CNFG_LED_TOP , +MAX77650_LED_TOP_DEFAULT ); +} + +static struct platform_driver max77650_led_driver = { + .driver = { + .name ="max77650-led" , + }, + .probe = max77650_led_probe, +}; +module_platform_driver (max77650_led_driver); + +MODULE_DESCRIPTION ("MAXIM 77650/77651 LED driver" ); +MODULE_AUTHOR ("Bartosz Golaszewski <[email protected]>" ); +MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
Best regards, Jacek Anaszewski
PATCH v2 12/13 input: max77650: add onkey support
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
Add support for the push- and slide-button events for max77650.
--- drivers/input/misc/Kconfig | 9 ++ drivers/input/misc/Makefile | 1 + drivers/input/misc/max77650-onkey.c | 127 ++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 drivers/input/misc/max77650-onkey.c
drivers/input/misc/Kconfig +9 -0
@@ -180,6 +180,15 @@ config INPUT_M68K_BEEP tristate "M68k Beeper support" depends on M68K +config INPUT_MAX77650_ONKEY + tristate "Maxim MAX77650 ONKEY support" + depends on MFD_MAX77650 + help + Support the ONKEY of the MAX77650 PMIC as an input device. + + To compile this driver as a module, choose M here: the module + will be called max77650-onkey. + config INPUT_MAX77693_HAPTIC tristate "MAXIM MAX77693/MAX77843 haptic controller support" depends on (MFD_MAX77693 || MFD_MAX77843) && PWM
drivers/input/misc/Makefile +1 -0
@@ -43,6 +43,7 @@ obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o obj-$(CONFIG_INPUT_KEYSPAN_REMOTE) += keyspan_remote.o obj-$(CONFIG_INPUT_KXTJ9) += kxtj9.o obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o +obj-$(CONFIG_INPUT_MAX77650_ONKEY) += max77650-onkey.o obj-$(CONFIG_INPUT_MAX77693_HAPTIC) += max77693-haptic.o obj-$(CONFIG_INPUT_MAX8925_ONKEY) += max8925_onkey.o obj-$(CONFIG_INPUT_MAX8997_HAPTIC) += max8997_haptic.o
drivers/input/misc/max77650-onkey.c new file +127 -0
127 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v2 12/13] input: max77650: add onkey support
Quoted 5 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Add support for the push- and slide-button events for max77650.
Signed-off-by Bartosz Golaszewski <[email protected]>
Please feel free to merge with other patches (MFD tree I suppose?).
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH v2 12/13] input: max77650: add onkey support
śr., 30 sty 2019 o 19:53 Dmitry Torokhov <[email protected]> napisał(a):
Quoted 12 lines · Bartosz Golaszewski
Quoted 5 lines
From: Bartosz Golaszewski <[email protected]>
Add support for the push- and slide-button events for max77650.
Signed-off-by Bartosz Golaszewski <[email protected]>Acked-by Dmitry Torokhov <[email protected]>Please feel free to merge with other patches (MFD tree I suppose?).
Hi Dmitry,
I'm not sure what the policy is on merging MFD drivers, but I'm seeing that Mark Brown has already picked up the regulator part into his tree (including the binding document). I think you can just pick up the input patches and it will simply not show up in Kconfig until the core mfd module is upstream.
@Mark: could you please confirm it?
Best regards,
Bartosz Golaszewski
Mark Brown
maintainerRe: [PATCH v2 12/13] input: max77650: add onkey support
Quoted 7 lines · Bartosz Golaszewski
I'm not sure what the policy is on merging MFD drivers, but I'm seeing that Mark Brown has already picked up the regulator part into his tree (including the binding document). I think you can just pick up the input patches and it will simply not show up in
Kconfiguntil the core mfd module is upstream.@Mark: could you please confirm it?
Right, as it's a new MFD the Kconfig will stop it causing build breakage until the MFD is merged. I'm doing it partly just to cut down on the amount of mail from resends while the rest of the series gets reviewed.
Dmitry Torokhov
maintainerRe: [PATCH v2 12/13] input: max77650: add onkey support
Quoted 9 lines · Mark Brown
Quoted 5 lines · Bartosz Golaszewski
I'm not sure what the policy is on merging MFD drivers, but I'm seeing that Mark Brown has already picked up the regulator part into his tree (including the binding document). I think you can just pick up the input patches and it will simply not show up in
Kconfiguntil the core mfd module is upstream.
Quoted 5 lines
Quoted 1 line
@Mark: could you please confirm it?
Right, as it's a new MFD the
Kconfigwill stop it causing build breakage until the MFD is merged. I'm doing it partly just to cut down on the amount of mail from resends while the rest of the series gets reviewed.
Ugh, I might have pulled it in if it did not reference the new header file. As a rule I try to enable all symbols that result in input devices being created so as much of input code is covered... I'd prefer input piece be merged with MFD.
Thanks.
Signature · 1 line
Dmitry
Re: [PATCH v2 12/13] input: max77650: add onkey support
Quoted 12 lines · Dmitry Torokhov
Quoted 11 lines · Mark Brown
Quoted 7 lines · Bartosz Golaszewski
I'm not sure what the policy is on merging MFD drivers, but I'm seeing that Mark Brown has already picked up the regulator part into his tree (including the binding document). I think you can just pick up the input patches and it will simply not show up in
Kconfiguntil the core mfd module is upstream.@Mark: could you please confirm it?
Quoted 8 lines
Quoted 3 lines
Right, as it's a new MFD the
Kconfigwill stop it causing build breakage until the MFD is merged. I'm doing it partly just to cut down on the amount of mail from resends while the rest of the series gets reviewed.Ugh, I might have pulled it in if it did not reference the new header file. As a rule I try to enable all symbols that result in input devices being created so as much of input code is covered... I'd prefer input piece be merged with MFD.
That's no problem.
Signature · 4 lines
Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH v2 13/13 MAINTAINERS: add an entry for max77650 mfd driver
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
I plan on extending this set of drivers so add myself as maintainer.
--- MAINTAINERS | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
MAINTAINERS +14 -0
@@ -9221,6 +9221,20 @@ S: Maintained F: Documentation/devicetree/bindings/sound/max9860.txt F: sound/soc/codecs/max9860.* +MAXIM MAX77650 PMIC MFD DRIVER +M: Bartosz Golaszewski <[email protected]> +L: [email protected] +S: Maintained +F: Documentation/devicetree/bindings/*/*max77650.txt +F: Documentation/devicetree/bindings/*/max77650*.txt +F: include/linux/mfd/max77650.h +F: drivers/mfd/max77650.c +F: drivers/regulator/max77650-regulator.c +F: drivers/power/supply/max77650-charger.c +F: drivers/input/misc/max77650-onkey.c +F: drivers/leds/leds-max77650.c +F: drivers/gpio/gpio-max77650.c + MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER M: Javier Martinez Canillas <[email protected]> L: [email protected]
Signature · 1 line
2.20.1