mfd: add support for max77650 PMIC
Subsystems (8)
v3 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
v2 -> v3:
General:
- dropped regulator patches as they're already in Mark Brown's branch
LED:
- fix the compatible string in the DT binding example
- use the max_brightness property
- use a common prefix ("MAX77650_LED") for all defines in the driver
MFD:
- add the MODULE_DEVICE_TABLE()
- add a sentinel to the of_device_id array
- constify the pointers to irq names
- use an enum instead of defines for interrupt indexes
Bartosz Golaszewski (11):
dt-bindings: mfd: 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
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 ++ 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 | 147 ++++++++ drivers/mfd/Kconfig | 11 + drivers/mfd/Makefile | 1 + drivers/mfd/max77650.c | 342 +++++++++++++++++ drivers/power/supply/Kconfig | 7 + drivers/power/supply/Makefile | 1 + drivers/power/supply/max77650-charger.c | 355 ++++++++++++++++++ include/linux/mfd/max77650.h | 59 +++ 22 files changed, 1450 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 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 include/linux/mfd/max77650.h
Signature · 1 line
2.20.1
PATCH v3 1/11 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 v3 2/11 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
Re: [PATCH v3 02/11] dt-bindings: power: supply: add DT bindings for max77650
Hi!
Quoted 14 lines
Documentation/devicetree/bindings/power/supply/max77650-charger.txt new file +8
-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:
Documentation/devicetree/bindings/power/supply/max77650-charger.txt line 18
Quoted 10 lines
Documentation/devicetree/bindings/power/supply/max77650-charger.txt new file +10
-0+-------------------- +- 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.
We already have richtek,min-input-voltage-regulation and ti,minimum-sys-voltage and ti,in-dpm-voltage.
This is not too consistent with with the rest.. and perhaps common name should be used for those?
See also ti,current-limit. That seems to be direct match.
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v3 02/11] dt-bindings: power: supply: add DT bindings for max77650
wt., 12 lut 2019 o 12:54 Pavel Machek <[email protected]> napisał(a):
Quoted 31 lines
Hi!
Quoted 14 lines
Documentation/devicetree/bindings/power/supply/max77650-charger.txt new file +8
-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:Documentation/devicetree/bindings/power/supply/max77650-charger.txt line 18
Quoted 10 lines
Documentation/devicetree/bindings/power/supply/max77650-charger.txt new file +10
-0+-------------------- +- 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.We already have richtek,min-input-voltage-regulation and ti,minimum-sys-voltage and ti,in-dpm-voltage.
Quoted 5 lines
This is not too consistent with with the rest.. and perhaps common name should be used for those?
See also ti,current-limit. That seems to be direct match.
Well I can't really use a TI-specific property name on a maxim part, can I?
Bart
PS This version was superseded by v4.
Re: [PATCH v3 02/11] dt-bindings: power: supply: add DT bindings for max77650
Quoted 32 lines · Bartosz Golaszewski
wt., 12 lut 2019 o 12:54 Pavel Machek <[email protected]> napisał(a):
Quoted 31 lines
Hi!
Quoted 14 lines
Documentation/devicetree/bindings/power/supply/max77650-charger.txt new file +8
-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:Documentation/devicetree/bindings/power/supply/max77650-charger.txt line 18
Quoted 10 lines
Documentation/devicetree/bindings/power/supply/max77650-charger.txt new file +10
-0+-------------------- +- 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.We already have richtek,min-input-voltage-regulation and ti,minimum-sys-voltage and ti,in-dpm-voltage.
Quoted 7 lines
Quoted 5 lines
This is not too consistent with with the rest.. and perhaps common name should be used for those?
See also ti,current-limit. That seems to be direct match.
Well I can't really use a TI-specific property name on a maxim part, can I?
Well, I'm saying that you should introduce common names for common stuff. "current-limit" sounds like reasonable name.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH v3 3/11 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 v3 4/11 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-led"; + #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
PATCH v3 5/11 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 v3 6/11 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 | 342 +++++++++++++++++++++++++++++++++++ include/linux/mfd/max77650.h | 59 ++++++ 4 files changed, 413 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 +342 -0
342 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
Re: [PATCH v3 06/11] mfd: max77650: new core mfd driver
Quoted 21 lines · Bartosz Golaszewski
From: 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.
Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/mfd/Kconfig | 11 ++ drivers/mfd/Makefile | 1 + drivers/mfd/max77650.c | 342 +++++++++++++++++++++++++++++++++++ include/linux/mfd/max77650.h | 59 ++++++ 4 files changed, 413 insertions(+) create mode 100644 drivers/mfd/max77650.c create mode 100644 include/linux/mfd/max77650.hdrivers/mfd/Kconfig +0
-0@@ -734,6 +734,17 @@ config MFD_MAX77620 provides common support for accessing the device; additional drivers
drivers/mfd/Kconfig config MFD_MAX77620 · line 744
Quoted 10 lines
drivers/mfd/Kconfig +8
-0must 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
"Say Y" would be more common and consistent with your ther patch.
drivers/mfd/Kconfig config MFD_MAX77620 · line 746
Quoted 2 lines
drivers/mfd/Kconfig +2
-0+ MAX77651 Power Management ICs. This is the core multifunction + driver for interacting with the device.
Mention modular build and module name here?
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH v3 7/11 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
Re: [PATCH v3 07/11] power: supply: max77650: add support for battery charger
Hi!
Quoted 11 lines
drivers/power/supply/max77650-charger.c new file +11
-0+#define MAX77650_CHARGER_ENABLED BIT(0) +#define MAX77650_CHARGER_DISABLED 0x00 +#define MAX77650_CHARGER_CHG_EN_MASK BIT(0) + +#define MAX77650_CHARGER_CHG_DTLS_MASK GENMASK(7, 4) +#define MAX77650_CHARGER_CHG_DTLS_BITS (_reg) \ + (((_reg) & MAX77650_CHARGER_CHG_DTLS_MASK) >> 4) + +#define MAX77650_CHARGER_CHG_OFF 0x00 +#define MAX77650_CHARGER_CHG_PREQ 0x01 +#define MAX77650_CHARGER_CHG_ON_CURR 0x02
drivers/power/supply/max77650-charger.c line 36
Quoted 10 lines
drivers/power/supply/max77650-charger.c new file +10
-0+#define MAX77650_CHARGER_CHG_ON_JCURR 0x03 +#define MAX77650_CHARGER_CHG_ON_VOLT 0x04 +#define MAX77650_CHARGER_CHG_ON_JVOLT 0x05 +#define MAX77650_CHARGER_CHG_ON_TOPOFF 0x06 +#define MAX77650_CHARGER_CHG_ON_JTOPOFF 0x07 +#define MAX77650_CHARGER_CHG_DONE 0x08 +#define MAX77650_CHARGER_CHG_JDONE 0x09 +#define MAX77650_CHARGER_CHG_SUSP_PF 0x0a +#define MAX77650_CHARGER_CHG_SUSP_FCF 0x0b +#define MAX77650_CHARGER_CHG_SUSP_BTF 0x0c
These are really bad define names. We are in charger driver, so MAX77650_CHARGER_ really should be shortened/ommited. OTOH
more space should be given to "CHG_SUSP_BTF" as it is impossible to decipher.
drivers/power/supply/max77650-charger.c line 44
Quoted 7 lines
drivers/power/supply/max77650-charger.c new file +7
-0+#define MAX77650_CHARGER_CHGIN_DTLS_MASK GENMASK(3, 2) +#define MAX77650_CHARGER_CHGIN_DTLS_BITS (_reg) \ + (((_reg) & MAX77650_CHARGER_CHGIN_DTLS_MASK) >> 2) + +#define MAX77650_CHARGER_CHGIN_UVL 0x00 +#define MAX77650_CHARGER_CHGIN_OVL 0x01 +#define MAX77650_CHARGER_CHGIN_OKAY 0x11
UVL -> UNDERVOLTAGE, OVL -> OVERVOLTAGE?
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v3 07/11] power: supply: max77650: add support for battery charger
wt., 12 lut 2019 o 13:07 Pavel Machek <[email protected]> napisał(a):
Quoted 20 lines
Hi!
Quoted 17 lines
drivers/power/supply/max77650-charger.c new file +17
-0+#define MAX77650_CHARGER_ENABLED BIT(0) +#define MAX77650_CHARGER_DISABLED 0x00 +#define MAX77650_CHARGER_CHG_EN_MASK BIT(0) + +#define MAX77650_CHARGER_CHG_DTLS_MASK GENMASK(7, 4) +#define MAX77650_CHARGER_CHG_DTLS_BITS (_reg) \ + (((_reg) & MAX77650_CHARGER_CHG_DTLS_MASK) >> 4) + +#define MAX77650_CHARGER_CHG_OFF 0x00 +#define MAX77650_CHARGER_CHG_PREQ 0x01 +#define MAX77650_CHARGER_CHG_ON_CURR 0x02 +#define MAX77650_CHARGER_CHG_ON_JCURR 0x03 +#define MAX77650_CHARGER_CHG_ON_VOLT 0x04 +#define MAX77650_CHARGER_CHG_ON_JVOLT 0x05 +#define MAX77650_CHARGER_CHG_ON_TOPOFF 0x06 +#define MAX77650_CHARGER_CHG_ON_JTOPOFF 0x07 +#define MAX77650_CHARGER_CHG_DONE 0x08
Quoted 9 lines
drivers/power/supply/max77650-charger.c line 36
Quoted 4 lines
drivers/power/supply/max77650-charger.c new file +4
-0+#define MAX77650_CHARGER_CHG_JDONE 0x09 +#define MAX77650_CHARGER_CHG_SUSP_PF 0x0a +#define MAX77650_CHARGER_CHG_SUSP_FCF 0x0b +#define MAX77650_CHARGER_CHG_SUSP_BTF 0x0cThese are really bad define names. We are in charger driver, so
MAX77650_CHARGER_really should be shortened/ommited. OTOH
more space should be given to "CHG_SUSP_BTF" as it is impossible to decipher.
I disagree about the prefix bit. I prefer to use common prefixes for all symbols in a driver. I would rather add comments to every definition here.
Bart
Quoted 14 lines
drivers/power/supply/max77650-charger.c line 44
Quoted 7 lines
drivers/power/supply/max77650-charger.c new file +7
-0+#define MAX77650_CHARGER_CHGIN_DTLS_MASK GENMASK(3, 2) +#define MAX77650_CHARGER_CHGIN_DTLS_BITS (_reg) \ + (((_reg) & MAX77650_CHARGER_CHGIN_DTLS_MASK) >> 2) + +#define MAX77650_CHARGER_CHGIN_UVL 0x00 +#define MAX77650_CHARGER_CHGIN_OVL 0x01 +#define MAX77650_CHARGER_CHGIN_OKAY 0x11UVL -> UNDERVOLTAGE, OVL -> OVERVOLTAGE?
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v3 07/11] power: supply: max77650: add support for battery charger
Quoted 31 lines · Bartosz Golaszewski
wt., 12 lut 2019 o 13:07 Pavel Machek <[email protected]> napisał(a):
Quoted 20 lines
Hi!
Quoted 17 lines
drivers/power/supply/max77650-charger.c new file +17
-0+#define MAX77650_CHARGER_ENABLED BIT(0) +#define MAX77650_CHARGER_DISABLED 0x00 +#define MAX77650_CHARGER_CHG_EN_MASK BIT(0) + +#define MAX77650_CHARGER_CHG_DTLS_MASK GENMASK(7, 4) +#define MAX77650_CHARGER_CHG_DTLS_BITS (_reg) \ + (((_reg) & MAX77650_CHARGER_CHG_DTLS_MASK) >> 4) + +#define MAX77650_CHARGER_CHG_OFF 0x00 +#define MAX77650_CHARGER_CHG_PREQ 0x01 +#define MAX77650_CHARGER_CHG_ON_CURR 0x02 +#define MAX77650_CHARGER_CHG_ON_JCURR 0x03 +#define MAX77650_CHARGER_CHG_ON_VOLT 0x04 +#define MAX77650_CHARGER_CHG_ON_JVOLT 0x05 +#define MAX77650_CHARGER_CHG_ON_TOPOFF 0x06 +#define MAX77650_CHARGER_CHG_ON_JTOPOFF 0x07 +#define MAX77650_CHARGER_CHG_DONE 0x08Quoted 9 lines
drivers/power/supply/max77650-charger.c line 36
Quoted 4 lines
drivers/power/supply/max77650-charger.c new file +4
-0+#define MAX77650_CHARGER_CHG_JDONE 0x09 +#define MAX77650_CHARGER_CHG_SUSP_PF 0x0a +#define MAX77650_CHARGER_CHG_SUSP_FCF 0x0b +#define MAX77650_CHARGER_CHG_SUSP_BTF 0x0cThese are really bad define names. We are in charger driver, so
MAX77650_CHARGER_really should be shortened/ommited. OTOH
more space should be given to "CHG_SUSP_BTF" as it is impossible to decipher.
Quoted 3 lines
I disagree about the prefix bit. I prefer to use common prefixes for all symbols in a driver. I would rather add comments to every definition here.
So what about shortened? (And what about UVL/OVL below?)
And... what you prefer is not quite important. It is important that other people can read your code. And what "PF" is is important... unlike MAX77650_CHARGER_ which is long but unimportant.
Quoted 14 lines
Quoted 14 lines
drivers/power/supply/max77650-charger.c line 44
Quoted 7 lines
drivers/power/supply/max77650-charger.c new file +7
-0+#define MAX77650_CHARGER_CHGIN_DTLS_MASK GENMASK(3, 2) +#define MAX77650_CHARGER_CHGIN_DTLS_BITS (_reg) \ + (((_reg) & MAX77650_CHARGER_CHGIN_DTLS_MASK) >> 2) + +#define MAX77650_CHARGER_CHGIN_UVL 0x00 +#define MAX77650_CHARGER_CHGIN_OVL 0x01 +#define MAX77650_CHARGER_CHGIN_OKAY 0x11UVL -> UNDERVOLTAGE, OVL -> OVERVOLTAGE?
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v3 07/11] power: supply: max77650: add support for battery charger
In reply to Bartosz GolaszewskiQuoted 10 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
Add basic support for the battery charger for max77650 PMIC.
drivers/power/supply/max77650-charger.c new file +0
-0
drivers/power/supply/max77650-charger.c line 7
Quoted 7 lines
drivers/power/supply/max77650-charger.c new file +7
-0@@ -0,0 +1,355 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2018 BayLibre SAS +// Author: Bartosz Golaszewski <[email protected]> +// +// Battery charger driver for MAXIM 77650/77651 charger/power-supply. +
If available, pointer to a datasheet would be welcome here.
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH v3 8/11 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 v3 08/11] gpio: max77650: add GPIO support
pt., 1 lut 2019 o 10:48 Bartosz Golaszewski <[email protected]> napisał(a):
Quoted 240 lines
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]>--- 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.cdrivers/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_MSICdrivers/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.odrivers/gpio/gpio-max77650.c new file +189
-1@@ -0,0 +1,189 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2018 BayLibre SAS +// Author: Bartosz Golaszewski <[email protected]> +// +// GPIO driver for MAXIM 77650/77651 charger/power-supply. + +#include <linux/gpio/driver.h> +#include <linux/i2c.h> +#include <linux/mfd/max77650.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#define MAX77650_GPIO_DIR_MASK BIT(0) +#define MAX77650_GPIO_INVAL_MASK BIT(1) +#define MAX77650_GPIO_DRV_MASK BIT(2) +#define MAX77650_GPIO_OUTVAL_MASK BIT(3) +#define MAX77650_GPIO_DEBOUNCE_MASK BIT(4) + +#define MAX77650_GPIO_DIR_OUT 0x00 +#define MAX77650_GPIO_DIR_IN BIT(0) +#define MAX77650_GPIO_OUT_LOW 0x00 +#define MAX77650_GPIO_OUT_HIGH BIT(3) +#define MAX77650_GPIO_DRV_OPEN_DRAIN 0x00 +#define MAX77650_GPIO_DRV_PUSH_PULL BIT(2) +#define MAX77650_GPIO_DEBOUNCE BIT(4) + +#define MAX77650_GPIO_DIR_BITS (_reg) \ + ((_reg) & MAX77650_GPIO_DIR_MASK) +#define MAX77650_GPIO_INVAL_BITS (_reg) \ + (((_reg) & MAX77650_GPIO_INVAL_MASK) >> 1) + +struct max77650_gpio_chip { +struct regmap *map; +struct gpio_chip gc; +}; + +static int max77650_gpio_direction_input (struct gpio_chip *gc, +unsigned int offset) +{ +struct max77650_gpio_chip *chip =gpiochip_get_data (gc); + +return regmap_update_bits (chip->map, +MAX77650_REG_CNFG_GPIO , +MAX77650_GPIO_DIR_MASK , +MAX77650_GPIO_DIR_IN ); +} + +static int max77650_gpio_direction_output (struct gpio_chip *gc, +unsigned int offset,int value) +{ +struct max77650_gpio_chip *chip =gpiochip_get_data (gc); +int mask, regval; + + mask =MAX77650_GPIO_DIR_MASK |MAX77650_GPIO_OUTVAL_MASK ; + regval = value ?MAX77650_GPIO_OUT_HIGH :MAX77650_GPIO_OUT_LOW ; + regval |=MAX77650_GPIO_DIR_OUT ; + +return regmap_update_bits (chip->map, +MAX77650_REG_CNFG_GPIO , mask, regval); +} + +static void max77650_gpio_set_value (struct gpio_chip *gc, +unsigned int offset,int value) +{ +struct max77650_gpio_chip *chip =gpiochip_get_data (gc); +int rv, regval; + + regval = value ?MAX77650_GPIO_OUT_HIGH :MAX77650_GPIO_OUT_LOW ; + + rv =regmap_update_bits (chip->map,MAX77650_REG_CNFG_GPIO , +MAX77650_GPIO_OUTVAL_MASK , regval); +if (rv) +dev_err (gc->parent,"cannot set GPIO value: %d\n" , rv); +} + +static int max77650_gpio_get_value (struct gpio_chip *gc, +unsigned int offset) +{ +struct max77650_gpio_chip *chip =gpiochip_get_data (gc); +unsigned int val; +int rv; + + rv =regmap_read (chip->map,MAX77650_REG_CNFG_GPIO , &val); +if (rv) +return rv; + +return MAX77650_GPIO_INVAL_BITS (val); +} + +static int max77650_gpio_get_direction (struct gpio_chip *gc, +unsigned int offset) +{ +struct max77650_gpio_chip *chip =gpiochip_get_data (gc); +unsigned int val; +int rv; + + rv =regmap_read (chip->map,MAX77650_REG_CNFG_GPIO , &val); +if (rv) +return rv; + +return MAX77650_GPIO_DIR_BITS (val); +} + +static int max77650_gpio_set_config (struct gpio_chip *gc, +unsigned int offset,unsigned long cfg) +{ +struct max77650_gpio_chip *chip =gpiochip_get_data (gc); + +switch (pinconf_to_config_param (cfg)) { +case PIN_CONFIG_DRIVE_OPEN_DRAIN : +return regmap_update_bits (chip->map, +MAX77650_REG_CNFG_GPIO , +MAX77650_GPIO_DRV_MASK , +MAX77650_GPIO_DRV_OPEN_DRAIN ); +case PIN_CONFIG_DRIVE_PUSH_PULL : +return regmap_update_bits (chip->map, +MAX77650_REG_CNFG_GPIO , +MAX77650_GPIO_DRV_MASK , +MAX77650_GPIO_DRV_PUSH_PULL ); +case PIN_CONFIG_INPUT_DEBOUNCE : +return regmap_update_bits (chip->map, +MAX77650_REG_CNFG_GPIO , +MAX77650_GPIO_DEBOUNCE_MASK , +MAX77650_GPIO_DEBOUNCE ); +default : +return -ENOTSUPP ; + } +} + +static int max77650_gpio_to_irq (struct gpio_chip *gc,unsigned int offset) +{ +/* +* TODO Add interrupt support. +* +* We first need to properly support hierarchical irqs in gpiolib +* and regmap irq_chip. +*/ +return -EOPNOTSUPP ; +} + +static int max77650_gpio_probe (struct platform_device *pdev) +{ +struct max77650_gpio_chip *chip; +struct device *dev, *parent; +struct i2c_client *i2c; + + dev = &pdev->dev; + parent = dev->parent; + i2c =to_i2c_client (parent); + + chip =devm_kzalloc (dev,sizeof (*chip),GFP_KERNEL ); +if (!chip) +return -ENOMEM ; + + chip->map =dev_get_regmap (parent,NULL ); +if (!chip->map) +return -ENODEV ; + + chip->gc.base =-1 ; + chip->gc.ngpio =1 ; + chip->gc.label = i2c->name; + chip->gc.parent = dev; + chip->gc.owner =THIS_MODULE ; + chip->gc.can_sleep = true; + + chip->gc.direction_input = max77650_gpio_direction_input; + chip->gc.direction_output = max77650_gpio_direction_output; + chip->gc.set = max77650_gpio_set_value; + chip->gc.get = max77650_gpio_get_value; + chip->gc.get_direction = max77650_gpio_get_direction; + 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); +} + +static struct platform_driver max77650_gpio_driver = { + .driver = { + .name ="max77650-gpio" , + }, + .probe = max77650_gpio_probe, +}; +module_platform_driver (max77650_gpio_driver); + +MODULE_DESCRIPTION ("MAXIM 77650/77651 GPIO driver" ); +MODULE_AUTHOR ("Bartosz Golaszewski <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); --
Quoted 2 lines
2.20.1
I forgot to collect the tag, but Linus left his Reviewed-by:.
Bart
PATCH v3 9/11 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 | 147 +++++++++++++++++++++++++++++++++++ 3 files changed, 154 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 +147 -0
147 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v3 09/11] leds: max77650: add LEDs support
Hi Bartosz,
Thanks for the update.
Quoted 186 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 | 147 +++++++++++++++++++++++++++++++++++ 3 files changed, 154 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 +137
-0@@ -0,0 +1,147 @@ +// 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_LED_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) + +#define MAX77650_LED_MAX_BRIGHTNESS MAX77650_LED_BR_MASK + +/* 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 ; +else + val =MAX77650_LED_ENABLE | brightness; + +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_LED_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_LED_NUM_LEDS ) +return -ENODEV ; + +for_each_child_of_node (of_node, child) { + rv =of_property_read_u32 (child,"reg" , ®); +if (rv || reg >=MAX77650_LED_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; + led->cdev.max_brightness =MAX77650_LED_MAX_BRIGHTNESS ; + + 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 = {
drivers/leds/leds-max77650.c line 147
Quoted 10 lines
drivers/leds/leds-max77650.c new file +10
-0+ .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
Re: [PATCH v3 09/11] leds: max77650: add LEDs support
Hi
Quoted 83 lines · Jacek Anaszewski
Hi Bartosz,
Thanks for the update.
Quoted 78 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| 147 +++++++++++++++++++++++++++++++++++3 files changed, 154 insertions(+)create mode 100644
drivers/leds/leds-max77650.cdrivers/leds/Kconfig +0
-0@@ -608,6 +608,12 @@ config LEDS_TLC591XXThis option enables support for Texas Instruments TLC59108 and TLC59116 LED controllers.
+configLEDS_MAX77650
+ tristate "LED support for Maxim MAX77650 PMIC"
+ depends onMFD_MAX77650
+ help
+ LEDs driver for MAX77650 family of PMICs from Maxim Integrated." +
configLEDS_MAX77693
tristate "LED support for MAX77693 Flash"
depends onLEDS_CLASS_FLASHdrivers/leds/Makefile +0
-0@@ -61,6 +61,7 @@ obj-$(CONFIG_LEDS_MC13783) += leds-mc13783.oobj-$(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 +31
-0@@ -0,0 +1,147 @@ +// 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_LED_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) + +#define MAX77650_LED_MAX_BRIGHTNESS MAX77650_LED_BR_MASK + +/* 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
Quoted 8 lines
drivers/leds/leds-max77650.c line 39
Quoted 8 lines
drivers/leds/leds-max77650.c new file +8
-0+/* 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;
Please don't use camel case.
Quoted 5 lines
Quoted 5 lines
drivers/leds/leds-max77650.c new file +5
-0+}; + +static struct max77650_led *max77650_to_led (struct led_classdev *cdev) +{ + return container_of(cdev, struct max77650_led, cdev);
Quoted 8 lines
drivers/leds/leds-max77650.c line 52
Quoted 8 lines
drivers/leds/leds-max77650.c new file +8
-0+} + +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; +
The register value and bits are only 8 bit why an int?
Quoted 35 lines
Quoted 35 lines
drivers/leds/leds-max77650.c new file +35
-0+ mask = MAX77650_LED_BR_MASK | MAX77650_LED_EN_MASK; + + if (brightness == LED_OFF) + val = MAX77650_LED_DISABLE; + else + val = MAX77650_LED_ENABLE | brightness; + + 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_LED_NUM_LEDS, GFP_KERNEL); + if (!leds) + return -ENOMEM; + + map = dev_get_regmap(dev->parent, NULL); + if (!map)
Quoted 8 lines
drivers/leds/leds-max77650.c line 95
Quoted 8 lines
drivers/leds/leds-max77650.c new file +8
-0+ return -ENODEV; + + num_leds = of_get_child_count(of_node); + if (!num_leds || num_leds > MAX77650_LED_NUM_LEDS) + return -ENODEV; + + for_each_child_of_node(of_node, child) { + rv = of_property_read_u32(child, "reg", ®);
Can we use the fwnode_property_read_u32 call here? And the same for all below as well?
Quoted 56 lines
Quoted 43 lines
drivers/leds/leds-max77650.c new file +42
-0+ if (rv || reg >= MAX77650_LED_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; + led->cdev.max_brightness = MAX77650_LED_MAX_BRIGHTNESS; + + 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 = {drivers/leds/leds-max77650.c line 147
Quoted 10 lines
drivers/leds/leds-max77650.c new file +10
-0+ .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" );Acked-by Jacek Anaszewski <[email protected]>
Signature · 2 lines
------------------ Dan Murphy
Re: [PATCH v3 09/11] leds: max77650: add LEDs support
pt., 1 lut 2019 o 21:15 Dan Murphy <[email protected]> napisał(a):
Quoted 89 lines
Hi
Quoted 85 lines · Jacek Anaszewski
Hi Bartosz,
Thanks for the update.
Quoted 80 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 | 147 +++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+)create mode 100644
drivers/leds/leds-max77650.cdrivers/leds/Kconfig +5
-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 +33
-0@@ -0,0 +1,147 @@ +// 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_LED_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) + +#define MAX77650_LED_MAX_BRIGHTNESS MAX77650_LED_BR_MASK + +/* 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)
Quoted 9 lines
Quoted 6 lines
drivers/leds/leds-max77650.c line 39
Quoted 6 lines
drivers/leds/leds-max77650.c new file +6
-0+ +struct max77650_led { +struct led_classdev cdev; +struct regmap *map; +unsigned int regA; +unsigned int regB;Please don't use camel case.
Sorry, but this is pointless nitpicking. The registers are referred to in the manual as LED[012]_A and LED[012]_B so these variable names reflect that. The difference between ThisKindOfCamelCase and regA/regB is obvious. It's much more readable than for example rega or reg_a. I also used the same approach in the regulator module and there were no complaints.
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/leds/leds-max77650.c new file +7
-0+}; + +static struct max77650_led *max77650_to_led (struct led_classdev *cdev) +{ + return container_of(cdev, struct max77650_led, cdev); +} +
Quoted 9 lines
Quoted 6 lines
drivers/leds/leds-max77650.c line 52
Quoted 6 lines
drivers/leds/leds-max77650.c new file +6
-0+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; +The register value and bits are only 8 bit why an int?
Because regmap_update_bits() deals with 32-bit integers. There's no hurt and it's less confusing.
Quoted 38 lines
Quoted 38 lines
Quoted 38 lines
drivers/leds/leds-max77650.c new file +38
-0+ mask =MAX77650_LED_BR_MASK |MAX77650_LED_EN_MASK ; + +if (brightness ==LED_OFF ) + val =MAX77650_LED_DISABLE ; +else + val =MAX77650_LED_ENABLE | brightness; + +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_LED_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);
Quoted 10 lines
Quoted 5 lines
drivers/leds/leds-max77650.c line 95
Quoted 5 lines
drivers/leds/leds-max77650.c new file +5
-0+if (!num_leds || num_leds >MAX77650_LED_NUM_LEDS ) +return -ENODEV ; + +for_each_child_of_node (of_node, child) { + rv =of_property_read_u32 (child,"reg" , ®);Can we use the
fwnode_property_read_u32call here? And the same for all below as well?
Of course we can. But why? This is a low-power PMIC. Is there really a chance that a non-DT system will want to use it? If so - we will be able to convert it if needed. For now: I'd stick with of_* functions.
Quoted 58 lines
Quoted 47 lines
Quoted 47 lines
drivers/leds/leds-max77650.c new file +47
-0+if (rv || reg >=MAX77650_LED_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; + led->cdev.max_brightness =MAX77650_LED_MAX_BRIGHTNESS ; + + 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, +};Quoted 9 lines
drivers/leds/leds-max77650.c line 147
Quoted 6 lines
drivers/leds/leds-max77650.c new file +5
-0+module_platform_driver (max77650_led_driver); + +MODULE_DESCRIPTION ("MAXIM 77650/77651 LED driver" ); +MODULE_AUTHOR ("Bartosz Golaszewski <[email protected]>" ); +MODULE_LICENSE ("GPL v2" );Acked-by Jacek Anaszewski <[email protected]>
Quoted 3 lines
--
------------------
Dan Murphy
Best regards,
Bartosz Golaszewski
Re: [PATCH v3 09/11] leds: max77650: add LEDs support
In reply to Dan MurphyHi!
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/leds/leds-max77650.c new file +5
-0+static struct max77650_led *max77650_to_led (struct led_classdev *cdev) +{ + return container_of(cdev, struct max77650_led, cdev); +} +
Quoted 8 lines
Quoted 6 lines
drivers/leds/leds-max77650.c line 52
Quoted 6 lines
drivers/leds/leds-max77650.c new file +6
-0+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; +The register value and bits are only 8 bit why an int?
int is word size CPU prefers. It is ok here. If you force u8, it may actually result in slower/bigger code.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v3 09/11] leds: max77650: add LEDs support
In reply to Bartosz GolaszewskiQuoted 6 lines
drivers/leds/Kconfig +0
-0
drivers/leds/Kconfig config LEDS_TLC591XX · line 616
Quoted 9 lines
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." +
List the chips? Remove extra "?
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v3 09/11] leds: max77650: add LEDs support
wt., 12 lut 2019 o 13:12 Pavel Machek <[email protected]> napisał(a):
Quoted 10 lines
Quoted 10 lines
drivers/leds/Kconfig +0
-0@@ -608,6 +608,12 @@ config LEDS_TLC591XX This option enables support for Texas Instruments TLC59108 and TLC59116 LED controllers.
Quoted 9 lines
drivers/leds/Kconfig config LEDS_TLC591XX · line 616
Quoted 6 lines
drivers/leds/Kconfig +6
-0+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." +List the chips? Remove extra "?
Pavel
They are already listed in the core mfd Kconfig, but thanks for spotting that stray ".
Bart
kbuild test robot
build botRe: [PATCH v3 09/11] leds: max77650: add LEDs support
In reply to Bartosz GolaszewskiI love your patch! Yet something to improve:
Hi Bartosz,
I love your patch! Yet something to improve:
[auto build test ERROR on ljones-mfd/for-mfd-next]
[also build test ERROR on v5.0-rc4 next-20190212]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Bartosz-Golaszewski/mfd-add-support-for-max77650-PMIC/20190203-031133 base: https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git for-mfd-next config: x86_64-randconfig-s5-02140238 (attached as .config) compiler: gcc-8 (Debian 8.2.0-20) 8.2.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
All errors (new ones prefixed by >>):
ld: drivers/leds/leds-max77650.o: in function `max77650_led_probe':
>> drivers/leds/leds-max77650.c:119: undefined reference to `devm_of_led_classdev_register'
vim +119 drivers/leds/leds-max77650.c
62
63 static int max77650_led_probe(struct platform_device *pdev)
64 {
65 struct device_node *of_node, *child;
66 struct max77650_led *leds, *led;
67 struct device *parent;
68 struct device *dev;
69 struct regmap *map;
70 const char *label;
71 int rv, num_leds;
72 u32 reg;
73
74 dev = &pdev->dev;
75 parent = dev->parent;
76 of_node = dev->of_node;
77
78 if (!of_node)
79 return -ENODEV;
80
81 leds = devm_kcalloc(dev, sizeof(*leds),
82 MAX77650_LED_NUM_LEDS, GFP_KERNEL);
83 if (!leds)
84 return -ENOMEM;
85
86 map = dev_get_regmap(dev->parent, NULL);
87 if (!map)
88 return -ENODEV;
89
90 num_leds = of_get_child_count(of_node);
91 if (!num_leds || num_leds > MAX77650_LED_NUM_LEDS)
92 return -ENODEV;
93
94 for_each_child_of_node(of_node, child) {
95 rv = of_property_read_u32(child, "reg", ®);
96 if (rv || reg >= MAX77650_LED_NUM_LEDS)
97 return -EINVAL;
98
99 led = &leds[reg];
100 led->map = map;
101 led->regA = MAX77650_LED_A_BASE + reg;
102 led->regB = MAX77650_LED_B_BASE + reg;
103 led->cdev.brightness_set_blocking = max77650_led_brightness_set;
104 led->cdev.max_brightness = MAX77650_LED_MAX_BRIGHTNESS;
105
106 label = of_get_property(child, "label", NULL);
107 if (!label) {
108 led->cdev.name = "max77650::";
109 } else {
110 led->cdev.name = devm_kasprintf(dev, GFP_KERNEL,
111 "max77650:%s", label);
112 if (!led->cdev.name)
113 return -ENOMEM;
114 }
115
116 of_property_read_string(child, "linux,default-trigger",
117 &led->cdev.default_trigger);
118
> 119 rv = devm_of_led_classdev_register(dev, child, &led->cdev); 120 if (rv)
121 return rv;
122
123 rv = regmap_write(map, led->regA, MAX77650_LED_A_DEFAULT);
124 if (rv)
125 return rv;
126
127 rv = regmap_write(map, led->regB, MAX77650_LED_B_DEFAULT);
128 if (rv)
129 return rv;
130 }
131
132 return regmap_write(map,
133 MAX77650_REG_CNFG_LED_TOP,
134 MAX77650_LED_TOP_DEFAULT);
135 }
136
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
PATCH v3 10/11 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 v3 10/11] input: max77650: add onkey support
Hi!
Quoted 11 lines
drivers/input/misc/max77650-onkey.c new file +11
-0+ error =device_property_read_string (dev, +"maxim,onkey-mode" , &mode_prop); +if (error) + mode_prop ="push" ; + +if (strcmp (mode_prop,"push" ) ==0 ) + mode =MAX77650_ONKEY_MODE_PUSH ; +else if (strcmp (mode_prop,"slide" ) ==0 ) + mode =MAX77650_ONKEY_MODE_SLIDE ; +else +return -EINVAL ;
...
drivers/input/misc/max77650-onkey.c line 100
Quoted 4 lines
drivers/input/misc/max77650-onkey.c new file +4
-0+ onkey->input->name ="max77650_onkey" ; + onkey->input->phys ="max77650_onkey/input0" ; + onkey->input->id.bustype =BUS_I2C ; +input_set_capability (onkey->input,EV_KEY , onkey->code);
Is EV_KEY correct for mode==slide?
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [PATCH v3 10/11] input: max77650: add onkey support
wt., 12 lut 2019 o 13:17 Pavel Machek <[email protected]> napisał(a):
Quoted 14 lines
Hi!
drivers/input/misc/max77650-onkey.c line 78
Quoted 11 lines
drivers/input/misc/max77650-onkey.c new file +11
-0+ error =device_property_read_string (dev, +"maxim,onkey-mode" , &mode_prop); +if (error) + mode_prop ="push" ; + +if (strcmp (mode_prop,"push" ) ==0 ) + mode =MAX77650_ONKEY_MODE_PUSH ; +else if (strcmp (mode_prop,"slide" ) ==0 ) + mode =MAX77650_ONKEY_MODE_SLIDE ; +else +return -EINVAL ;
Quoted 8 lines
...
drivers/input/misc/max77650-onkey.c line 100
Quoted 4 lines
drivers/input/misc/max77650-onkey.c new file +4
-0+ onkey->input->name ="max77650_onkey" ; + onkey->input->phys ="max77650_onkey/input0" ; + onkey->input->id.bustype =BUS_I2C ; +input_set_capability (onkey->input,EV_KEY , onkey->code);Is
EV_KEYcorrect for mode==slide?
Others are not really documented. Does EV_SW stand for switch event? In that case it would probably be better.
Bart
Re: [PATCH v3 10/11] input: max77650: add onkey support
Quoted 21 lines · Bartosz Golaszewski
wt., 12 lut 2019 o 13:17 Pavel Machek <[email protected]> napisał(a):
Quoted 20 lines
Hi!
Quoted 11 lines
drivers/input/misc/max77650-onkey.c new file +11
-0+ error =device_property_read_string (dev, +"maxim,onkey-mode" , &mode_prop); +if (error) + mode_prop ="push" ; + +if (strcmp (mode_prop,"push" ) ==0 ) + mode =MAX77650_ONKEY_MODE_PUSH ; +else if (strcmp (mode_prop,"slide" ) ==0 ) + mode =MAX77650_ONKEY_MODE_SLIDE ; +else +return -EINVAL ;...
Quoted 4 lines
drivers/input/misc/max77650-onkey.c new file +4
-0+ onkey->input->name ="max77650_onkey" ; + onkey->input->phys ="max77650_onkey/input0" ; + onkey->input->id.bustype =BUS_I2C ; +input_set_capability (onkey->input,EV_KEY , onkey->code);
Quoted 5 lines
Quoted 2 lines
Is
EV_KEYcorrect for mode==slide?Others are not really documented. Does
EV_SWstand for switch event? In that case it would probably be better.
I believe so.
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH v3 11/11 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