Skip to contentSkip to conversation

mfd: axp20x: Generalise handling without interrupt

PATCH Applied Andre Przywara 3 participants 5 messages Aug 28, 2023 – Sep 20, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mfd: axp20x: Generalise handling without interrupt

At the moment we allow the AXP15060 and the AXP806 PMICs to omit the interrupt line to the SoC, and we skip registering the PEK (power key) driver in this case, since that crashes when no IRQ is described in the DT node.
The IRQ pin potentially not being connected to anything does affect more PMICs, though, and the PEK driver is not the only one requiring an
interrupt: at least the AC power supply driver crashes in a similar fashion.

Generalise the handling of AXP MFD devices when the platform tables describe no interrupt, by allowing each device to specify an alternative MFD list for this case. If no specific alternative is specified, we go with the safe default of "just the regulators", which matches the current situation.

This enables new devices using the AXP313a PMIC, but not connecting the IRQ pin.

---
Changelog v2 .. v1:
- drop reordering approach, use separate cell lists

 drivers/mfd/axp20x.c | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)
drivers/mfd/axp20x.c +24 -20
index c03bc5cda080a..239e7f18956ae 100644
@@ -1133,6 +1133,8 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 	struct device *dev = axp20x->dev;
 	const struct acpi_device_id *acpi_id;
 	const struct of_device_id *of_id;
+	const struct mfd_cell *cells_no_irq = NULL;
+	int nr_cells_no_irq = 0;
 
 	if (dev->of_node) {
 		of_id = of_match_device(dev->driver->of_match_table, dev);
@@ -1207,14 +1209,15 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 		 * if there is no interrupt line.
 		 */
 		if (of_property_read_bool(axp20x->dev->of_node,
-					  "x-powers,self-working-mode") &&
-		    axp20x->irq > 0) {
+					  "x-powers,self-working-mode")) {
 			axp20x->nr_cells = ARRAY_SIZE(axp806_self_working_cells);
 			axp20x->cells = axp806_self_working_cells;
 		} else {
 			axp20x->nr_cells = ARRAY_SIZE(axp806_cells);
 			axp20x->cells = axp806_cells;
 		}
+		nr_cells_no_irq = ARRAY_SIZE(axp806_cells);
+		cells_no_irq = axp806_cells;
 		axp20x->regmap_cfg = &axp806_regmap_config;
 		axp20x->regmap_irq_chip = &axp806_regmap_irq_chip;
 		break;
@@ -1238,24 +1241,8 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 		axp20x->regmap_irq_chip = &axp803_regmap_irq_chip;
 		break;
 	case AXP15060_ID:
-		/*
-		 * Don't register the power key part if there is no interrupt
-		 * line.
-		 *
-		 * Since most use cases of AXP PMICs are Allwinner SOCs, board
-		 * designers follow Allwinner's reference design and connects
-		 * IRQ line to SOC, there's no need for those variants to deal
-		 * with cases that IRQ isn't connected. However, AXP15660 is
-		 * used by some other vendors' SOCs that didn't connect IRQ
-		 * line, we need to deal with this case.
-		 */
-		if (axp20x->irq > 0) {
-			axp20x->nr_cells = ARRAY_SIZE(axp15060_cells);
-			axp20x->cells = axp15060_cells;
-		} else {
-			axp20x->nr_cells = ARRAY_SIZE(axp_regulator_only_cells);
-			axp20x->cells = axp_regulator_only_cells;
-		}
+		axp20x->nr_cells = ARRAY_SIZE(axp15060_cells);
+		axp20x->cells = axp15060_cells;
 		axp20x->regmap_cfg = &axp15060_regmap_config;
 		axp20x->regmap_irq_chip = &axp15060_regmap_irq_chip;
 		break;
@@ -1263,6 +1250,23 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 		dev_err(dev, "unsupported AXP20X ID %lu\n", axp20x->variant);
 		return -EINVAL;
 	}
+
+	/*
+	 * Use an alternative cell array when no interrupt line is connected,
+	 * since IRQs are required by some drivers.
+	 * The default is the safe "regulator-only", as this works fine without
+	 * an interrupt specified.
+	 */
+	if (axp20x->irq <= 0) {
+		if (cells_no_irq) {
+			axp20x->nr_cells = nr_cells_no_irq;
+			axp20x->cells = cells_no_irq;
+		} else {
+			axp20x->nr_cells = ARRAY_SIZE(axp_regulator_only_cells);
+			axp20x->cells = axp_regulator_only_cells;
+		}
+	}
+
 	dev_info(dev, "AXP20x variant %s found\n",
 		 axp20x_model_names[axp20x->variant]);
 
Signature · 1 line
2.35.8
maintainer
#1 lore raw
Quoted 31 lines · CEST Andre Przywara

At the moment we allow the AXP15060 and the AXP806 PMICs to omit the interrupt line to the SoC, and we skip registering the PEK (power key) driver in this case, since that crashes when no IRQ is described in the DT node.
The IRQ pin potentially not being connected to anything does affect more PMICs, though, and the PEK driver is not the only one requiring an
interrupt: at least the AC power supply driver crashes in a similar fashion.

Generalise the handling of AXP MFD devices when the platform tables describe no interrupt, by allowing each device to specify an alternative MFD list for this case. If no specific alternative is specified, we go with the safe default of "just the regulators", which matches the current situation.

This enables new devices using the AXP313a PMIC, but not connecting the IRQ pin.

---
Changelog v2 .. v1:
- drop reordering approach, use separate cell lists

 drivers/mfd/axp20x.c | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)
drivers/mfd/axp20x.c +0 -0
index c03bc5cda080a..239e7f18956ae 100644

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1140

Quoted 8 lines
drivers/mfd/axp20x.c +2 -0
@@ -1133,6 +1133,8 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 	struct device *dev = axp20x->dev;
 	const struct acpi_device_id *acpi_id;
 	const struct of_device_id *of_id;
+	const struct mfd_cell *cells_no_irq = NULL;
+	int nr_cells_no_irq = 0;
 
 	if (dev->of_node) {
 		of_id = of_match_device(dev->driver->of_match_table, 

dev);

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1210

Quoted 5 lines
drivers/mfd/axp20x.c +0 -1
@@ -1207,14 +1209,15 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 		 * if there is no interrupt line.
 		 */
 		if (of_property_read_bool(axp20x->dev->of_node,
-					  "x-powers,self-

working-mode") &&

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1212

Quoted 2 lines
drivers/mfd/axp20x.c +1 -1
-		    axp20x->irq > 0) {
+					  "x-powers,self-

working-mode")) {

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1213

Quoted 1 line
drivers/mfd/axp20x.c +0 -0
 			axp20x->nr_cells = 

ARRAY_SIZE(axp806_self_working_cells);

Quoted 11 lines
drivers/mfd/axp20x.c +2 -0
 			axp20x->cells = axp806_self_working_cells;
 		} else {
 			axp20x->nr_cells = ARRAY_SIZE(axp806_cells);
 			axp20x->cells = axp806_cells;
 		}
+		nr_cells_no_irq = ARRAY_SIZE(axp806_cells);
+		cells_no_irq = axp806_cells;
 		axp20x->regmap_cfg = &axp806_regmap_config;
 		axp20x->regmap_irq_chip = &axp806_regmap_irq_chip;
 		break;

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1242

Quoted 5 lines
drivers/mfd/axp20x.c +0 -2
@@ -1238,24 +1241,8 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 		axp20x->regmap_irq_chip = &axp803_regmap_irq_chip;
 		break;
 	case AXP15060_ID:
-		/*
-		 * Don't register the power key part if there is no 

interrupt

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 3 lines
drivers/mfd/axp20x.c +0 -3
-		 * line.
-		 *
-		 * Since most use cases of AXP PMICs are Allwinner 

SOCs, board

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1246

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * designers follow Allwinner's reference design and 

connects

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1247

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * IRQ line to SOC, there's no need for those variants 

to deal

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1248

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * with cases that IRQ isn't connected. However, 

AXP15660 is

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1249

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * used by some other vendors' SOCs that didn't connect 

IRQ

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 4 lines
drivers/mfd/axp20x.c +0 -4
-		 * line, we need to deal with this case.
-		 */
-		if (axp20x->irq > 0) {
-			axp20x->nr_cells = 

ARRAY_SIZE(axp15060_cells);

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 3 lines
drivers/mfd/axp20x.c +0 -3
-			axp20x->cells = axp15060_cells;
-		} else {
-			axp20x->nr_cells = 

ARRAY_SIZE(axp_regulator_only_cells);

Quoted 8 lines
drivers/mfd/axp20x.c +2 -2
-			axp20x->cells = axp_regulator_only_cells;
-		}
+		axp20x->nr_cells = ARRAY_SIZE(axp15060_cells);
+		axp20x->cells = axp15060_cells;
 		axp20x->regmap_cfg = &axp15060_regmap_config;
 		axp20x->regmap_irq_chip = &axp15060_regmap_irq_chip;
 		break;

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1256

Quoted 7 lines
drivers/mfd/axp20x.c +3 -0
@@ -1263,6 +1250,23 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 		dev_err(dev, "unsupported AXP20X ID %lu\n", axp20x-
 variant);
 		return -EINVAL;
 	}
+
+	/*
+	 * Use an alternative cell array when no interrupt line is 

connected,

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1258

Quoted 2 lines
drivers/mfd/axp20x.c +2 -0
+	 * since IRQs are required by some drivers.
+	 * The default is the safe "regulator-only", as this works fine 

without

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 8 lines
drivers/mfd/axp20x.c +8 -0
+	 * an interrupt specified.
+	 */
+	if (axp20x->irq <= 0) {
+		if (cells_no_irq) {
+			axp20x->nr_cells = nr_cells_no_irq;
+			axp20x->cells = cells_no_irq;
+		} else {
+			axp20x->nr_cells = 

ARRAY_SIZE(axp_regulator_only_cells);

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1266

Quoted 1 line
drivers/mfd/axp20x.c +1 -0
+			axp20x->cells = axp_regulator_only_cells;

axp806_cells (old value for AXP806_ID without irq) and axp_regulator_only_cells differs in id field. Is that an issue?

Best regards,
Jernej

Quoted 5 lines
drivers/mfd/axp20x.c +3 -0
+		}
+	}
+
 	dev_info(dev, "AXP20x variant %s found\n",
 		 axp20x_model_names[axp20x->variant]);
#2 lore raw

On Tue, 05 Sep 2023 22:28:10 +0200
Jernej Škrabec <[email protected]> wrote:

Hi Jernej,

Quoted 118 lines · CEST Andre Przywara
Quoted 31 lines

At the moment we allow the AXP15060 and the AXP806 PMICs to omit the interrupt line to the SoC, and we skip registering the PEK (power key) driver in this case, since that crashes when no IRQ is described in the DT node.
The IRQ pin potentially not being connected to anything does affect more PMICs, though, and the PEK driver is not the only one requiring an
interrupt: at least the AC power supply driver crashes in a similar fashion.

Generalise the handling of AXP MFD devices when the platform tables describe no interrupt, by allowing each device to specify an alternative MFD list for this case. If no specific alternative is specified, we go with the safe default of "just the regulators", which matches the current situation.

This enables new devices using the AXP313a PMIC, but not connecting the IRQ pin.

---
Changelog v2 .. v1:
- drop reordering approach, use separate cell lists

 drivers/mfd/axp20x.c | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)
drivers/mfd/axp20x.c +0 -0
index c03bc5cda080a..239e7f18956ae 100644

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1140

Quoted 8 lines
drivers/mfd/axp20x.c +2 -0
@@ -1133,6 +1133,8 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 	struct device *dev = axp20x->dev;
 	const struct acpi_device_id *acpi_id;
 	const struct of_device_id *of_id;
+	const struct mfd_cell *cells_no_irq = NULL;
+	int nr_cells_no_irq = 0;
 
 	if (dev->of_node) {
 		of_id = of_match_device(dev->driver->of_match_table,   

dev);

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1210

Quoted 5 lines
drivers/mfd/axp20x.c +0 -1
@@ -1207,14 +1209,15 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 		 * if there is no interrupt line.
 		 */
 		if (of_property_read_bool(axp20x->dev->of_node,
-					  "x-powers,self-  

working-mode") &&

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1212

Quoted 2 lines
drivers/mfd/axp20x.c +1 -1
-		    axp20x->irq > 0) {
+					  "x-powers,self-  

working-mode")) {

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1213

Quoted 1 line
drivers/mfd/axp20x.c +0 -0
 			axp20x->nr_cells =   

ARRAY_SIZE(axp806_self_working_cells);

Quoted 11 lines
drivers/mfd/axp20x.c +2 -0
 			axp20x->cells = axp806_self_working_cells;
 		} else {
 			axp20x->nr_cells = ARRAY_SIZE(axp806_cells);
 			axp20x->cells = axp806_cells;
 		}
+		nr_cells_no_irq = ARRAY_SIZE(axp806_cells);
+		cells_no_irq = axp806_cells;
 		axp20x->regmap_cfg = &axp806_regmap_config;
 		axp20x->regmap_irq_chip = &axp806_regmap_irq_chip;
 		break;

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1242

Quoted 5 lines
drivers/mfd/axp20x.c +0 -2
@@ -1238,24 +1241,8 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 		axp20x->regmap_irq_chip = &axp803_regmap_irq_chip;
 		break;
 	case AXP15060_ID:
-		/*
-		 * Don't register the power key part if there is no   

interrupt

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 3 lines
drivers/mfd/axp20x.c +0 -3
-		 * line.
-		 *
-		 * Since most use cases of AXP PMICs are Allwinner   

SOCs, board

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1246

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * designers follow Allwinner's reference design and   

connects

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1247

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * IRQ line to SOC, there's no need for those variants   

to deal

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1248

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * with cases that IRQ isn't connected. However,   

AXP15660 is

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1249

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * used by some other vendors' SOCs that didn't connect   

IRQ

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 4 lines
drivers/mfd/axp20x.c +0 -4
-		 * line, we need to deal with this case.
-		 */
-		if (axp20x->irq > 0) {
-			axp20x->nr_cells =   

ARRAY_SIZE(axp15060_cells);

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 3 lines
drivers/mfd/axp20x.c +0 -3
-			axp20x->cells = axp15060_cells;
-		} else {
-			axp20x->nr_cells =   

ARRAY_SIZE(axp_regulator_only_cells);

Quoted 8 lines
drivers/mfd/axp20x.c +2 -2
-			axp20x->cells = axp_regulator_only_cells;
-		}
+		axp20x->nr_cells = ARRAY_SIZE(axp15060_cells);
+		axp20x->cells = axp15060_cells;
 		axp20x->regmap_cfg = &axp15060_regmap_config;
 		axp20x->regmap_irq_chip = &axp15060_regmap_irq_chip;
 		break;

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1256

Quoted 7 lines
drivers/mfd/axp20x.c +3 -0
@@ -1263,6 +1250,23 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 		dev_err(dev, "unsupported AXP20X ID %lu\n", axp20x-
 variant);
 		return -EINVAL;
 	}
+
+	/*
+	 * Use an alternative cell array when no interrupt line is   

connected,

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1258

Quoted 2 lines
drivers/mfd/axp20x.c +2 -0
+	 * since IRQs are required by some drivers.
+	 * The default is the safe "regulator-only", as this works fine   

without

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 8 lines
drivers/mfd/axp20x.c +8 -0
+	 * an interrupt specified.
+	 */
+	if (axp20x->irq <= 0) {
+		if (cells_no_irq) {
+			axp20x->nr_cells = nr_cells_no_irq;
+			axp20x->cells = cells_no_irq;
+		} else {
+			axp20x->nr_cells =   

ARRAY_SIZE(axp_regulator_only_cells);

Quoted 4 lines

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1266

Quoted 1 line
drivers/mfd/axp20x.c +1 -0
+			axp20x->cells = axp_regulator_only_cells;  

axp806_cells (old value for AXP806_ID without irq) and axp_regulator_only_cells differs in id field. Is that an issue?

Yes, an annoying one, which led me to introduce the ability to let each PMIC override this default. So the case AXP806_ID: above sets the local variable cells_no_irq to axp806_cells, and the check above sees that it has been changed from the NULL initialisation and uses that instead of the default. At least that was my plan, let me know if I messed that up somehow, or if it deserves more comments.

Cheers,
Andre

Quoted 14 lines

Best regards,
Jernej

Quoted 5 lines
drivers/mfd/axp20x.c +3 -0
+		}
+	}
+
 	dev_info(dev, "AXP20x variant %s found\n",
 		 axp20x_model_names[axp20x->variant]);  
maintainer Reviewed-by
#3 lore raw

Dne torek, 05. september 2023 ob 22:46:42 CEST je Andre Przywara napisal(a):

Quoted 78 lines

On Tue, 05 Sep 2023 22:28:10 +0200
Jernej Škrabec <[email protected]> wrote:

Hi Jernej,

Quoted 73 lines · CEST Andre Przywara
Quoted 40 lines

At the moment we allow the AXP15060 and the AXP806 PMICs to omit the interrupt line to the SoC, and we skip registering the PEK (power key) driver in this case, since that crashes when no IRQ is described in the DT node.
The IRQ pin potentially not being connected to anything does affect more PMICs, though, and the PEK driver is not the only one requiring an
interrupt: at least the AC power supply driver crashes in a similar fashion.

Generalise the handling of AXP MFD devices when the platform tables describe no interrupt, by allowing each device to specify an alternative MFD list for this case. If no specific alternative is specified, we go with the safe default of "just the regulators", which matches the current
situation.

This enables new devices using the AXP313a PMIC, but not connecting the IRQ pin.

---
Changelog v2 .. v1:
- drop reordering approach, use separate cell lists

 drivers/mfd/axp20x.c | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)
drivers/mfd/axp20x.c +2 -0
index c03bc5cda080a..239e7f18956ae 100644
@@ -1133,6 +1133,8 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
 
 	struct device *dev = axp20x->dev;
 	const struct acpi_device_id *acpi_id;
 	const struct of_device_id *of_id;
 
+	const struct mfd_cell *cells_no_irq = NULL;
+	int nr_cells_no_irq = 0;
 

drivers/mfd/axp20x.c

Quoted 3 lines
drivers/mfd/axp20x.c +0 -0
 	if (dev->of_node) {
 
 		of_id = of_match_device(dev->driver->of_match_table,

dev);

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev · line 1214

Quoted 9 lines
drivers/mfd/axp20x.c +0 -1
@@ -1207,14 +1209,15 @@ int axp20x_match_device(struct axp20x_dev
 *axp20x)
 
 		 * if there is no interrupt line.
 		 */
 
 		if (of_property_read_bool(axp20x->dev->of_node,
 
-					  "x-powers,self-

working-mode") &&

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev · line 1216

Quoted 2 lines
drivers/mfd/axp20x.c +1 -1
-		    axp20x->irq > 0) {
+					  "x-powers,self-

working-mode")) {

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev · line 1217

Quoted 1 line
drivers/mfd/axp20x.c +0 -0
 			axp20x->nr_cells =

ARRAY_SIZE(axp806_self_working_cells);

Quoted 5 lines
drivers/mfd/axp20x.c +0 -0
 			axp20x->cells = axp806_self_working_cells;
 
 		} else {
 
 			axp20x->nr_cells = 

ARRAY_SIZE(axp806_cells);

Quoted 37 lines
Quoted 37 lines
Quoted 12 lines
drivers/mfd/axp20x.c +2 -0
 			axp20x->cells = axp806_cells;
 
 		}
 
+		nr_cells_no_irq = ARRAY_SIZE(axp806_cells);
+		cells_no_irq = axp806_cells;
 
 		axp20x->regmap_cfg = &axp806_regmap_config;
 		axp20x->regmap_irq_chip = &axp806_regmap_irq_chip;
 		break;

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev · line 1245

Quoted 8 lines
drivers/mfd/axp20x.c +0 -2
@@ -1238,24 +1241,8 @@ int axp20x_match_device(struct axp20x_dev
 *axp20x)
 
 		axp20x->regmap_irq_chip = &axp803_regmap_irq_chip;
 		break;
 
 	case AXP15060_ID:
-		/*
-		 * Don't register the power key part if there is no

interrupt

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 3 lines
drivers/mfd/axp20x.c +0 -3
-		 * line.
-		 *
-		 * Since most use cases of AXP PMICs are Allwinner

SOCs, board

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev · line 1249

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * designers follow Allwinner's reference design and

connects

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev · line 1250

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * IRQ line to SOC, there's no need for those variants

to deal

Quoted 5 lines
Quoted 5 lines

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev · line 1251

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * with cases that IRQ isn't connected. However,

AXP15660 is

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev · line 1252

Quoted 1 line
drivers/mfd/axp20x.c +0 -1
-		 * used by some other vendors' SOCs that didn't 

connect

Quoted 63 lines
Quoted 58 lines

IRQ

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 4 lines
drivers/mfd/axp20x.c +0 -4
-		 * line, we need to deal with this case.
-		 */
-		if (axp20x->irq > 0) {
-			axp20x->nr_cells =

ARRAY_SIZE(axp15060_cells);

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 3 lines
drivers/mfd/axp20x.c +0 -3
-			axp20x->cells = axp15060_cells;
-		} else {
-			axp20x->nr_cells =

ARRAY_SIZE(axp_regulator_only_cells);

Quoted 13 lines
drivers/mfd/axp20x.c +2 -2
-			axp20x->cells = axp_regulator_only_cells;
-		}
+		axp20x->nr_cells = ARRAY_SIZE(axp15060_cells);
+		axp20x->cells = axp15060_cells;
drivers/mfd/axp20x.c +0 -0
 		axp20x->regmap_cfg = &axp15060_regmap_config;
 		axp20x->regmap_irq_chip = &axp15060_regmap_irq_chip;
 		break;
@@ -1263,6 +1250,23 @@ int axp20x_match_device(struct axp20x_dev
 *axp20x)
 
 		dev_err(dev, "unsupported AXP20X ID %lu\n", axp20x-

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev

Quoted 10 lines
drivers/mfd/axp20x.c +3 -0
 
 variant);
 
 		return -EINVAL;
 
 	}
 
+
+	/*
+	 * Use an alternative cell array when no interrupt line is

connected,

drivers/mfd/axp20x.c

Quoted 2 lines
drivers/mfd/axp20x.c +2 -0
+	 * since IRQs are required by some drivers.
+	 * The default is the safe "regulator-only", as this works fine

without

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x)

Quoted 8 lines
drivers/mfd/axp20x.c +8 -0
+	 * an interrupt specified.
+	 */
+	if (axp20x->irq <= 0) {
+		if (cells_no_irq) {
+			axp20x->nr_cells = nr_cells_no_irq;
+			axp20x->cells = cells_no_irq;
+		} else {
+			axp20x->nr_cells =

ARRAY_SIZE(axp_regulator_only_cells);

Quoted 4 lines

drivers/mfd/axp20x.c int axp20x_match_device(struct axp20x_dev *axp20x) · line 1266

Quoted 1 line
drivers/mfd/axp20x.c +1 -0
+			axp20x->cells = axp_regulator_only_cells;

axp806_cells (old value for AXP806_ID without irq) and axp_regulator_only_cells differs in id field. Is that an issue?

Quoted 6 lines

Yes, an annoying one, which led me to introduce the ability to let each PMIC override this default. So the case AXP806_ID: above sets the local variable cells_no_irq to axp806_cells, and the check above sees that it has been changed from the NULL initialisation and uses that instead of the default. At least that was my plan, let me know if I messed that up somehow, or if it deserves more comments.

Ah, yes. It looks ok, but it's not obvious. It's fine.

Best regards,
Jernej

Quoted 14 lines

Cheers,
Andre

Quoted 10 lines

Best regards,
Jernej

Quoted 7 lines
drivers/mfd/axp20x.c +3 -0
+		}
+	}
+
 
 	dev_info(dev, "AXP20x variant %s found\n",
 
 		 axp20x_model_names[axp20x->variant]);
maintainer Applied
#4 lore raw

Re: (subset) [PATCH v2] mfd: axp20x: Generalise handling without interrupt

In reply to Andre Przywara
Quoted 10 lines · Andre Przywara

At the moment we allow the AXP15060 and the AXP806 PMICs to omit the interrupt line to the SoC, and we skip registering the PEK (power key) driver in this case, since that crashes when no IRQ is described in the DT node.
The IRQ pin potentially not being connected to anything does affect more PMICs, though, and the PEK driver is not the only one requiring an
interrupt: at least the AC power supply driver crashes in a similar fashion.

[...]

Applied, thanks!

[1/1] mfd: axp20x: Generalise handling without interrupt

      commit: e928aaf249755fd3c1659dece4a23e089534f66f

--
Lee Jones [李琼斯]