Skip to contentSkip to conversation

mfd: add support for max77650 PMIC

PATCH Superseded Bartosz Golaszewski 5 participants 30 messages Feb 5, 2019 – Feb 13, 2019

Subsystems (8)

v4 of 10 Superseded Latest is v10 →

lore
Share & tools
lore
#0 lore raw

v4 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-4 add the DT binding documents. Patches 5-9 add all drivers. Last patch adds a MAINTAINERS entry for this device.

The regulator part has already been picked up into the regulator tree.

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

v3 -> v4:

GPIO:
- as discussed with Linus Walleij: the gpio-controller is now part of the core mfd module (we don't spawn a sub-node anymore), the binding document for GPIO has been dropped, the GPIO properties have been defined in the binding document for the mfd core, the interrupt functionality has been reintroduced with the irq directly passed from the mfd part
- due to the above changes the Reviewed-by tag from Linus was dropped

Bartosz Golaszewski (10):
dt-bindings: mfd: add DT bindings for max77650
dt-bindings: power: supply: 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/input/max77650-onkey.txt         |  26 ++
 .../bindings/leds/leds-max77650.txt           |  57 +++
 .../devicetree/bindings/mfd/max77650.txt      |  47 +++
 .../power/supply/max77650-charger.txt         |  27 ++
 MAINTAINERS                                   |  14 +
 drivers/gpio/Kconfig                          |   7 +
 drivers/gpio/Makefile                         |   1 +
 drivers/gpio/gpio-max77650.c                  | 190 ++++++++++
 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 +++
 21 files changed, 1436 insertions(+)
 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
#1 lore raw

PATCH v4 1/10 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 and the GPIO module.

---
 .../devicetree/bindings/mfd/max77650.txt      | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mfd/max77650.txt
Documentation/devicetree/bindings/mfd/max77650.txt new file +47 -0
new file mode 100644
index 000000000000..0a40e9c6aab8
@@ -0,0 +1,47 @@
+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>.
+
+- 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.
+
+The GPIO-controller module is represented as part of the top-level PMIC
+node. The device exposes a single GPIO line.
+
+For device-tree bindings of other sub-modules (regulator, power supply,
+LEDs and onkey) refer to the binding documents under the respective
+sub-system directories.
+
+For more details on GPIO bindings, please refer to the generic GPIO DT
+binding document <devicetree/bindings/gpio/gpio.txt>.
+
+Example:
+--------
+
+	pmic: max77650@48 {
+		compatible = "maxim,max77650";
+		reg = <0x48>;
+
+		interrupt-controller;
+		interrupt-parent = <&gpio2>;
+		#interrupt-cells = <2>;
+		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+
+		gpio-controller;
+		#gpio-cells = <2>;
+		gpio-line-names = "max77650-charger";
+	};
Signature · 1 line
2.20.1
#3 lore raw

PATCH v4 2/10 dt-bindings: power: supply: add DT bindings for max77650

In reply to Bartosz Golaszewski

From: 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
new file mode 100644
index 000000000000..f3e00d41e299
@@ -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
#4 lore raw

PATCH v4 3/10 dt-bindings: leds: add DT bindings for max77650

In reply to Bartosz Golaszewski

From: 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
new file mode 100644
index 000000000000..3a67115cc1da
@@ -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
#5 lore raw

PATCH v4 4/10 dt-bindings: input: add DT bindings for max77650

In reply to Bartosz Golaszewski

From: 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
new file mode 100644
index 000000000000..37c80898be4d
@@ -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
#6 lore raw

PATCH v4 5/10 mfd: max77650: new core mfd driver

In reply to 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.

---
 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
index 76f9909cf396..a80c3fe80fbe 100644
@@ -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
index 12980a4ad460..3b912a4015d1 100644
@@ -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
#7 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

Quoted 166 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.

---
 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
index 76f9909cf396..a80c3fe80fbe 100644
@@ -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
index 12980a4ad460..3b912a4015d1 100644
@@ -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 +111 -0
new file mode 100644
index 000000000000..7c6164f1fde4
@@ -0,0 +1,342 @@
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2018 BayLibre SAS
+// Author: Bartosz Golaszewski <[email protected]>
+//
+// Core MFD driver for MAXIM 77650/77651 charger/power-supply.
+
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/max77650.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+#define MAX77650_INT_GPI_F_MSK		BIT(0)
+#define MAX77650_INT_GPI_R_MSK		BIT(1)
+#define MAX77650_INT_GPI_MSK \
+			(MAX77650_INT_GPI_F_MSK | MAX77650_INT_GPI_R_MSK)
+#define MAX77650_INT_nEN_F_MSK		BIT(2)
+#define MAX77650_INT_nEN_R_MSK		BIT(3)
+#define MAX77650_INT_TJAL1_R_MSK	BIT(4)
+#define MAX77650_INT_TJAL2_R_MSK	BIT(5)
+#define MAX77650_INT_DOD_R_MSK		BIT(6)
+
+#define MAX77650_INT_THM_MSK		BIT(0)
+#define MAX77650_INT_CHG_MSK		BIT(1)
+#define MAX77650_INT_CHGIN_MSK		BIT(2)
+#define MAX77650_INT_TJ_REG_MSK		BIT(3)
+#define MAX77650_INT_CHGIN_CTRL_MSK	BIT(4)
+#define MAX77650_INT_SYS_CTRL_MSK	BIT(5)
+#define MAX77650_INT_SYS_CNFG_MSK	BIT(6)
+
+#define MAX77650_INT_GLBL_OFFSET	0
+#define MAX77650_INT_CHG_OFFSET		1
+
+#define MAX77650_SBIA_LPM_MASK		BIT(5)
+#define MAX77650_SBIA_LPM_DISABLED	0x00
+
+enum {
+	MAX77650_INT_GPI = 0,
+	MAX77650_INT_nEN_F,
+	MAX77650_INT_nEN_R,
+	MAX77650_INT_TJAL1_R,
+	MAX77650_INT_TJAL2_R,
+	MAX77650_INT_DOD_R,
+	MAX77650_INT_THM,
+	MAX77650_INT_CHG,
+	MAX77650_INT_CHGIN,
+	MAX77650_INT_TJ_REG,
+	MAX77650_INT_CHGIN_CTRL,
+	MAX77650_INT_SYS_CTRL,
+	MAX77650_INT_SYS_CNFG,
+};
+
+enum {
+	MAX77650_CELL_REGULATOR = 0,
+	MAX77650_CELL_CHARGER,
+	MAX77650_CELL_GPIO,
+	MAX77650_CELL_LED,
+	MAX77650_CELL_ONKEY,
+	MAX77650_NUM_CELLS,
+};
+
+struct max77650_irq_mapping {
+	int cell_num;
+	const int *irqs;
+	const char *const *irq_names;
+	unsigned int num_irqs;
+};
+
+static const int max77650_charger_irqs[] = {
+	MAX77650_INT_CHG,
+	MAX77650_INT_CHGIN,
+};
+
+static const int max77650_gpio_irqs[] = {
+	MAX77650_INT_GPI,
+};
+
+static const int max77650_onkey_irqs[] = {
+	MAX77650_INT_nEN_F,
+	MAX77650_INT_nEN_R,
+};
+
+static const char *const max77650_charger_irq_names[] = {
+	"CHG",
+	"CHGIN",
+};
+
+static const char *const max77650_gpio_irq_names[] = {
+	"GPI",
+};
+
+static const char *const max77650_onkey_irq_names[] = {
+	"nEN_F",
+	"nEN_R",
+};
+
+static const struct max77650_irq_mapping max77650_irq_mapping_table[] = {
+	{
+		.cell_num	= MAX77650_CELL_CHARGER,
+		.irqs		= max77650_charger_irqs,
+		.irq_names	= max77650_charger_irq_names,
+		.num_irqs	= ARRAY_SIZE(max77650_charger_irqs),
+	},
+	{
+		.cell_num	= MAX77650_CELL_GPIO,
+		.irqs		= max77650_gpio_irqs,

drivers/mfd/max77650.c line 121

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+		.irq_names	= max77650_gpio_irq_names,
+		.num_irqs	= ARRAY_SIZE(max77650_gpio_irqs),
+	},
+	{
+		.cell_num	= MAX77650_CELL_ONKEY,
+		.irqs		= max77650_onkey_irqs,
+		.irq_names	= max77650_onkey_irq_names,
+		.num_irqs	= ARRAY_SIZE(max77650_onkey_irqs),
+	},
+};

This is all a bit convoluted and nasty TBH.

Quoted 12 lines
drivers/mfd/max77650.c new file +12 -0
+static const struct mfd_cell max77650_cells[] = {
+	[MAX77650_CELL_REGULATOR] = {
+		.name		= "max77650-regulator",
+		.of_compatible	= "maxim,max77650-regulator",
+	},
+	[MAX77650_CELL_CHARGER] = {
+		.name		= "max77650-charger",
+		.of_compatible	= "maxim,max77650-charger",
+	},
+	[MAX77650_CELL_GPIO] = {
+		.name		= "max77650-gpio",
+		.of_compatible	= "maxim,max77650-gpio",

drivers/mfd/max77650.c line 144

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+	},
+	[MAX77650_CELL_LED] = {
+		.name		= "max77650-led",
+		.of_compatible	= "maxim,max77650-led",
+	},
+	[MAX77650_CELL_ONKEY] = {
+		.name		= "max77650-onkey",
+		.of_compatible	= "maxim,max77650-onkey",
+	},
+};

Why are you numbering the cells? There is no need to do this.

Quoted 49 lines
drivers/mfd/max77650.c new file +49 -0
+static const struct regmap_irq max77650_irqs[] = {
+	[MAX77650_INT_GPI] = {
+		.reg_offset		= MAX77650_INT_GLBL_OFFSET,
+		.mask			= MAX77650_INT_GPI_MSK,
+		.type = {
+			.type_falling_val	= MAX77650_INT_GPI_F_MSK,
+			.type_rising_val	= MAX77650_INT_GPI_R_MSK,
+			.types_supported	= IRQ_TYPE_EDGE_BOTH,
+		},
+	},
+	[MAX77650_INT_nEN_F] = {
+		.reg_offset		= MAX77650_INT_GLBL_OFFSET,
+		.mask			= MAX77650_INT_nEN_F_MSK,
+	},
+	[MAX77650_INT_nEN_R] = {
+		.reg_offset		= MAX77650_INT_GLBL_OFFSET,
+		.mask			= MAX77650_INT_nEN_R_MSK,
+	},
+	[MAX77650_INT_TJAL1_R] = {
+		.reg_offset		= MAX77650_INT_GLBL_OFFSET,
+		.mask			= MAX77650_INT_TJAL1_R_MSK,
+	},
+	[MAX77650_INT_TJAL2_R] = {
+		.reg_offset		= MAX77650_INT_GLBL_OFFSET,
+		.mask			= MAX77650_INT_TJAL2_R_MSK,
+	},
+	[MAX77650_INT_DOD_R] = {
+		.reg_offset		= MAX77650_INT_GLBL_OFFSET,
+		.mask			= MAX77650_INT_DOD_R_MSK,
+	},
+	[MAX77650_INT_THM] = {
+		.reg_offset		= MAX77650_INT_CHG_OFFSET,
+		.mask			= MAX77650_INT_THM_MSK,
+	},
+	[MAX77650_INT_CHG] = {
+		.reg_offset		= MAX77650_INT_CHG_OFFSET,
+		.mask			= MAX77650_INT_CHG_MSK,
+	},
+	[MAX77650_INT_CHGIN] = {
+		.reg_offset		= MAX77650_INT_CHG_OFFSET,
+		.mask			= MAX77650_INT_CHGIN_MSK,
+	},
+	[MAX77650_INT_TJ_REG] = {
+		.reg_offset		= MAX77650_INT_CHG_OFFSET,
+		.mask			= MAX77650_INT_TJ_REG_MSK,
+	},
+	[MAX77650_INT_CHGIN_CTRL] = {
+		.reg_offset		= MAX77650_INT_CHG_OFFSET,
+		.mask			= MAX77650_INT_CHGIN_CTRL_MSK,

drivers/mfd/max77650.c line 204

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+	},
+	[MAX77650_INT_SYS_CTRL] = {
+		.reg_offset		= MAX77650_INT_CHG_OFFSET,
+		.mask			= MAX77650_INT_SYS_CTRL_MSK,
+	},
+	[MAX77650_INT_SYS_CNFG] = {
+		.reg_offset		= MAX77650_INT_CHG_OFFSET,
+		.mask			= MAX77650_INT_SYS_CNFG_MSK,
+	},
+};

If you get rid of all of the horrible hoop jumping in *_setup_irqs(), you can use REGMAP_IRQ_REG() like everyone else does.

Quoted 27 lines
drivers/mfd/max77650.c new file +27 -0
+static const struct regmap_irq_chip max77650_irq_chip = {
+	.name			= "max77650-irq",
+	.irqs			= max77650_irqs,
+	.num_irqs		= ARRAY_SIZE(max77650_irqs),
+	.num_regs		= 2,
+	.status_base		= MAX77650_REG_INT_GLBL,
+	.mask_base		= MAX77650_REG_INTM_GLBL,
+	.type_in_mask		= true,
+	.type_invert		= true,
+	.init_ack_masked	= true,
+	.clear_on_unmask	= true,
+};
+
+static const struct regmap_config max77650_regmap_config = {
+	.name		= "max77650",
+	.reg_bits	= 8,
+	.val_bits	= 8,
+};
+
+static int max77650_setup_irqs(struct device *dev, struct mfd_cell *cells)
+{
+	const struct max77650_irq_mapping *mapping;
+	struct regmap_irq_chip_data *irq_data;
+	struct i2c_client *i2c;
+	struct mfd_cell *cell;
+	struct resource *res;
+	struct regmap *map;

drivers/mfd/max77650.c line 242

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+	int i, j, irq, rv;
+
+	i2c = to_i2c_client(dev);
+
+	map = dev_get_regmap(dev, NULL);
+	if (!map)
+		return -ENODEV;
+
+	rv = devm_regmap_add_irq_chip(dev, map, i2c->irq,
+				      IRQF_ONESHOT | IRQF_SHARED, -1,

What is -1? Are you sure this isn't defined somewhere?

Quoted 16 lines
drivers/mfd/max77650.c new file +16 -0
+				      &max77650_irq_chip, &irq_data);
+	if (rv)
+		return rv;
+
+	for (i = 0; i < ARRAY_SIZE(max77650_irq_mapping_table); i++) {
+		mapping = &max77650_irq_mapping_table[i];
+		cell = &cells[mapping->cell_num];
+
+		res = devm_kcalloc(dev, sizeof(*res),
+				   mapping->num_irqs, GFP_KERNEL);
+		if (!res)
+			return -ENOMEM;
+
+		cell->resources = res;
+		cell->num_resources = mapping->num_irqs;
+

drivers/mfd/max77650.c line 268

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+		for (j = 0; j < mapping->num_irqs; j++) {
+			irq = regmap_irq_get_virq(irq_data, mapping->irqs[j]);
+			if (irq < 0)
+				return irq;
+
+			res[j].start = res[j].end = irq;
+			res[j].flags = IORESOURCE_IRQ;
+			res[j].name = mapping->irq_names[j];
+		}
+	}

This is the first time I've seen it done like this (and I hate it).

Why are you storing the virqs in resources?

I think this is highly irregular.

drivers/mfd/max77650.c line 282

Quoted 13 lines
drivers/mfd/max77650.c new file +13 -0
+	return 0;
+}
+
+static int max77650_i2c_probe(struct i2c_client *i2c)
+{
+	struct device *dev = &i2c->dev;
+	struct mfd_cell *cells;
+	struct regmap *map;
+	unsigned int val;
+	int rv;
+
+	map = devm_regmap_init_i2c(i2c, &max77650_regmap_config);
+	if (IS_ERR(map))

What error messages does devm_regmap_init_i2c() report? Does it print out its own error messages internally? If not it would be better to provide a suitable error message here.

drivers/mfd/max77650.c line 286

Quoted 4 lines
drivers/mfd/max77650.c new file +4 -0
+		return PTR_ERR(map);
+
+	rv = regmap_read(map, MAX77650_REG_CID, &val);
+	if (rv)

Better to provide a suitable error message here.

drivers/mfd/max77650.c line 295

Quoted 9 lines
drivers/mfd/max77650.c new file +9 -0
+		return rv;
+
+	switch (MAX77650_CID_BITS(val)) {
+	case MAX77650_CID_77650A:
+	case MAX77650_CID_77650C:
+	case MAX77650_CID_77651A:
+	case MAX77650_CID_77651B:
+		break;
+	default:

Better to provide a suitable error message here.

Quoted 4 lines
drivers/mfd/max77650.c new file +4 -0
+		return -ENODEV;
+	}
+
+	/*

drivers/mfd/max77650.c line 309

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+	 * This IC has a low-power mode which reduces the quiescent current
+	 * consumption to ~5.6uA but is only suitable for systems consuming
+	 * less than ~2mA. Since this is not likely the case even on
+	 * linux-based wearables - keep the chip in normal power mode.
+	 */
+	rv = regmap_update_bits(map,
+				MAX77650_REG_CNFG_GLBL,
+				MAX77650_SBIA_LPM_MASK,
+				MAX77650_SBIA_LPM_DISABLED);
+	if (rv)

Better to provide a suitable error message here.

drivers/mfd/max77650.c line 321

Quoted 12 lines
drivers/mfd/max77650.c new file +12 -0
+		return rv;
+
+	cells = devm_kmemdup(dev, max77650_cells,
+			     sizeof(max77650_cells), GFP_KERNEL);
+	if (!cells)
+		return -ENOMEM;
+
+	rv = max77650_setup_irqs(dev, cells);
+	if (rv)
+		return rv;
+
+	return devm_mfd_add_devices(dev, -1, cells,

Use the correct defines instead of -1.

git grep mfd_add_devices

Quoted 86 lines
drivers/mfd/max77650.c new file +21 -0
+				    MAX77650_NUM_CELLS, NULL, 0, NULL);
+}
+
+static const struct of_device_id max77650_of_match[] = {
+	{ .compatible = "maxim,max77650" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, max77650_of_match);
+
+static struct i2c_driver max77650_i2c_driver = {
+	.driver = {
+		.name = "max77650",
+		.of_match_table = of_match_ptr(max77650_of_match),
+	},
+	.probe_new = max77650_i2c_probe,
+};
+module_i2c_driver(max77650_i2c_driver);
+
+MODULE_DESCRIPTION("MAXIM 77650/77651 multi-function core driver");
+MODULE_AUTHOR("Bartosz Golaszewski <[email protected]>");
+MODULE_LICENSE("GPL v2");
include/linux/mfd/max77650.h new file +59 -0
new file mode 100644
index 000000000000..c809e211a8cd
@@ -0,0 +1,59 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2018 BayLibre SAS
+ * Author: Bartosz Golaszewski <[email protected]>
+ *
+ * Common definitions for MAXIM 77650/77651 charger/power-supply.
+ */
+
+#ifndef MAX77650_H
+#define MAX77650_H
+
+#include <linux/bits.h>
+
+#define MAX77650_REG_INT_GLBL		0x00
+#define MAX77650_REG_INT_CHG		0x01
+#define MAX77650_REG_STAT_CHG_A		0x02
+#define MAX77650_REG_STAT_CHG_B		0x03
+#define MAX77650_REG_ERCFLAG		0x04
+#define MAX77650_REG_STAT_GLBL		0x05
+#define MAX77650_REG_INTM_GLBL		0x06
+#define MAX77650_REG_INTM_CHG		0x07
+#define MAX77650_REG_CNFG_GLBL		0x10
+#define MAX77650_REG_CID		0x11
+#define MAX77650_REG_CNFG_GPIO		0x12
+#define MAX77650_REG_CNFG_CHG_A		0x18
+#define MAX77650_REG_CNFG_CHG_B		0x19
+#define MAX77650_REG_CNFG_CHG_C		0x1a
+#define MAX77650_REG_CNFG_CHG_D		0x1b
+#define MAX77650_REG_CNFG_CHG_E		0x1c
+#define MAX77650_REG_CNFG_CHG_F		0x1d
+#define MAX77650_REG_CNFG_CHG_G		0x1e
+#define MAX77650_REG_CNFG_CHG_H		0x1f
+#define MAX77650_REG_CNFG_CHG_I		0x20
+#define MAX77650_REG_CNFG_SBB_TOP	0x28
+#define MAX77650_REG_CNFG_SBB0_A	0x29
+#define MAX77650_REG_CNFG_SBB0_B	0x2a
+#define MAX77650_REG_CNFG_SBB1_A	0x2b
+#define MAX77650_REG_CNFG_SBB1_B	0x2c
+#define MAX77650_REG_CNFG_SBB2_A	0x2d
+#define MAX77650_REG_CNFG_SBB2_B	0x2e
+#define MAX77650_REG_CNFG_LDO_A		0x38
+#define MAX77650_REG_CNFG_LDO_B		0x39
+#define MAX77650_REG_CNFG_LED0_A	0x40
+#define MAX77650_REG_CNFG_LED1_A	0x41
+#define MAX77650_REG_CNFG_LED2_A	0x42
+#define MAX77650_REG_CNFG_LED0_B	0x43
+#define MAX77650_REG_CNFG_LED1_B	0x44
+#define MAX77650_REG_CNFG_LED2_B	0x45
+#define MAX77650_REG_CNFG_LED_TOP	0x46
+
+#define MAX77650_CID_MASK		GENMASK(3, 0)
+#define MAX77650_CID_BITS(_reg)		(_reg & MAX77650_CID_MASK)
+
+#define MAX77650_CID_77650A		0x03
+#define MAX77650_CID_77650C		0x0a
+#define MAX77650_CID_77651A		0x06
+#define MAX77650_CID_77651B		0x08
+
+#endif /* MAX77650_H */
Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#8 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

wt., 12 lut 2019 o 09:36 Lee Jones <[email protected]> napisał(a):

Quoted 198 lines · Bartosz Golaszewski
Quoted 167 lines

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.

---
 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
index 76f9909cf396..a80c3fe80fbe 100644
@@ -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
index 12980a4ad460..3b912a4015d1 100644
@@ -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 +111 -0
new file mode 100644
index 000000000000..7c6164f1fde4
@@ -0,0 +1,342 @@
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2018 BayLibre SAS
+// Author: Bartosz Golaszewski <[email protected]>
+//
+// Core MFD driver for MAXIM 77650/77651 charger/power-supply.
+
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/max77650.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+#define MAX77650_INT_GPI_F_MSK               BIT(0)
+#define MAX77650_INT_GPI_R_MSK               BIT(1)
+#define MAX77650_INT_GPI_MSK \
+                     (MAX77650_INT_GPI_F_MSK | MAX77650_INT_GPI_R_MSK)
+#define MAX77650_INT_nEN_F_MSK               BIT(2)
+#define MAX77650_INT_nEN_R_MSK               BIT(3)
+#define MAX77650_INT_TJAL1_R_MSK     BIT(4)
+#define MAX77650_INT_TJAL2_R_MSK     BIT(5)
+#define MAX77650_INT_DOD_R_MSK               BIT(6)
+
+#define MAX77650_INT_THM_MSK         BIT(0)
+#define MAX77650_INT_CHG_MSK         BIT(1)
+#define MAX77650_INT_CHGIN_MSK               BIT(2)
+#define MAX77650_INT_TJ_REG_MSK              BIT(3)
+#define MAX77650_INT_CHGIN_CTRL_MSK  BIT(4)
+#define MAX77650_INT_SYS_CTRL_MSK    BIT(5)
+#define MAX77650_INT_SYS_CNFG_MSK    BIT(6)
+
+#define MAX77650_INT_GLBL_OFFSET     0
+#define MAX77650_INT_CHG_OFFSET              1
+
+#define MAX77650_SBIA_LPM_MASK               BIT(5)
+#define MAX77650_SBIA_LPM_DISABLED   0x00
+
+enum {
+     MAX77650_INT_GPI = 0,
+     MAX77650_INT_nEN_F,
+     MAX77650_INT_nEN_R,
+     MAX77650_INT_TJAL1_R,
+     MAX77650_INT_TJAL2_R,
+     MAX77650_INT_DOD_R,
+     MAX77650_INT_THM,
+     MAX77650_INT_CHG,
+     MAX77650_INT_CHGIN,
+     MAX77650_INT_TJ_REG,
+     MAX77650_INT_CHGIN_CTRL,
+     MAX77650_INT_SYS_CTRL,
+     MAX77650_INT_SYS_CNFG,
+};
+
+enum {
+     MAX77650_CELL_REGULATOR = 0,
+     MAX77650_CELL_CHARGER,
+     MAX77650_CELL_GPIO,
+     MAX77650_CELL_LED,
+     MAX77650_CELL_ONKEY,
+     MAX77650_NUM_CELLS,
+};
+
+struct max77650_irq_mapping {
+     int cell_num;
+     const int *irqs;
+     const char *const *irq_names;
+     unsigned int num_irqs;
+};
+
+static const int max77650_charger_irqs[] = {
+     MAX77650_INT_CHG,
+     MAX77650_INT_CHGIN,
+};
+
+static const int max77650_gpio_irqs[] = {
+     MAX77650_INT_GPI,
+};
+
+static const int max77650_onkey_irqs[] = {
+     MAX77650_INT_nEN_F,
+     MAX77650_INT_nEN_R,
+};
+
+static const char *const max77650_charger_irq_names[] = {
+     "CHG",
+     "CHGIN",
+};
+
+static const char *const max77650_gpio_irq_names[] = {
+     "GPI",
+};
+
+static const char *const max77650_onkey_irq_names[] = {
+     "nEN_F",
+     "nEN_R",
+};
+
+static const struct max77650_irq_mapping max77650_irq_mapping_table[] = {
+     {
+             .cell_num       = MAX77650_CELL_CHARGER,
+             .irqs           = max77650_charger_irqs,
+             .irq_names      = max77650_charger_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_charger_irqs),
+     },
+     {
+             .cell_num       = MAX77650_CELL_GPIO,
+             .irqs           = max77650_gpio_irqs,

drivers/mfd/max77650.c line 121

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+             .irq_names      = max77650_gpio_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_gpio_irqs),
+     },
+     {
+             .cell_num       = MAX77650_CELL_ONKEY,
+             .irqs           = max77650_onkey_irqs,
+             .irq_names      = max77650_onkey_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_onkey_irqs),
+     },
+};

This is all a bit convoluted and nasty TBH.

Quoted 16 lines
drivers/mfd/max77650.c new file +16 -0
+static const struct mfd_cell max77650_cells[] = {
+     [MAX77650_CELL_REGULATOR] = {
+             .name           = "max77650-regulator",
+             .of_compatible  = "maxim,max77650-regulator",
+     },
+     [MAX77650_CELL_CHARGER] = {
+             .name           = "max77650-charger",
+             .of_compatible  = "maxim,max77650-charger",
+     },
+     [MAX77650_CELL_GPIO] = {
+             .name           = "max77650-gpio",
+             .of_compatible  = "maxim,max77650-gpio",
+     },
+     [MAX77650_CELL_LED] = {
+             .name           = "max77650-led",
+             .of_compatible  = "maxim,max77650-led",
Quoted 9 lines

drivers/mfd/max77650.c line 144

Quoted 6 lines
drivers/mfd/max77650.c new file +6 -0
+     },
+     [MAX77650_CELL_ONKEY] = {
+             .name           = "max77650-onkey",
+             .of_compatible  = "maxim,max77650-onkey",
+     },
+};

Why are you numbering the cells? There is no need to do this.

Just for better readability. It makes sense to me coupled with MAX77650_NUM_CELLS.

Quoted 54 lines
Quoted 54 lines
drivers/mfd/max77650.c new file +54 -0
+static const struct regmap_irq max77650_irqs[] = {
+     [MAX77650_INT_GPI] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_GPI_MSK,
+             .type = {
+                     .type_falling_val       = MAX77650_INT_GPI_F_MSK,
+                     .type_rising_val        = MAX77650_INT_GPI_R_MSK,
+                     .types_supported        = IRQ_TYPE_EDGE_BOTH,
+             },
+     },
+     [MAX77650_INT_nEN_F] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_nEN_F_MSK,
+     },
+     [MAX77650_INT_nEN_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_nEN_R_MSK,
+     },
+     [MAX77650_INT_TJAL1_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_TJAL1_R_MSK,
+     },
+     [MAX77650_INT_TJAL2_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_TJAL2_R_MSK,
+     },
+     [MAX77650_INT_DOD_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_DOD_R_MSK,
+     },
+     [MAX77650_INT_THM] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_THM_MSK,
+     },
+     [MAX77650_INT_CHG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHG_MSK,
+     },
+     [MAX77650_INT_CHGIN] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHGIN_MSK,
+     },
+     [MAX77650_INT_TJ_REG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_TJ_REG_MSK,
+     },
+     [MAX77650_INT_CHGIN_CTRL] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHGIN_CTRL_MSK,
+     },
+     [MAX77650_INT_SYS_CTRL] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_SYS_CTRL_MSK,
+     },
Quoted 9 lines

drivers/mfd/max77650.c line 204

Quoted 5 lines
drivers/mfd/max77650.c new file +5 -0
+     [MAX77650_INT_SYS_CNFG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_SYS_CNFG_MSK,
+     },
+};

If you get rid of all of the horrible hoop jumping in *_setup_irqs(), you can use REGMAP_IRQ_REG() like everyone else does.

I could even use it now - except for the first interrupt. I decided to not use it everywhere as it looks much better that way than having REGMAP_IRQ_REG() for all definitions and then the first one sticking out like that. It just looks better.

Quoted 31 lines
Quoted 31 lines
drivers/mfd/max77650.c new file +31 -0
+static const struct regmap_irq_chip max77650_irq_chip = {
+     .name                   = "max77650-irq",
+     .irqs                   = max77650_irqs,
+     .num_irqs               = ARRAY_SIZE(max77650_irqs),
+     .num_regs               = 2,
+     .status_base            = MAX77650_REG_INT_GLBL,
+     .mask_base              = MAX77650_REG_INTM_GLBL,
+     .type_in_mask           = true,
+     .type_invert            = true,
+     .init_ack_masked        = true,
+     .clear_on_unmask        = true,
+};
+
+static const struct regmap_config max77650_regmap_config = {
+     .name           = "max77650",
+     .reg_bits       = 8,
+     .val_bits       = 8,
+};
+
+static int max77650_setup_irqs(struct device *dev, struct mfd_cell *cells)
+{
+     const struct max77650_irq_mapping *mapping;
+     struct regmap_irq_chip_data *irq_data;
+     struct i2c_client *i2c;
+     struct mfd_cell *cell;
+     struct resource *res;
+     struct regmap *map;
+     int i, j, irq, rv;
+
+     i2c = to_i2c_client(dev);
+
Quoted 9 lines

drivers/mfd/max77650.c line 242

Quoted 6 lines
drivers/mfd/max77650.c new file +6 -0
+     map = dev_get_regmap(dev, NULL);
+     if (!map)
+             return -ENODEV;
+
+     rv = devm_regmap_add_irq_chip(dev, map, i2c->irq,
+                                   IRQF_ONESHOT | IRQF_SHARED, -1,

What is -1? Are you sure this isn't defined somewhere?

I don't see any define for negative irq_base argument. I can add that in a separate series and convert the users, but for now I'd stick with -1.

Quoted 29 lines
Quoted 16 lines
drivers/mfd/max77650.c new file +16 -0
+                                   &max77650_irq_chip, &irq_data);
+     if (rv)
+             return rv;
+
+     for (i = 0; i < ARRAY_SIZE(max77650_irq_mapping_table); i++) {
+             mapping = &max77650_irq_mapping_table[i];
+             cell = &cells[mapping->cell_num];
+
+             res = devm_kcalloc(dev, sizeof(*res),
+                                mapping->num_irqs, GFP_KERNEL);
+             if (!res)
+                     return -ENOMEM;
+
+             cell->resources = res;
+             cell->num_resources = mapping->num_irqs;
+

drivers/mfd/max77650.c line 268

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+             for (j = 0; j < mapping->num_irqs; j++) {
+                     irq = regmap_irq_get_virq(irq_data, mapping->irqs[j]);
+                     if (irq < 0)
+                             return irq;
+
+                     res[j].start = res[j].end = irq;
+                     res[j].flags = IORESOURCE_IRQ;
+                     res[j].name = mapping->irq_names[j];
+             }
+     }

This is the first time I've seen it done like this (and I hate it).

Quoted 4 lines

Why are you storing the virqs in resources?

I think this is highly irregular.

I initially just passed the regmap_irq_chip_data over i2c clientdata and sub-drivers would look up virq numbers from it but was advised by Dmitry Torokhov to use resources instead. After implementing it this way I too think it's more elegant in sub-drivers who can simply do platform_get_irq_byname(). Do you have a different idea? What exactly don't you like about this?

Quoted 54 lines

drivers/mfd/max77650.c line 282

Quoted 13 lines
drivers/mfd/max77650.c new file +13 -0
+     return 0;
+}
+
+static int max77650_i2c_probe(struct i2c_client *i2c)
+{
+     struct device *dev = &i2c->dev;
+     struct mfd_cell *cells;
+     struct regmap *map;
+     unsigned int val;
+     int rv;
+
+     map = devm_regmap_init_i2c(i2c, &max77650_regmap_config);
+     if (IS_ERR(map))

What error messages does devm_regmap_init_i2c() report? Does it print out its own error messages internally? If not it would be better to provide a suitable error message here.

drivers/mfd/max77650.c line 286

Quoted 4 lines
drivers/mfd/max77650.c new file +4 -0
+             return PTR_ERR(map);
+
+     rv = regmap_read(map, MAX77650_REG_CID, &val);
+     if (rv)

Better to provide a suitable error message here.

drivers/mfd/max77650.c line 295

Quoted 9 lines
drivers/mfd/max77650.c new file +9 -0
+             return rv;
+
+     switch (MAX77650_CID_BITS(val)) {
+     case MAX77650_CID_77650A:
+     case MAX77650_CID_77650C:
+     case MAX77650_CID_77651A:
+     case MAX77650_CID_77651B:
+             break;
+     default:

Better to provide a suitable error message here.

Quoted 4 lines
drivers/mfd/max77650.c new file +4 -0
+             return -ENODEV;
+     }
+
+     /*

drivers/mfd/max77650.c line 309

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+      * This IC has a low-power mode which reduces the quiescent current
+      * consumption to ~5.6uA but is only suitable for systems consuming
+      * less than ~2mA. Since this is not likely the case even on
+      * linux-based wearables - keep the chip in normal power mode.
+      */
+     rv = regmap_update_bits(map,
+                             MAX77650_REG_CNFG_GLBL,
+                             MAX77650_SBIA_LPM_MASK,
+                             MAX77650_SBIA_LPM_DISABLED);
+     if (rv)

Better to provide a suitable error message here.

Quoted 15 lines

drivers/mfd/max77650.c line 321

Quoted 12 lines
drivers/mfd/max77650.c new file +12 -0
+             return rv;
+
+     cells = devm_kmemdup(dev, max77650_cells,
+                          sizeof(max77650_cells), GFP_KERNEL);
+     if (!cells)
+             return -ENOMEM;
+
+     rv = max77650_setup_irqs(dev, cells);
+     if (rv)
+             return rv;
+
+     return devm_mfd_add_devices(dev, -1, cells,

Use the correct defines instead of -1.

Will do that and add the error messages.

Bart

Quoted 94 lines

git grep mfd_add_devices

Quoted 76 lines
drivers/mfd/max77650.c new file +21 -0
+                                 MAX77650_NUM_CELLS, NULL, 0, NULL);
+}
+
+static const struct of_device_id max77650_of_match[] = {
+     { .compatible = "maxim,max77650" },
+     { }
+};
+MODULE_DEVICE_TABLE(of, max77650_of_match);
+
+static struct i2c_driver max77650_i2c_driver = {
+     .driver = {
+             .name = "max77650",
+             .of_match_table = of_match_ptr(max77650_of_match),
+     },
+     .probe_new = max77650_i2c_probe,
+};
+module_i2c_driver(max77650_i2c_driver);
+
+MODULE_DESCRIPTION("MAXIM 77650/77651 multi-function core driver");
+MODULE_AUTHOR("Bartosz Golaszewski <[email protected]>");
+MODULE_LICENSE("GPL v2");
include/linux/mfd/max77650.h new file +49 -0
new file mode 100644
index 000000000000..c809e211a8cd
@@ -0,0 +1,59 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2018 BayLibre SAS
+ * Author: Bartosz Golaszewski <[email protected]>
+ *
+ * Common definitions for MAXIM 77650/77651 charger/power-supply.
+ */
+
+#ifndef MAX77650_H
+#define MAX77650_H
+
+#include <linux/bits.h>
+
+#define MAX77650_REG_INT_GLBL                0x00
+#define MAX77650_REG_INT_CHG         0x01
+#define MAX77650_REG_STAT_CHG_A              0x02
+#define MAX77650_REG_STAT_CHG_B              0x03
+#define MAX77650_REG_ERCFLAG         0x04
+#define MAX77650_REG_STAT_GLBL               0x05
+#define MAX77650_REG_INTM_GLBL               0x06
+#define MAX77650_REG_INTM_CHG                0x07
+#define MAX77650_REG_CNFG_GLBL               0x10
+#define MAX77650_REG_CID             0x11
+#define MAX77650_REG_CNFG_GPIO               0x12
+#define MAX77650_REG_CNFG_CHG_A              0x18
+#define MAX77650_REG_CNFG_CHG_B              0x19
+#define MAX77650_REG_CNFG_CHG_C              0x1a
+#define MAX77650_REG_CNFG_CHG_D              0x1b
+#define MAX77650_REG_CNFG_CHG_E              0x1c
+#define MAX77650_REG_CNFG_CHG_F              0x1d
+#define MAX77650_REG_CNFG_CHG_G              0x1e
+#define MAX77650_REG_CNFG_CHG_H              0x1f
+#define MAX77650_REG_CNFG_CHG_I              0x20
+#define MAX77650_REG_CNFG_SBB_TOP    0x28
+#define MAX77650_REG_CNFG_SBB0_A     0x29
+#define MAX77650_REG_CNFG_SBB0_B     0x2a
+#define MAX77650_REG_CNFG_SBB1_A     0x2b
+#define MAX77650_REG_CNFG_SBB1_B     0x2c
+#define MAX77650_REG_CNFG_SBB2_A     0x2d
+#define MAX77650_REG_CNFG_SBB2_B     0x2e
+#define MAX77650_REG_CNFG_LDO_A              0x38
+#define MAX77650_REG_CNFG_LDO_B              0x39
+#define MAX77650_REG_CNFG_LED0_A     0x40
+#define MAX77650_REG_CNFG_LED1_A     0x41
+#define MAX77650_REG_CNFG_LED2_A     0x42
+#define MAX77650_REG_CNFG_LED0_B     0x43
+#define MAX77650_REG_CNFG_LED1_B     0x44
+#define MAX77650_REG_CNFG_LED2_B     0x45
+#define MAX77650_REG_CNFG_LED_TOP    0x46

include/linux/mfd/max77650.h line 59

Quoted 10 lines
include/linux/mfd/max77650.h new file +10 -0
+
+#define MAX77650_CID_MASK            GENMASK(3, 0)
+#define MAX77650_CID_BITS(_reg)              (_reg & MAX77650_CID_MASK)
+
+#define MAX77650_CID_77650A          0x03
+#define MAX77650_CID_77650C          0x0a
+#define MAX77650_CID_77651A          0x06
+#define MAX77650_CID_77651B          0x08
+
+#endif /* MAX77650_H */

--
Lee Jones [李琼斯]
Linaro Services Technical Lead

Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#9 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

Quoted 18 lines · Bartosz Golaszewski

wt., 12 lut 2019 o 09:36 Lee Jones <[email protected]> napisał(a):

Quoted 17 lines · Bartosz Golaszewski
Quoted 15 lines

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.

---
 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

[...]

Quoted 49 lines
Quoted 39 lines
Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+static const struct max77650_irq_mapping max77650_irq_mapping_table[] = {
+     {
+             .cell_num       = MAX77650_CELL_CHARGER,
+             .irqs           = max77650_charger_irqs,
+             .irq_names      = max77650_charger_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_charger_irqs),
+     },
+     {
+             .cell_num       = MAX77650_CELL_GPIO,
+             .irqs           = max77650_gpio_irqs,

drivers/mfd/max77650.c line 121

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+             .irq_names      = max77650_gpio_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_gpio_irqs),
+     },
+     {
+             .cell_num       = MAX77650_CELL_ONKEY,
+             .irqs           = max77650_onkey_irqs,
+             .irq_names      = max77650_onkey_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_onkey_irqs),
+     },
+};

This is all a bit convoluted and nasty TBH.

Quoted 16 lines
drivers/mfd/max77650.c new file +16 -0
+static const struct mfd_cell max77650_cells[] = {
+     [MAX77650_CELL_REGULATOR] = {
+             .name           = "max77650-regulator",
+             .of_compatible  = "maxim,max77650-regulator",
+     },
+     [MAX77650_CELL_CHARGER] = {
+             .name           = "max77650-charger",
+             .of_compatible  = "maxim,max77650-charger",
+     },
+     [MAX77650_CELL_GPIO] = {
+             .name           = "max77650-gpio",
+             .of_compatible  = "maxim,max77650-gpio",
+     },
+     [MAX77650_CELL_LED] = {
+             .name           = "max77650-led",
+             .of_compatible  = "maxim,max77650-led",
Quoted 9 lines

drivers/mfd/max77650.c line 144

Quoted 6 lines
drivers/mfd/max77650.c new file +6 -0
+     },
+     [MAX77650_CELL_ONKEY] = {
+             .name           = "max77650-onkey",
+             .of_compatible  = "maxim,max77650-onkey",
+     },
+};

Why are you numbering the cells? There is no need to do this.

Quoted 2 lines

Just for better readability. It makes sense to me coupled with MAX77650_NUM_CELLS.

You have it the wrong way around. You define the cell data, then provide the number of them using ARRAY_SIZE(). The enum containing MAX77650_NUM_CELLS should not exist.

Quoted 64 lines
Quoted 54 lines
Quoted 54 lines
drivers/mfd/max77650.c new file +54 -0
+static const struct regmap_irq max77650_irqs[] = {
+     [MAX77650_INT_GPI] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_GPI_MSK,
+             .type = {
+                     .type_falling_val       = MAX77650_INT_GPI_F_MSK,
+                     .type_rising_val        = MAX77650_INT_GPI_R_MSK,
+                     .types_supported        = IRQ_TYPE_EDGE_BOTH,
+             },
+     },
+     [MAX77650_INT_nEN_F] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_nEN_F_MSK,
+     },
+     [MAX77650_INT_nEN_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_nEN_R_MSK,
+     },
+     [MAX77650_INT_TJAL1_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_TJAL1_R_MSK,
+     },
+     [MAX77650_INT_TJAL2_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_TJAL2_R_MSK,
+     },
+     [MAX77650_INT_DOD_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_DOD_R_MSK,
+     },
+     [MAX77650_INT_THM] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_THM_MSK,
+     },
+     [MAX77650_INT_CHG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHG_MSK,
+     },
+     [MAX77650_INT_CHGIN] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHGIN_MSK,
+     },
+     [MAX77650_INT_TJ_REG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_TJ_REG_MSK,
+     },
+     [MAX77650_INT_CHGIN_CTRL] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHGIN_CTRL_MSK,
+     },
+     [MAX77650_INT_SYS_CTRL] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_SYS_CTRL_MSK,
+     },
Quoted 9 lines

drivers/mfd/max77650.c line 204

Quoted 5 lines
drivers/mfd/max77650.c new file +5 -0
+     [MAX77650_INT_SYS_CNFG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_SYS_CNFG_MSK,
+     },
+};

If you get rid of all of the horrible hoop jumping in *_setup_irqs(), you can use REGMAP_IRQ_REG() like everyone else does.

Quoted 4 lines

I could even use it now - except for the first interrupt. I decided to not use it everywhere as it looks much better that way than having REGMAP_IRQ_REG() for all definitions and then the first one sticking out like that. It just looks better.

The way it's done at the moment looks terrible.

Please use the MACROs to simplify as much of the code as possible.

Quoted 41 lines
Quoted 31 lines
Quoted 31 lines
drivers/mfd/max77650.c new file +31 -0
+static const struct regmap_irq_chip max77650_irq_chip = {
+     .name                   = "max77650-irq",
+     .irqs                   = max77650_irqs,
+     .num_irqs               = ARRAY_SIZE(max77650_irqs),
+     .num_regs               = 2,
+     .status_base            = MAX77650_REG_INT_GLBL,
+     .mask_base              = MAX77650_REG_INTM_GLBL,
+     .type_in_mask           = true,
+     .type_invert            = true,
+     .init_ack_masked        = true,
+     .clear_on_unmask        = true,
+};
+
+static const struct regmap_config max77650_regmap_config = {
+     .name           = "max77650",
+     .reg_bits       = 8,
+     .val_bits       = 8,
+};
+
+static int max77650_setup_irqs(struct device *dev, struct mfd_cell *cells)
+{
+     const struct max77650_irq_mapping *mapping;
+     struct regmap_irq_chip_data *irq_data;
+     struct i2c_client *i2c;
+     struct mfd_cell *cell;
+     struct resource *res;
+     struct regmap *map;
+     int i, j, irq, rv;
+
+     i2c = to_i2c_client(dev);
+
Quoted 9 lines

drivers/mfd/max77650.c line 242

Quoted 6 lines
drivers/mfd/max77650.c new file +6 -0
+     map = dev_get_regmap(dev, NULL);
+     if (!map)
+             return -ENODEV;
+
+     rv = devm_regmap_add_irq_chip(dev, map, i2c->irq,
+                                   IRQF_ONESHOT | IRQF_SHARED, -1,

What is -1? Are you sure this isn't defined somewhere?

Quoted 3 lines

I don't see any define for negative irq_base argument. I can add that in a separate series and convert the users, but for now I'd stick with -1.

IMO it should be defined. You can define it locally for now.

Quoted 34 lines
Quoted 29 lines
Quoted 16 lines
drivers/mfd/max77650.c new file +16 -0
+                                   &max77650_irq_chip, &irq_data);
+     if (rv)
+             return rv;
+
+     for (i = 0; i < ARRAY_SIZE(max77650_irq_mapping_table); i++) {
+             mapping = &max77650_irq_mapping_table[i];
+             cell = &cells[mapping->cell_num];
+
+             res = devm_kcalloc(dev, sizeof(*res),
+                                mapping->num_irqs, GFP_KERNEL);
+             if (!res)
+                     return -ENOMEM;
+
+             cell->resources = res;
+             cell->num_resources = mapping->num_irqs;
+

drivers/mfd/max77650.c line 268

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+             for (j = 0; j < mapping->num_irqs; j++) {
+                     irq = regmap_irq_get_virq(irq_data, mapping->irqs[j]);
+                     if (irq < 0)
+                             return irq;
+
+                     res[j].start = res[j].end = irq;
+                     res[j].flags = IORESOURCE_IRQ;
+                     res[j].name = mapping->irq_names[j];
+             }
+     }

This is the first time I've seen it done like this (and I hate it).

Quoted 4 lines

Why are you storing the virqs in resources?

I think this is highly irregular.

Quoted 7 lines

I initially just passed the regmap_irq_chip_data over i2c clientdata and sub-drivers would look up virq numbers from it but was advised by Dmitry Torokhov to use resources instead. After implementing it this way I too think it's more elegant in sub-drivers who can simply do platform_get_irq_byname(). Do you have a different idea?

What exactly don't you like about this?

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#10 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 240 lines · Bartosz Golaszewski
Quoted 19 lines

wt., 12 lut 2019 o 09:36 Lee Jones <[email protected]> napisał(a):

Quoted 17 lines · Bartosz Golaszewski
Quoted 15 lines

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.

---
 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

[...]

Quoted 49 lines
Quoted 39 lines
Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+static const struct max77650_irq_mapping max77650_irq_mapping_table[] = {
+     {
+             .cell_num       = MAX77650_CELL_CHARGER,
+             .irqs           = max77650_charger_irqs,
+             .irq_names      = max77650_charger_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_charger_irqs),
+     },
+     {
+             .cell_num       = MAX77650_CELL_GPIO,
+             .irqs           = max77650_gpio_irqs,

drivers/mfd/max77650.c line 121

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+             .irq_names      = max77650_gpio_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_gpio_irqs),
+     },
+     {
+             .cell_num       = MAX77650_CELL_ONKEY,
+             .irqs           = max77650_onkey_irqs,
+             .irq_names      = max77650_onkey_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_onkey_irqs),
+     },
+};

This is all a bit convoluted and nasty TBH.

Quoted 16 lines
drivers/mfd/max77650.c new file +16 -0
+static const struct mfd_cell max77650_cells[] = {
+     [MAX77650_CELL_REGULATOR] = {
+             .name           = "max77650-regulator",
+             .of_compatible  = "maxim,max77650-regulator",
+     },
+     [MAX77650_CELL_CHARGER] = {
+             .name           = "max77650-charger",
+             .of_compatible  = "maxim,max77650-charger",
+     },
+     [MAX77650_CELL_GPIO] = {
+             .name           = "max77650-gpio",
+             .of_compatible  = "maxim,max77650-gpio",
+     },
+     [MAX77650_CELL_LED] = {
+             .name           = "max77650-led",
+             .of_compatible  = "maxim,max77650-led",
Quoted 9 lines

drivers/mfd/max77650.c line 144

Quoted 6 lines
drivers/mfd/max77650.c new file +6 -0
+     },
+     [MAX77650_CELL_ONKEY] = {
+             .name           = "max77650-onkey",
+             .of_compatible  = "maxim,max77650-onkey",
+     },
+};

Why are you numbering the cells? There is no need to do this.

Quoted 2 lines

Just for better readability. It makes sense to me coupled with MAX77650_NUM_CELLS.

You have it the wrong way around. You define the cell data, then provide the number of them using ARRAY_SIZE(). The enum containing MAX77650_NUM_CELLS should not exist.

Quoted 64 lines
Quoted 54 lines
Quoted 54 lines
drivers/mfd/max77650.c new file +54 -0
+static const struct regmap_irq max77650_irqs[] = {
+     [MAX77650_INT_GPI] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_GPI_MSK,
+             .type = {
+                     .type_falling_val       = MAX77650_INT_GPI_F_MSK,
+                     .type_rising_val        = MAX77650_INT_GPI_R_MSK,
+                     .types_supported        = IRQ_TYPE_EDGE_BOTH,
+             },
+     },
+     [MAX77650_INT_nEN_F] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_nEN_F_MSK,
+     },
+     [MAX77650_INT_nEN_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_nEN_R_MSK,
+     },
+     [MAX77650_INT_TJAL1_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_TJAL1_R_MSK,
+     },
+     [MAX77650_INT_TJAL2_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_TJAL2_R_MSK,
+     },
+     [MAX77650_INT_DOD_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_DOD_R_MSK,
+     },
+     [MAX77650_INT_THM] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_THM_MSK,
+     },
+     [MAX77650_INT_CHG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHG_MSK,
+     },
+     [MAX77650_INT_CHGIN] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHGIN_MSK,
+     },
+     [MAX77650_INT_TJ_REG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_TJ_REG_MSK,
+     },
+     [MAX77650_INT_CHGIN_CTRL] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHGIN_CTRL_MSK,
+     },
+     [MAX77650_INT_SYS_CTRL] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_SYS_CTRL_MSK,
+     },
Quoted 9 lines

drivers/mfd/max77650.c line 204

Quoted 5 lines
drivers/mfd/max77650.c new file +5 -0
+     [MAX77650_INT_SYS_CNFG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_SYS_CNFG_MSK,
+     },
+};

If you get rid of all of the horrible hoop jumping in *_setup_irqs(), you can use REGMAP_IRQ_REG() like everyone else does.

Quoted 4 lines

I could even use it now - except for the first interrupt. I decided to not use it everywhere as it looks much better that way than having REGMAP_IRQ_REG() for all definitions and then the first one sticking out like that. It just looks better.

The way it's done at the moment looks terrible.

Please use the MACROs to simplify as much of the code as possible.

Quoted 41 lines
Quoted 31 lines
Quoted 31 lines
drivers/mfd/max77650.c new file +31 -0
+static const struct regmap_irq_chip max77650_irq_chip = {
+     .name                   = "max77650-irq",
+     .irqs                   = max77650_irqs,
+     .num_irqs               = ARRAY_SIZE(max77650_irqs),
+     .num_regs               = 2,
+     .status_base            = MAX77650_REG_INT_GLBL,
+     .mask_base              = MAX77650_REG_INTM_GLBL,
+     .type_in_mask           = true,
+     .type_invert            = true,
+     .init_ack_masked        = true,
+     .clear_on_unmask        = true,
+};
+
+static const struct regmap_config max77650_regmap_config = {
+     .name           = "max77650",
+     .reg_bits       = 8,
+     .val_bits       = 8,
+};
+
+static int max77650_setup_irqs(struct device *dev, struct mfd_cell *cells)
+{
+     const struct max77650_irq_mapping *mapping;
+     struct regmap_irq_chip_data *irq_data;
+     struct i2c_client *i2c;
+     struct mfd_cell *cell;
+     struct resource *res;
+     struct regmap *map;
+     int i, j, irq, rv;
+
+     i2c = to_i2c_client(dev);
+
Quoted 9 lines

drivers/mfd/max77650.c line 242

Quoted 6 lines
drivers/mfd/max77650.c new file +6 -0
+     map = dev_get_regmap(dev, NULL);
+     if (!map)
+             return -ENODEV;
+
+     rv = devm_regmap_add_irq_chip(dev, map, i2c->irq,
+                                   IRQF_ONESHOT | IRQF_SHARED, -1,

What is -1? Are you sure this isn't defined somewhere?

Quoted 3 lines

I don't see any define for negative irq_base argument. I can add that in a separate series and convert the users, but for now I'd stick with -1.

IMO it should be defined. You can define it locally for now.

Quoted 39 lines
Quoted 29 lines
Quoted 16 lines
drivers/mfd/max77650.c new file +16 -0
+                                   &max77650_irq_chip, &irq_data);
+     if (rv)
+             return rv;
+
+     for (i = 0; i < ARRAY_SIZE(max77650_irq_mapping_table); i++) {
+             mapping = &max77650_irq_mapping_table[i];
+             cell = &cells[mapping->cell_num];
+
+             res = devm_kcalloc(dev, sizeof(*res),
+                                mapping->num_irqs, GFP_KERNEL);
+             if (!res)
+                     return -ENOMEM;
+
+             cell->resources = res;
+             cell->num_resources = mapping->num_irqs;
+

drivers/mfd/max77650.c line 268

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+             for (j = 0; j < mapping->num_irqs; j++) {
+                     irq = regmap_irq_get_virq(irq_data, mapping->irqs[j]);
+                     if (irq < 0)
+                             return irq;
+
+                     res[j].start = res[j].end = irq;
+                     res[j].flags = IORESOURCE_IRQ;
+                     res[j].name = mapping->irq_names[j];
+             }
+     }

This is the first time I've seen it done like this (and I hate it).

Quoted 4 lines

Why are you storing the virqs in resources?

I think this is highly irregular.

I initially just passed the regmap_irq_chip_data over i2c clientdata and sub-drivers would look up virq numbers from it but was advised by Dmitry Torokhov to use resources instead. After implementing it this way I too think it's more elegant in sub-drivers who can simply do platform_get_irq_byname(). Do you have a different idea?

Quoted 7 lines
Quoted 1 line

What exactly don't you like about this?

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

Quoted 11 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

@Dmitry: what do you think?

Bart

#11 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

Quoted 243 lines · Bartosz Golaszewski

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 242 lines · Bartosz Golaszewski
Quoted 19 lines

wt., 12 lut 2019 o 09:36 Lee Jones <[email protected]> napisał(a):

Quoted 17 lines · Bartosz Golaszewski
Quoted 15 lines

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.

---
 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

[...]

Quoted 49 lines
Quoted 39 lines
Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+static const struct max77650_irq_mapping max77650_irq_mapping_table[] = {
+     {
+             .cell_num       = MAX77650_CELL_CHARGER,
+             .irqs           = max77650_charger_irqs,
+             .irq_names      = max77650_charger_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_charger_irqs),
+     },
+     {
+             .cell_num       = MAX77650_CELL_GPIO,
+             .irqs           = max77650_gpio_irqs,

drivers/mfd/max77650.c line 121

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+             .irq_names      = max77650_gpio_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_gpio_irqs),
+     },
+     {
+             .cell_num       = MAX77650_CELL_ONKEY,
+             .irqs           = max77650_onkey_irqs,
+             .irq_names      = max77650_onkey_irq_names,
+             .num_irqs       = ARRAY_SIZE(max77650_onkey_irqs),
+     },
+};

This is all a bit convoluted and nasty TBH.

Quoted 16 lines
drivers/mfd/max77650.c new file +16 -0
+static const struct mfd_cell max77650_cells[] = {
+     [MAX77650_CELL_REGULATOR] = {
+             .name           = "max77650-regulator",
+             .of_compatible  = "maxim,max77650-regulator",
+     },
+     [MAX77650_CELL_CHARGER] = {
+             .name           = "max77650-charger",
+             .of_compatible  = "maxim,max77650-charger",
+     },
+     [MAX77650_CELL_GPIO] = {
+             .name           = "max77650-gpio",
+             .of_compatible  = "maxim,max77650-gpio",
+     },
+     [MAX77650_CELL_LED] = {
+             .name           = "max77650-led",
+             .of_compatible  = "maxim,max77650-led",
Quoted 9 lines

drivers/mfd/max77650.c line 144

Quoted 6 lines
drivers/mfd/max77650.c new file +6 -0
+     },
+     [MAX77650_CELL_ONKEY] = {
+             .name           = "max77650-onkey",
+             .of_compatible  = "maxim,max77650-onkey",
+     },
+};

Why are you numbering the cells? There is no need to do this.

Quoted 2 lines

Just for better readability. It makes sense to me coupled with MAX77650_NUM_CELLS.

You have it the wrong way around. You define the cell data, then provide the number of them using ARRAY_SIZE(). The enum containing MAX77650_NUM_CELLS should not exist.

Quoted 64 lines
Quoted 54 lines
Quoted 54 lines
drivers/mfd/max77650.c new file +54 -0
+static const struct regmap_irq max77650_irqs[] = {
+     [MAX77650_INT_GPI] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_GPI_MSK,
+             .type = {
+                     .type_falling_val       = MAX77650_INT_GPI_F_MSK,
+                     .type_rising_val        = MAX77650_INT_GPI_R_MSK,
+                     .types_supported        = IRQ_TYPE_EDGE_BOTH,
+             },
+     },
+     [MAX77650_INT_nEN_F] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_nEN_F_MSK,
+     },
+     [MAX77650_INT_nEN_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_nEN_R_MSK,
+     },
+     [MAX77650_INT_TJAL1_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_TJAL1_R_MSK,
+     },
+     [MAX77650_INT_TJAL2_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_TJAL2_R_MSK,
+     },
+     [MAX77650_INT_DOD_R] = {
+             .reg_offset             = MAX77650_INT_GLBL_OFFSET,
+             .mask                   = MAX77650_INT_DOD_R_MSK,
+     },
+     [MAX77650_INT_THM] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_THM_MSK,
+     },
+     [MAX77650_INT_CHG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHG_MSK,
+     },
+     [MAX77650_INT_CHGIN] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHGIN_MSK,
+     },
+     [MAX77650_INT_TJ_REG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_TJ_REG_MSK,
+     },
+     [MAX77650_INT_CHGIN_CTRL] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_CHGIN_CTRL_MSK,
+     },
+     [MAX77650_INT_SYS_CTRL] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_SYS_CTRL_MSK,
+     },
Quoted 9 lines

drivers/mfd/max77650.c line 204

Quoted 5 lines
drivers/mfd/max77650.c new file +5 -0
+     [MAX77650_INT_SYS_CNFG] = {
+             .reg_offset             = MAX77650_INT_CHG_OFFSET,
+             .mask                   = MAX77650_INT_SYS_CNFG_MSK,
+     },
+};

If you get rid of all of the horrible hoop jumping in *_setup_irqs(), you can use REGMAP_IRQ_REG() like everyone else does.

Quoted 4 lines

I could even use it now - except for the first interrupt. I decided to not use it everywhere as it looks much better that way than having REGMAP_IRQ_REG() for all definitions and then the first one sticking out like that. It just looks better.

The way it's done at the moment looks terrible.

Please use the MACROs to simplify as much of the code as possible.

Quoted 41 lines
Quoted 31 lines
Quoted 31 lines
drivers/mfd/max77650.c new file +31 -0
+static const struct regmap_irq_chip max77650_irq_chip = {
+     .name                   = "max77650-irq",
+     .irqs                   = max77650_irqs,
+     .num_irqs               = ARRAY_SIZE(max77650_irqs),
+     .num_regs               = 2,
+     .status_base            = MAX77650_REG_INT_GLBL,
+     .mask_base              = MAX77650_REG_INTM_GLBL,
+     .type_in_mask           = true,
+     .type_invert            = true,
+     .init_ack_masked        = true,
+     .clear_on_unmask        = true,
+};
+
+static const struct regmap_config max77650_regmap_config = {
+     .name           = "max77650",
+     .reg_bits       = 8,
+     .val_bits       = 8,
+};
+
+static int max77650_setup_irqs(struct device *dev, struct mfd_cell *cells)
+{
+     const struct max77650_irq_mapping *mapping;
+     struct regmap_irq_chip_data *irq_data;
+     struct i2c_client *i2c;
+     struct mfd_cell *cell;
+     struct resource *res;
+     struct regmap *map;
+     int i, j, irq, rv;
+
+     i2c = to_i2c_client(dev);
+
Quoted 9 lines

drivers/mfd/max77650.c line 242

Quoted 6 lines
drivers/mfd/max77650.c new file +6 -0
+     map = dev_get_regmap(dev, NULL);
+     if (!map)
+             return -ENODEV;
+
+     rv = devm_regmap_add_irq_chip(dev, map, i2c->irq,
+                                   IRQF_ONESHOT | IRQF_SHARED, -1,

What is -1? Are you sure this isn't defined somewhere?

Quoted 3 lines

I don't see any define for negative irq_base argument. I can add that in a separate series and convert the users, but for now I'd stick with -1.

IMO it should be defined. You can define it locally for now.

Quoted 41 lines
Quoted 29 lines
Quoted 16 lines
drivers/mfd/max77650.c new file +16 -0
+                                   &max77650_irq_chip, &irq_data);
+     if (rv)
+             return rv;
+
+     for (i = 0; i < ARRAY_SIZE(max77650_irq_mapping_table); i++) {
+             mapping = &max77650_irq_mapping_table[i];
+             cell = &cells[mapping->cell_num];
+
+             res = devm_kcalloc(dev, sizeof(*res),
+                                mapping->num_irqs, GFP_KERNEL);
+             if (!res)
+                     return -ENOMEM;
+
+             cell->resources = res;
+             cell->num_resources = mapping->num_irqs;
+

drivers/mfd/max77650.c line 268

Quoted 10 lines
drivers/mfd/max77650.c new file +10 -0
+             for (j = 0; j < mapping->num_irqs; j++) {
+                     irq = regmap_irq_get_virq(irq_data, mapping->irqs[j]);
+                     if (irq < 0)
+                             return irq;
+
+                     res[j].start = res[j].end = irq;
+                     res[j].flags = IORESOURCE_IRQ;
+                     res[j].name = mapping->irq_names[j];
+             }
+     }

This is the first time I've seen it done like this (and I hate it).

Quoted 4 lines

Why are you storing the virqs in resources?

I think this is highly irregular.

I initially just passed the regmap_irq_chip_data over i2c clientdata and sub-drivers would look up virq numbers from it but was advised by Dmitry Torokhov to use resources instead. After implementing it this way I too think it's more elegant in sub-drivers who can simply do platform_get_irq_byname(). Do you have a different idea?

What exactly don't you like about this?

Quoted 7 lines
Quoted 5 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 6 lines
Quoted 6 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

Quoted 6 lines
Quoted 3 lines

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

Quoted 1 line

@Dmitry: what do you think?

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#12 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

wt., 12 lut 2019 o 11:18 Lee Jones <[email protected]> napisał(a):

Quoted 23 lines · Bartosz Golaszewski
Quoted 10 lines

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 6 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 8 lines
Quoted 8 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

I'm not sure what you mean by "like everyone else does" - different mfd drivers seem to be doing different things. Is a simple struct containing virtual irq numbers passed to sub-drivers fine?

Bart

#13 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

Quoted 29 lines · Bartosz Golaszewski

wt., 12 lut 2019 o 11:18 Lee Jones <[email protected]> napisał(a):

Quoted 28 lines · Bartosz Golaszewski
Quoted 10 lines

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 6 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 12 lines
Quoted 9 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

Quoted 6 lines
Quoted 2 lines

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

I'm not sure what you mean by "like everyone else does" - different mfd drivers seem to be doing different things. Is a simple struct containing virtual irq numbers passed to sub-drivers fine?

How do you plan on deriving the VIRQs to place into the struct?

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#14 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

wt., 12 lut 2019 o 12:14 Lee Jones <[email protected]> napisał(a):

Quoted 32 lines · Bartosz Golaszewski
Quoted 30 lines

wt., 12 lut 2019 o 11:18 Lee Jones <[email protected]> napisał(a):

Quoted 28 lines · Bartosz Golaszewski
Quoted 10 lines

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 6 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 12 lines
Quoted 9 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

I'm not sure what you mean by "like everyone else does" - different mfd drivers seem to be doing different things. Is a simple struct containing virtual irq numbers passed to sub-drivers fine?

How do you plan on deriving the VIRQs to place into the struct?

Exampe:

struct max77650_gpio_pdata {
    int gpi_irq;
};

In MFD driver:

struct max77650_gpio_pdata *gpio_data = devm_kmalloc(dev, sizeof(*gpio_data));

gpio_data->gpi_irq = regmap_irq_get_virq(irqchip_data, GPI_NUM);

gpio_cell.platform_data = gpio_data;

In GPIO driver:

struct max77650_gpio_pdata *gpio_data = pdev->dev.platform_data;

int irq = gpio_data->gpi_irq;

Bart

#15 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

Quoted 54 lines · Bartosz Golaszewski

wt., 12 lut 2019 o 12:14 Lee Jones <[email protected]> napisał(a):

Quoted 32 lines · Bartosz Golaszewski
Quoted 30 lines

wt., 12 lut 2019 o 11:18 Lee Jones <[email protected]> napisał(a):

Quoted 28 lines · Bartosz Golaszewski
Quoted 10 lines

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 6 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 12 lines
Quoted 9 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

I'm not sure what you mean by "like everyone else does" - different mfd drivers seem to be doing different things. Is a simple struct containing virtual irq numbers passed to sub-drivers fine?

How do you plan on deriving the VIRQs to place into the struct?

Exampe:

struct max77650_gpio_pdata {
    int gpi_irq;
};

In MFD driver:

struct max77650_gpio_pdata *gpio_data = devm_kmalloc(dev, sizeof(*gpio_data));

gpio_data->gpi_irq = regmap_irq_get_virq(irqchip_data, GPI_NUM);

Quoted 7 lines

gpio_cell.platform_data = gpio_data;

In GPIO driver:

struct max77650_gpio_pdata *gpio_data = pdev->dev.platform_data;

int irq = gpio_data->gpi_irq;

Definitely not. What you're trying to do is a hack.

If you're using Regmap to handle your IRQs, then you should use Regmap in the client to pull them out. Setting them via Regmap, then pulling them out again in the *same driver*, only to store them in platform data to be passed to a child device is bonkers.

*Either* use the MFD provided platform-data helpers *or* pass and handle them via the Regmap APIs, *not* both.

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#16 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

Quoted 66 lines · Lee Jones
Quoted 54 lines · Bartosz Golaszewski

wt., 12 lut 2019 o 12:14 Lee Jones <[email protected]> napisał(a):

Quoted 32 lines · Bartosz Golaszewski
Quoted 30 lines

wt., 12 lut 2019 o 11:18 Lee Jones <[email protected]> napisał(a):

Quoted 28 lines · Bartosz Golaszewski
Quoted 10 lines

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 6 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 12 lines
Quoted 9 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

I'm not sure what you mean by "like everyone else does" - different mfd drivers seem to be doing different things. Is a simple struct containing virtual irq numbers passed to sub-drivers fine?

How do you plan on deriving the VIRQs to place into the struct?

Exampe:

struct max77650_gpio_pdata {
    int gpi_irq;
};

In MFD driver:

struct max77650_gpio_pdata *gpio_data = devm_kmalloc(dev, sizeof(*gpio_data));

gpio_data->gpi_irq = regmap_irq_get_virq(irqchip_data, GPI_NUM);

Quoted 7 lines

gpio_cell.platform_data = gpio_data;

In GPIO driver:

struct max77650_gpio_pdata *gpio_data = pdev->dev.platform_data;

int irq = gpio_data->gpi_irq;

Definitely not. What you're trying to do is a hack.

Quoted 7 lines

If you're using Regmap to handle your IRQs, then you should use Regmap in the client to pull them out. Setting them via Regmap, then pulling them out again in the *same driver*, only to store them in platform data to be passed to a child device is bonkers.

*Either* use the MFD provided platform-data helpers *or* pass and handle them via the Regmap APIs, *not* both.

Right, a plan has been formed.

Hopefully this works and you can avoid all this dancing around.

Firstly, you need to make a small change to:

drivers/base/regmap/regmap-irq.c

Add the following function:

struct irq_domain *regmap_irq_get_domain(struct regmap *map)

As you can see, it will return the IRQ Domain for the chip.

You can then pass this IRQ domain to mfd_add_devices() and it will do the HWIRQ => VIRQ mapping for you on the fly. Meaning that you can remove all the nastiness in max77650_setup_irqs() and have the Input device use the standard (e.g. platform_get_irq()) APIs.

How does that Sound?

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#17 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

śr., 13 lut 2019 o 10:25 Lee Jones <[email protected]> napisał(a):

Quoted 81 lines · Lee Jones
Quoted 67 lines · Bartosz Golaszewski
Quoted 55 lines

wt., 12 lut 2019 o 12:14 Lee Jones <[email protected]> napisał(a):

Quoted 32 lines · Bartosz Golaszewski
Quoted 30 lines

wt., 12 lut 2019 o 11:18 Lee Jones <[email protected]> napisał(a):

Quoted 28 lines · Bartosz Golaszewski
Quoted 10 lines

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 6 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 12 lines
Quoted 9 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

I'm not sure what you mean by "like everyone else does" - different mfd drivers seem to be doing different things. Is a simple struct containing virtual irq numbers passed to sub-drivers fine?

How do you plan on deriving the VIRQs to place into the struct?

Exampe:

struct max77650_gpio_pdata {
    int gpi_irq;
};

In MFD driver:

struct max77650_gpio_pdata *gpio_data = devm_kmalloc(dev, sizeof(*gpio_data));

gpio_data->gpi_irq = regmap_irq_get_virq(irqchip_data, GPI_NUM);

Quoted 7 lines

gpio_cell.platform_data = gpio_data;

In GPIO driver:

struct max77650_gpio_pdata *gpio_data = pdev->dev.platform_data;

int irq = gpio_data->gpi_irq;

Definitely not. What you're trying to do is a hack.

Quoted 7 lines

If you're using Regmap to handle your IRQs, then you should use Regmap in the client to pull them out. Setting them via Regmap, then pulling them out again in the *same driver*, only to store them in platform data to be passed to a child device is bonkers.

*Either* use the MFD provided platform-data helpers *or* pass and handle them via the Regmap APIs, *not* both.

Right, a plan has been formed.

Hopefully this works and you can avoid all this dancing around.

Quoted 8 lines

Firstly, you need to make a small change to:

drivers/base/regmap/regmap-irq.c

Add the following function:

struct irq_domain *regmap_irq_get_domain(struct regmap *map)

We already do have such function and a lot of mfd drivers actually use it.

Quoted 9 lines

As you can see, it will return the IRQ Domain for the chip.

You can then pass this IRQ domain to mfd_add_devices() and it will do the HWIRQ => VIRQ mapping for you on the fly. Meaning that you can remove all the nastiness in max77650_setup_irqs() and have the Input device use the standard (e.g. platform_get_irq()) APIs.

How does that Sound?

This does sound better! Why didn't you lead with that in the first place?

It's a pity it's not documented, I had to look at the code to find out irq resources would get translated in mfd_add_devices() if a domain is present.

In that case - I really don't see a reason to create a superfluous structure to only hold the main regmap - we can very well get it from the parent device in sub-drivers as I do now.

Thanks,
Bartosz

#18 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

Quoted 84 lines · Bartosz Golaszewski

śr., 13 lut 2019 o 10:25 Lee Jones <[email protected]> napisał(a):

Quoted 83 lines · Lee Jones
Quoted 67 lines · Bartosz Golaszewski
Quoted 55 lines

wt., 12 lut 2019 o 12:14 Lee Jones <[email protected]> napisał(a):

Quoted 32 lines · Bartosz Golaszewski
Quoted 30 lines

wt., 12 lut 2019 o 11:18 Lee Jones <[email protected]> napisał(a):

Quoted 28 lines · Bartosz Golaszewski
Quoted 10 lines

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 6 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 12 lines
Quoted 9 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

I'm not sure what you mean by "like everyone else does" - different mfd drivers seem to be doing different things. Is a simple struct containing virtual irq numbers passed to sub-drivers fine?

How do you plan on deriving the VIRQs to place into the struct?

Exampe:

struct max77650_gpio_pdata {
    int gpi_irq;
};

In MFD driver:

struct max77650_gpio_pdata *gpio_data = devm_kmalloc(dev, sizeof(*gpio_data));

gpio_data->gpi_irq = regmap_irq_get_virq(irqchip_data, GPI_NUM);

Quoted 7 lines

gpio_cell.platform_data = gpio_data;

In GPIO driver:

struct max77650_gpio_pdata *gpio_data = pdev->dev.platform_data;

int irq = gpio_data->gpi_irq;

Definitely not. What you're trying to do is a hack.

Quoted 7 lines

If you're using Regmap to handle your IRQs, then you should use Regmap in the client to pull them out. Setting them via Regmap, then pulling them out again in the *same driver*, only to store them in platform data to be passed to a child device is bonkers.

*Either* use the MFD provided platform-data helpers *or* pass and handle them via the Regmap APIs, *not* both.

Right, a plan has been formed.

Hopefully this works and you can avoid all this dancing around.

Firstly, you need to make a small change to:

Quoted 7 lines
Quoted 5 lines

drivers/base/regmap/regmap-irq.c

Add the following function:

struct irq_domain *regmap_irq_get_domain(struct regmap *map)

We already do have such function and a lot of mfd drivers actually use it.

Even better.

Quoted 10 lines
Quoted 8 lines

As you can see, it will return the IRQ Domain for the chip.

You can then pass this IRQ domain to mfd_add_devices() and it will do the HWIRQ => VIRQ mapping for you on the fly. Meaning that you can remove all the nastiness in max77650_setup_irqs() and have the Input device use the standard (e.g. platform_get_irq()) APIs.

How does that Sound?

This does sound better! Why didn't you lead with that in the first place?

I'm not even going to dignify that stupid question with a response.

Quoted 3 lines

It's a pity it's not documented, I had to look at the code to find out irq resources would get translated in mfd_add_devices() if a domain is present.

Where is it likely to be documented? MFD is pretty simple and seldom needs explanation. A 3 second look at the API you're trying to use (instead of blind copy & paste) would have told you that it's possible to take an IRQ domain as an argument.

It's only the craziness in this patch which forced me to look into how Regmap handles IRQs and come up with a subsequent solution which fits your use-case.

Quoted 3 lines

In that case - I really don't see a reason to create a superfluous structure to only hold the main regmap - we can very well get it from the parent device in sub-drivers as I do now.

The whole point of this solution is that you don't need to pass anything non-standard (i.e. not provided by the current APIs) to the child device.

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#19 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

śr., 13 lut 2019 o 10:53 Lee Jones <[email protected]> napisał(a):

Quoted 104 lines · Bartosz Golaszewski
Quoted 85 lines

śr., 13 lut 2019 o 10:25 Lee Jones <[email protected]> napisał(a):

Quoted 83 lines · Lee Jones
Quoted 67 lines · Bartosz Golaszewski
Quoted 55 lines

wt., 12 lut 2019 o 12:14 Lee Jones <[email protected]> napisał(a):

Quoted 32 lines · Bartosz Golaszewski
Quoted 30 lines

wt., 12 lut 2019 o 11:18 Lee Jones <[email protected]> napisał(a):

Quoted 28 lines · Bartosz Golaszewski
Quoted 10 lines

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 6 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 12 lines
Quoted 9 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

I'm not sure what you mean by "like everyone else does" - different mfd drivers seem to be doing different things. Is a simple struct containing virtual irq numbers passed to sub-drivers fine?

How do you plan on deriving the VIRQs to place into the struct?

Exampe:

struct max77650_gpio_pdata {
    int gpi_irq;
};

In MFD driver:

struct max77650_gpio_pdata *gpio_data = devm_kmalloc(dev, sizeof(*gpio_data));

gpio_data->gpi_irq = regmap_irq_get_virq(irqchip_data, GPI_NUM);

Quoted 7 lines

gpio_cell.platform_data = gpio_data;

In GPIO driver:

struct max77650_gpio_pdata *gpio_data = pdev->dev.platform_data;

int irq = gpio_data->gpi_irq;

Definitely not. What you're trying to do is a hack.

Quoted 7 lines

If you're using Regmap to handle your IRQs, then you should use Regmap in the client to pull them out. Setting them via Regmap, then pulling them out again in the *same driver*, only to store them in platform data to be passed to a child device is bonkers.

*Either* use the MFD provided platform-data helpers *or* pass and handle them via the Regmap APIs, *not* both.

Right, a plan has been formed.

Hopefully this works and you can avoid all this dancing around.

Firstly, you need to make a small change to:

Quoted 7 lines
Quoted 5 lines

drivers/base/regmap/regmap-irq.c

Add the following function:

struct irq_domain *regmap_irq_get_domain(struct regmap *map)

We already do have such function and a lot of mfd drivers actually use it.

Even better.

Quoted 7 lines
Quoted 7 lines

As you can see, it will return the IRQ Domain for the chip.

You can then pass this IRQ domain to mfd_add_devices() and it will do the HWIRQ => VIRQ mapping for you on the fly. Meaning that you can remove all the nastiness in max77650_setup_irqs() and have the Input device use the standard (e.g. platform_get_irq()) APIs.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

How does that Sound?

This does sound better! Why didn't you lead with that in the first place?

I'm not even going to dignify that stupid question with a response.

It's not a stupid question and you're being unnecessarily rude. As an expert in the subsystem you maintain you could have answered simply with a "this is wrong, retrieve the irq domain from the regmap irq_chip and pass it over to mfd_add_devices, the mfd core will create appropriate mappings".

Quoted 13 lines
Quoted 3 lines

It's a pity it's not documented, I had to look at the code to find out irq resources would get translated in mfd_add_devices() if a domain is present.

Where is it likely to be documented? MFD is pretty simple and seldom needs explanation. A 3 second look at the API you're trying to use (instead of blind copy & paste) would have told you that it's possible to take an IRQ domain as an argument.

It's only the craziness in this patch which forced me to look into how Regmap handles IRQs and come up with a subsequent solution which fits your use-case.

Quoted 8 lines
Quoted 3 lines

In that case - I really don't see a reason to create a superfluous structure to only hold the main regmap - we can very well get it from the parent device in sub-drivers as I do now.

The whole point of this solution is that you don't need to pass anything non-standard (i.e. not provided by the current APIs) to the child device.

I don't understand what you're saying here.

Bartosz

#20 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

Quoted 109 lines · Bartosz Golaszewski

śr., 13 lut 2019 o 10:53 Lee Jones <[email protected]> napisał(a):

Quoted 108 lines · Bartosz Golaszewski
Quoted 85 lines

śr., 13 lut 2019 o 10:25 Lee Jones <[email protected]> napisał(a):

Quoted 83 lines · Lee Jones
Quoted 67 lines · Bartosz Golaszewski
Quoted 55 lines

wt., 12 lut 2019 o 12:14 Lee Jones <[email protected]> napisał(a):

Quoted 32 lines · Bartosz Golaszewski
Quoted 30 lines

wt., 12 lut 2019 o 11:18 Lee Jones <[email protected]> napisał(a):

Quoted 28 lines · Bartosz Golaszewski
Quoted 10 lines

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 6 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 12 lines
Quoted 9 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

I'm not sure what you mean by "like everyone else does" - different mfd drivers seem to be doing different things. Is a simple struct containing virtual irq numbers passed to sub-drivers fine?

How do you plan on deriving the VIRQs to place into the struct?

Exampe:

struct max77650_gpio_pdata {
    int gpi_irq;
};

In MFD driver:

struct max77650_gpio_pdata *gpio_data = devm_kmalloc(dev, sizeof(*gpio_data));

gpio_data->gpi_irq = regmap_irq_get_virq(irqchip_data, GPI_NUM);

Quoted 7 lines

gpio_cell.platform_data = gpio_data;

In GPIO driver:

struct max77650_gpio_pdata *gpio_data = pdev->dev.platform_data;

int irq = gpio_data->gpi_irq;

Definitely not. What you're trying to do is a hack.

Quoted 7 lines

If you're using Regmap to handle your IRQs, then you should use Regmap in the client to pull them out. Setting them via Regmap, then pulling them out again in the *same driver*, only to store them in platform data to be passed to a child device is bonkers.

*Either* use the MFD provided platform-data helpers *or* pass and handle them via the Regmap APIs, *not* both.

Right, a plan has been formed.

Hopefully this works and you can avoid all this dancing around.

Firstly, you need to make a small change to:

Quoted 7 lines
Quoted 5 lines

drivers/base/regmap/regmap-irq.c

Add the following function:

struct irq_domain *regmap_irq_get_domain(struct regmap *map)

We already do have such function and a lot of mfd drivers actually use it.

Even better.

Quoted 10 lines
Quoted 8 lines

As you can see, it will return the IRQ Domain for the chip.

You can then pass this IRQ domain to mfd_add_devices() and it will do the HWIRQ => VIRQ mapping for you on the fly. Meaning that you can remove all the nastiness in max77650_setup_irqs() and have the Input device use the standard (e.g. platform_get_irq()) APIs.

How does that Sound?

This does sound better! Why didn't you lead with that in the first place?

Quoted 7 lines
Quoted 1 line

I'm not even going to dignify that stupid question with a response.

It's not a stupid question and you're being unnecessarily rude. As an expert in the subsystem you maintain you could have answered simply with a "this is wrong, retrieve the irq domain from the regmap irq_chip and pass it over to mfd_add_devices, the mfd core will create appropriate mappings".

Could be culture clash, but I found the question offensive which is why I chose not to answer it. The reason is actually explained below:

"It's only the craziness in this patch which forced me to look into how
Regmap handles IRQs and come up with a subsequent solution which fits your use-case."

Thus the fact that a) Regmap used IRQ domains and b) the IRQ domain could be fetched and reused here didn't enter my thought process until I delved into the inner workings of Regmap.

Yes, I know MFD pretty well, but I only tend to deep-dive into other subsystems, particularly ones as complicated as Regmap, when it's necessary to do so. Now I know a little more about it, I can provide the feedback you suggest going forward.

Quoted 17 lines
Quoted 17 lines
Quoted 3 lines

It's a pity it's not documented, I had to look at the code to find out irq resources would get translated in mfd_add_devices() if a domain is present.

Where is it likely to be documented? MFD is pretty simple and seldom needs explanation. A 3 second look at the API you're trying to use (instead of blind copy & paste) would have told you that it's possible to take an IRQ domain as an argument.

It's only the craziness in this patch which forced me to look into how Regmap handles IRQs and come up with a subsequent solution which fits your use-case.

Quoted 3 lines

In that case - I really don't see a reason to create a superfluous structure to only hold the main regmap - we can very well get it from the parent device in sub-drivers as I do now.

Quoted 5 lines
Quoted 3 lines

The whole point of this solution is that you don't need to pass anything non-standard (i.e. not provided by the current APIs) to the child device.

I don't understand what you're saying here.

I'm saying that the structure you speak of is no longer required.

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#21 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

śr., 13 lut 2019 o 11:39 Lee Jones <[email protected]> napisał(a):

Quoted 114 lines · Bartosz Golaszewski
Quoted 112 lines

śr., 13 lut 2019 o 10:53 Lee Jones <[email protected]> napisał(a):

Quoted 109 lines · Bartosz Golaszewski
Quoted 85 lines

śr., 13 lut 2019 o 10:25 Lee Jones <[email protected]> napisał(a):

Quoted 83 lines · Lee Jones
Quoted 67 lines · Bartosz Golaszewski
Quoted 55 lines

wt., 12 lut 2019 o 12:14 Lee Jones <[email protected]> napisał(a):

Quoted 32 lines · Bartosz Golaszewski
Quoted 30 lines

wt., 12 lut 2019 o 11:18 Lee Jones <[email protected]> napisał(a):

Quoted 28 lines · Bartosz Golaszewski
Quoted 10 lines

wt., 12 lut 2019 o 10:55 Lee Jones <[email protected]> napisał(a):

Quoted 6 lines

* The declaration of a superfluous struct
* 100 lines of additional/avoidable code
* Hacky hoop jumping trying to fudge VIRQs into resources
* Resources were designed for HWIRQs (unless a domain is present)
* Loads of additional/avoidable CPU cycles setting all this up

While the above may be right, this one is negligible and you know it. :)

You have nested for() loops. You *are* wasting lots of cycles.

Quoted 12 lines
Quoted 9 lines

Need I go on? :)

Surely the fact that you are using both sides of an API (devm_regmap_init_i2c and regmap_irq_get_*) in the same driver, must set some alarm bells ringing?

This whole HWIRQ setting, VIRQ getting, resource hacking is a mess.

And for what? To avoid passing IRQ data to a child driver?

What do you propose? Should I go back to the approach in v1 and pass the regmap_irq_chip_data to child drivers?

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

I'm saying you should remove all of this hackery and pass IRQs as they are supposed to be passed (like everyone else does).

I'm not sure what you mean by "like everyone else does" - different mfd drivers seem to be doing different things. Is a simple struct containing virtual irq numbers passed to sub-drivers fine?

How do you plan on deriving the VIRQs to place into the struct?

Exampe:

struct max77650_gpio_pdata {
    int gpi_irq;
};

In MFD driver:

struct max77650_gpio_pdata *gpio_data = devm_kmalloc(dev, sizeof(*gpio_data));

gpio_data->gpi_irq = regmap_irq_get_virq(irqchip_data, GPI_NUM);

Quoted 7 lines

gpio_cell.platform_data = gpio_data;

In GPIO driver:

struct max77650_gpio_pdata *gpio_data = pdev->dev.platform_data;

int irq = gpio_data->gpi_irq;

Definitely not. What you're trying to do is a hack.

Quoted 7 lines

If you're using Regmap to handle your IRQs, then you should use Regmap in the client to pull them out. Setting them via Regmap, then pulling them out again in the *same driver*, only to store them in platform data to be passed to a child device is bonkers.

*Either* use the MFD provided platform-data helpers *or* pass and handle them via the Regmap APIs, *not* both.

Right, a plan has been formed.

Hopefully this works and you can avoid all this dancing around.

Firstly, you need to make a small change to:

Quoted 7 lines
Quoted 5 lines

drivers/base/regmap/regmap-irq.c

Add the following function:

struct irq_domain *regmap_irq_get_domain(struct regmap *map)

We already do have such function and a lot of mfd drivers actually use it.

Even better.

Quoted 10 lines
Quoted 8 lines

As you can see, it will return the IRQ Domain for the chip.

You can then pass this IRQ domain to mfd_add_devices() and it will do the HWIRQ => VIRQ mapping for you on the fly. Meaning that you can remove all the nastiness in max77650_setup_irqs() and have the Input device use the standard (e.g. platform_get_irq()) APIs.

How does that Sound?

This does sound better! Why didn't you lead with that in the first place?

I'm not even going to dignify that stupid question with a response.

Quoted 9 lines
Quoted 5 lines

It's not a stupid question and you're being unnecessarily rude. As an expert in the subsystem you maintain you could have answered simply with a "this is wrong, retrieve the irq domain from the regmap irq_chip and pass it over to mfd_add_devices, the mfd core will create appropriate mappings".

Could be culture clash, but I found the question offensive which is why I chose not to answer it. The reason is actually explained below:

It wasn't meant to be offensive. I guess when dealing with non-native English speakers over e-mail it's best to assume good faith.

Quoted 30 lines

"It's only the craziness in this patch which forced me to look into how
Regmap handles IRQs and come up with a subsequent solution which fits your use-case."

Thus the fact that a) Regmap used IRQ domains and b) the IRQ domain could be fetched and reused here didn't enter my thought process until I delved into the inner workings of Regmap.

Yes, I know MFD pretty well, but I only tend to deep-dive into other subsystems, particularly ones as complicated as Regmap, when it's necessary to do so. Now I know a little more about it, I can provide the feedback you suggest going forward.

Quoted 17 lines
Quoted 17 lines
Quoted 3 lines

It's a pity it's not documented, I had to look at the code to find out irq resources would get translated in mfd_add_devices() if a domain is present.

Where is it likely to be documented? MFD is pretty simple and seldom needs explanation. A 3 second look at the API you're trying to use (instead of blind copy & paste) would have told you that it's possible to take an IRQ domain as an argument.

It's only the craziness in this patch which forced me to look into how Regmap handles IRQs and come up with a subsequent solution which fits your use-case.

Quoted 3 lines

In that case - I really don't see a reason to create a superfluous structure to only hold the main regmap - we can very well get it from the parent device in sub-drivers as I do now.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

The whole point of this solution is that you don't need to pass anything non-standard (i.e. not provided by the current APIs) to the child device.

I don't understand what you're saying here.

I'm saying that the structure you speak of is no longer required.

Thanks for clarifying.

Bartosz

#22 lore raw

Re: [PATCH v4 05/10] mfd: max77650: new core mfd driver

In reply to Bartosz Golaszewski

Hi!

Quoted 11 lines
Quoted 8 lines

As you can see, it will return the IRQ Domain for the chip.

You can then pass this IRQ domain to mfd_add_devices() and it will do the HWIRQ => VIRQ mapping for you on the fly. Meaning that you can remove all the nastiness in max77650_setup_irqs() and have the Input device use the standard (e.g. platform_get_irq()) APIs.

How does that Sound?

This does sound better! Why didn't you lead with that in the first place?

TBH, this can be considered rude and I'm not surprised Lee reacted the way he did.

Quoted 3 lines

It's a pity it's not documented, I had to look at the code to find out irq resources would get translated in mfd_add_devices() if a domain is present.

I guess documentation patch would be welcome.

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
#23 lore raw

PATCH v4 6/10 power: supply: max77650: add support for battery charger

In reply to Bartosz Golaszewski

From: 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
index e901b9879e7e..0230c96fa94d 100644
@@ -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
index b731c2a9b695..b73eb8c5c1a9 100644
@@ -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
#24 lore raw

Re: [PATCH v4 06/10] power: supply: max77650: add support for battery charger

Sebastian,

Just waiting on your Ack for the set.

Could you review this please?

Quoted 403 lines

From: 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
index e901b9879e7e..0230c96fa94d 100644
@@ -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
index b731c2a9b695..b73eb8c5c1a9 100644
@@ -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
new file mode 100644
index 000000000000..7055c9b5ee24
@@ -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.
+
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/max77650.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/power_supply.h>
+#include <linux/regmap.h>
+
+#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
+#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
+
+#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
+
+#define MAX77650_CHARGER_CHG_MASK	BIT(1)
+#define MAX77650_CHARGER_CHG_CHARGING(_reg) \
+		(((_reg) & MAX77650_CHARGER_CHG_MASK) > 1)
+
+#define MAX77650_CHARGER_VCHGIN_MIN_MASK	0xc0
+#define MAX77650_CHARGER_VCHGIN_MIN_SHIFT(_val)	((_val) << 5)
+
+#define MAX77650_CHARGER_ICHGIN_LIM_MASK	0x1c
+#define MAX77650_CHARGER_ICHGIN_LIM_SHIFT(_val)	((_val) << 2)
+
+struct max77650_charger_data {
+	struct regmap *map;
+	struct device *dev;
+};
+
+static enum power_supply_property max77650_charger_properties[] = {
+	POWER_SUPPLY_PROP_STATUS,
+	POWER_SUPPLY_PROP_ONLINE,
+	POWER_SUPPLY_PROP_CHARGE_TYPE
+};
+
+static const unsigned int max77650_charger_vchgin_min_table[] = {
+	4000000, 4100000, 4200000, 4300000, 4400000, 4500000, 4600000, 4700000
+};
+
+static const unsigned int max77650_charger_ichgin_lim_table[] = {
+	95000, 190000, 285000, 380000, 475000
+};
+
+static int max77650_charger_set_vchgin_min(struct max77650_charger_data *chg,
+					   unsigned int val)
+{
+	int i, rv;
+
+	for (i = 0; i < ARRAY_SIZE(max77650_charger_vchgin_min_table); i++) {
+		if (val == max77650_charger_vchgin_min_table[i]) {
+			rv = regmap_update_bits(chg->map,
+					MAX77650_REG_CNFG_CHG_B,
+					MAX77650_CHARGER_VCHGIN_MIN_MASK,
+					MAX77650_CHARGER_VCHGIN_MIN_SHIFT(i));
+			if (rv)
+				return rv;
+
+			return 0;
+		}
+	}
+
+	return -EINVAL;
+}
+
+static int max77650_charger_set_ichgin_lim(struct max77650_charger_data *chg,
+					   unsigned int val)
+{
+	int i, rv;
+
+	for (i = 0; i < ARRAY_SIZE(max77650_charger_ichgin_lim_table); i++) {
+		if (val == max77650_charger_ichgin_lim_table[i]) {
+			rv = regmap_update_bits(chg->map,
+					MAX77650_REG_CNFG_CHG_B,
+					MAX77650_CHARGER_ICHGIN_LIM_MASK,
+					MAX77650_CHARGER_ICHGIN_LIM_SHIFT(i));
+			if (rv)
+				return rv;
+
+			return 0;
+		}
+	}
+
+	return -EINVAL;
+}
+
+static void max77650_charger_enable(struct max77650_charger_data *chg)
+{
+	int rv;
+
+	rv = regmap_update_bits(chg->map,
+				MAX77650_REG_CNFG_CHG_B,
+				MAX77650_CHARGER_CHG_EN_MASK,
+				MAX77650_CHARGER_ENABLED);
+	if (rv)
+		dev_err(chg->dev, "unable to enable the charger: %d\n", rv);
+}
+
+static void max77650_charger_disable(struct max77650_charger_data *chg)
+{
+	int rv;
+
+	rv = regmap_update_bits(chg->map,
+				MAX77650_REG_CNFG_CHG_B,
+				MAX77650_CHARGER_CHG_EN_MASK,
+				MAX77650_CHARGER_DISABLED);
+	if (rv)
+		dev_err(chg->dev, "unable to disable the charger: %d\n", rv);
+}
+
+static irqreturn_t max77650_charger_check_status(int irq, void *data)
+{
+	struct max77650_charger_data *chg = data;
+	int rv, reg;
+
+	rv = regmap_read(chg->map, MAX77650_REG_STAT_CHG_B, &reg);
+	if (rv) {
+		dev_err(chg->dev,
+			"unable to read the charger status: %d\n", rv);
+		return IRQ_HANDLED;
+	}
+
+	switch (MAX77650_CHARGER_CHGIN_DTLS_BITS(reg)) {
+	case MAX77650_CHARGER_CHGIN_UVL:
+		dev_err(chg->dev, "undervoltage lockout detected, disabling charger\n");
+		max77650_charger_disable(chg);
+		break;
+	case MAX77650_CHARGER_CHGIN_OVL:
+		dev_err(chg->dev, "overvoltage lockout detected, disabling charger\n");
+		max77650_charger_disable(chg);
+		break;
+	case MAX77650_CHARGER_CHGIN_OKAY:
+		max77650_charger_enable(chg);
+		break;
+	default:
+		/* May be 0x10 - debouncing */
+		break;
+	}
+
+	return IRQ_HANDLED;
+}
+
+static int max77650_charger_get_property(struct power_supply *psy,
+					 enum power_supply_property psp,
+					 union power_supply_propval *val)
+{
+	struct max77650_charger_data *chg = power_supply_get_drvdata(psy);
+	int rv, reg;
+
+	switch (psp) {
+	case POWER_SUPPLY_PROP_STATUS:
+		rv = regmap_read(chg->map, MAX77650_REG_STAT_CHG_B, &reg);
+		if (rv)
+			return rv;
+
+		if (MAX77650_CHARGER_CHG_CHARGING(reg)) {
+			val->intval = POWER_SUPPLY_STATUS_CHARGING;
+			break;
+		}
+
+		switch (MAX77650_CHARGER_CHG_DTLS_BITS(reg)) {
+		case MAX77650_CHARGER_CHG_OFF:
+		case MAX77650_CHARGER_CHG_SUSP_PF:
+		case MAX77650_CHARGER_CHG_SUSP_FCF:
+		case MAX77650_CHARGER_CHG_SUSP_BTF:
+			val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+			break;
+		case MAX77650_CHARGER_CHG_PREQ:
+		case MAX77650_CHARGER_CHG_ON_CURR:
+		case MAX77650_CHARGER_CHG_ON_JCURR:
+		case MAX77650_CHARGER_CHG_ON_VOLT:
+		case MAX77650_CHARGER_CHG_ON_JVOLT:
+		case MAX77650_CHARGER_CHG_ON_TOPOFF:
+		case MAX77650_CHARGER_CHG_ON_JTOPOFF:
+			val->intval = POWER_SUPPLY_STATUS_CHARGING;
+			break;
+		case MAX77650_CHARGER_CHG_DONE:
+			val->intval = POWER_SUPPLY_STATUS_FULL;
+			break;
+		default:
+			val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
+		}
+		break;
+	case POWER_SUPPLY_PROP_ONLINE:
+		rv = regmap_read(chg->map, MAX77650_REG_STAT_CHG_B, &reg);
+		if (rv)
+			return rv;
+
+		val->intval = MAX77650_CHARGER_CHG_CHARGING(reg);
+		break;
+	case POWER_SUPPLY_PROP_CHARGE_TYPE:
+		rv = regmap_read(chg->map, MAX77650_REG_STAT_CHG_B, &reg);
+		if (rv)
+			return rv;
+
+		if (!MAX77650_CHARGER_CHG_CHARGING(reg)) {
+			val->intval = POWER_SUPPLY_CHARGE_TYPE_NONE;
+			break;
+		}
+
+		switch (MAX77650_CHARGER_CHG_DTLS_BITS(reg)) {
+		case MAX77650_CHARGER_CHG_PREQ:
+		case MAX77650_CHARGER_CHG_ON_CURR:
+		case MAX77650_CHARGER_CHG_ON_JCURR:
+		case MAX77650_CHARGER_CHG_ON_VOLT:
+		case MAX77650_CHARGER_CHG_ON_JVOLT:
+			val->intval = POWER_SUPPLY_CHARGE_TYPE_FAST;
+			break;
+		case MAX77650_CHARGER_CHG_ON_TOPOFF:
+		case MAX77650_CHARGER_CHG_ON_JTOPOFF:
+			val->intval = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
+			break;
+		default:
+			val->intval = POWER_SUPPLY_CHARGE_TYPE_UNKNOWN;
+		}
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static const struct power_supply_desc max77650_battery_desc = {
+	.name		= "max77650",
+	.type		= POWER_SUPPLY_TYPE_USB,
+	.get_property	= max77650_charger_get_property,
+	.properties	= max77650_charger_properties,
+	.num_properties	= ARRAY_SIZE(max77650_charger_properties),
+};
+
+static int max77650_charger_probe(struct platform_device *pdev)
+{
+	struct power_supply_config pscfg = {};
+	struct max77650_charger_data *chg;
+	struct power_supply *battery;
+	struct device *dev, *parent;
+	int rv, chg_irq, chgin_irq;
+	unsigned int prop;
+
+	dev = &pdev->dev;
+	parent = dev->parent;
+
+	chg = devm_kzalloc(dev, sizeof(*chg), GFP_KERNEL);
+	if (!chg)
+		return -ENOMEM;
+
+	platform_set_drvdata(pdev, chg);
+
+	chg->map = dev_get_regmap(parent, NULL);
+	if (!chg->map)
+		return -ENODEV;
+
+	chg->dev = dev;
+
+	pscfg.of_node = dev->of_node;
+	pscfg.drv_data = chg;
+
+	chg_irq = platform_get_irq_byname(pdev, "CHG");
+	if (chg_irq < 0)
+		return chg_irq;
+
+	chgin_irq = platform_get_irq_byname(pdev, "CHGIN");
+	if (chgin_irq < 0)
+		return chgin_irq;
+
+	rv = devm_request_any_context_irq(dev, chg_irq,
+					  max77650_charger_check_status,
+					  IRQF_ONESHOT, "chg", chg);
+	if (rv < 0)
+		return rv;
+
+	rv = devm_request_any_context_irq(dev, chgin_irq,
+					  max77650_charger_check_status,
+					  IRQF_ONESHOT, "chgin", chg);
+	if (rv < 0)
+		return rv;
+
+	battery = devm_power_supply_register(dev,
+					     &max77650_battery_desc, &pscfg);
+	if (IS_ERR(battery))
+		return PTR_ERR(battery);
+
+	rv = of_property_read_u32(dev->of_node, "maxim,vchgin-min", &prop);
+	if (rv == 0) {
+		rv = max77650_charger_set_vchgin_min(chg, prop);
+		if (rv)
+			return rv;
+	}
+
+	rv = of_property_read_u32(dev->of_node, "maxim,ichgin-lim", &prop);
+	if (rv == 0) {
+		rv = max77650_charger_set_ichgin_lim(chg, prop);
+		if (rv)
+			return rv;
+	}
+
+	return regmap_update_bits(chg->map,
+				  MAX77650_REG_CNFG_CHG_B,
+				  MAX77650_CHARGER_CHG_EN_MASK,
+				  MAX77650_CHARGER_ENABLED);
+}
+
+static int max77650_charger_remove(struct platform_device *pdev)
+{
+	struct max77650_charger_data *chg = platform_get_drvdata(pdev);
+
+	return regmap_update_bits(chg->map,
+				  MAX77650_REG_CNFG_CHG_B,
+				  MAX77650_CHARGER_CHG_EN_MASK,
+				  MAX77650_CHARGER_DISABLED);
+}
+
+static struct platform_driver max77650_charger_driver = {
+	.driver = {
+		.name = "max77650-charger",
+	},
+	.probe = max77650_charger_probe,
+	.remove = max77650_charger_remove,
+};
+module_platform_driver(max77650_charger_driver);
+
+MODULE_DESCRIPTION("MAXIM 77650/77651 charger driver");
+MODULE_AUTHOR("Bartosz Golaszewski <[email protected]>");
+MODULE_LICENSE("GPL v2");
Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#25 lore raw

PATCH v4 7/10 gpio: max77650: add GPIO support

In reply to Bartosz Golaszewski

From: 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 | 190 +++++++++++++++++++++++++++++++++++
 3 files changed, 198 insertions(+)
 create mode 100644 drivers/gpio/gpio-max77650.c
drivers/gpio/Kconfig +7 -0
index b5a2845347ec..fb297fe5bfec 100644
@@ -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
index 37628f8dbf70..8bdad50db822 100644
@@ -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 +190 -0

190 lines not on this page · raw message

Signature · 1 line
2.20.1
#27 lore raw

PATCH v4 8/10 leds: max77650: add LEDs support

In reply to 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.

---
 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
index a72f97fca57b..6e7a8f51eccc 100644
@@ -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
index 4c1b0054f379..f48b2404dbb7 100644
@@ -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
#28 lore raw

PATCH v4 9/10 input: max77650: add onkey support

In reply to Bartosz Golaszewski

From: 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
index ca59a2be9bc5..bb9c45c1269e 100644
@@ -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
index 9d0f9d1ff68f..5bd53590ce60 100644
@@ -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
#29 lore raw

PATCH v4 10/10 MAINTAINERS: add an entry for max77650 mfd driver

In reply to Bartosz Golaszewski

From: 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
index 8c68de3cfd80..70106d30272b 100644
@@ -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