All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andre Przywara <andre.przywara@arm.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
	Jernej Skrabec <jernej.skrabec@siol.net>
Cc: "Icenowy Zheng" <icenowy@aosc.xyz>,
	"Linus Walleij" <linus.walleij@linaro.org>,
	"Rob Herring" <robh@kernel.org>,
	"Clément Péron" <peron.clem@gmail.com>,
	"Shuosheng Huang" <huangshuosheng@allwinnertech.com>,
	"Yangtao Li" <tiny.windzz@gmail.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
	"Lee Jones" <lee.jones@linaro.org>
Subject: [PATCH v2 10/21] mfd: axp20x: Allow AXP chips without interrupt lines
Date: Fri, 11 Dec 2020 01:19:23 +0000	[thread overview]
Message-ID: <20201211011934.6171-11-andre.przywara@arm.com> (raw)
In-Reply-To: <20201211011934.6171-1-andre.przywara@arm.com>

Currently the AXP chip requires to have its IRQ line connected to some
interrupt controller, and will fail probing when this is not the case.

On a new Allwinner SoC (H616) there is no NMI pin anymore, so the
interrupt functionality of the AXP chip is simply not available.

Check whether the DT describes the AXP chip as an interrupt controller
before trying to register the irqchip, to avoid probe failures on
setups without an interrupt.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 drivers/mfd/axp20x.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index aa59496e4376..a52595c49d40 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -959,12 +959,17 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
 				     AXP806_REG_ADDR_EXT_ADDR_SLAVE_MODE);
 	}
 
-	ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
-			  IRQF_ONESHOT | IRQF_SHARED | axp20x->irq_flags,
-			   -1, axp20x->regmap_irq_chip, &axp20x->regmap_irqc);
-	if (ret) {
-		dev_err(axp20x->dev, "failed to add irq chip: %d\n", ret);
-		return ret;
+	if (!axp20x->dev->of_node ||
+	    of_property_read_bool(axp20x->dev->of_node, "interrupt-controller")) {
+		ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
+				IRQF_ONESHOT | IRQF_SHARED | axp20x->irq_flags,
+				-1, axp20x->regmap_irq_chip,
+				&axp20x->regmap_irqc);
+		if (ret) {
+			dev_err(axp20x->dev, "failed to add irq chip: %d\n",
+				ret);
+			return ret;
+		}
 	}
 
 	ret = mfd_add_devices(axp20x->dev, -1, axp20x->cells,
-- 
2.17.5


WARNING: multiple messages have this Message-ID (diff)
From: Andre Przywara <andre.przywara@arm.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
	Jernej Skrabec <jernej.skrabec@siol.net>
Cc: "Rob Herring" <robh@kernel.org>,
	"Yangtao Li" <tiny.windzz@gmail.com>,
	"Linus Walleij" <linus.walleij@linaro.org>,
	linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
	"Clément Péron" <peron.clem@gmail.com>,
	"Icenowy Zheng" <icenowy@aosc.xyz>,
	"Shuosheng Huang" <huangshuosheng@allwinnertech.com>,
	"Lee Jones" <lee.jones@linaro.org>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 10/21] mfd: axp20x: Allow AXP chips without interrupt lines
Date: Fri, 11 Dec 2020 01:19:23 +0000	[thread overview]
Message-ID: <20201211011934.6171-11-andre.przywara@arm.com> (raw)
In-Reply-To: <20201211011934.6171-1-andre.przywara@arm.com>

Currently the AXP chip requires to have its IRQ line connected to some
interrupt controller, and will fail probing when this is not the case.

On a new Allwinner SoC (H616) there is no NMI pin anymore, so the
interrupt functionality of the AXP chip is simply not available.

Check whether the DT describes the AXP chip as an interrupt controller
before trying to register the irqchip, to avoid probe failures on
setups without an interrupt.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 drivers/mfd/axp20x.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index aa59496e4376..a52595c49d40 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -959,12 +959,17 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
 				     AXP806_REG_ADDR_EXT_ADDR_SLAVE_MODE);
 	}
 
-	ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
-			  IRQF_ONESHOT | IRQF_SHARED | axp20x->irq_flags,
-			   -1, axp20x->regmap_irq_chip, &axp20x->regmap_irqc);
-	if (ret) {
-		dev_err(axp20x->dev, "failed to add irq chip: %d\n", ret);
-		return ret;
+	if (!axp20x->dev->of_node ||
+	    of_property_read_bool(axp20x->dev->of_node, "interrupt-controller")) {
+		ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
+				IRQF_ONESHOT | IRQF_SHARED | axp20x->irq_flags,
+				-1, axp20x->regmap_irq_chip,
+				&axp20x->regmap_irqc);
+		if (ret) {
+			dev_err(axp20x->dev, "failed to add irq chip: %d\n",
+				ret);
+			return ret;
+		}
 	}
 
 	ret = mfd_add_devices(axp20x->dev, -1, axp20x->cells,
-- 
2.17.5


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-12-11  1:26 UTC|newest]

Thread overview: 98+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-11  1:19 [PATCH v2 00/21] arm64: sunxi: Initial Allwinner H616 SoC support Andre Przywara
2020-12-11  1:19 ` Andre Przywara
2020-12-11  1:19 ` [PATCH v2 01/21] clk: sunxi-ng: h6: Fix clock divider range on some clocks Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-11  1:19 ` [PATCH v2 02/21] dt-bindings: pinctrl: Add Allwinner H616 compatible strings Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14  9:37   ` Maxime Ripard
2020-12-14  9:37     ` Maxime Ripard
2021-01-14  0:45     ` Andre Przywara
2021-01-14  0:45       ` Andre Przywara
2021-01-14 11:57       ` Maxime Ripard
2021-01-14 11:57         ` Maxime Ripard
2020-12-11  1:19 ` [PATCH v2 03/21] pinctrl: sunxi: Add support for the Allwinner H616 pin controller Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14  9:44   ` Maxime Ripard
2020-12-14  9:44     ` Maxime Ripard
2020-12-11  1:19 ` [PATCH v2 04/21] pinctrl: sunxi: Add support for the Allwinner H616-R " Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-11  1:19 ` [PATCH v2 05/21] dt-bindings: clk: sunxi-ccu: Add compatible string for Allwinner H616 Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14 22:53   ` Rob Herring
2020-12-14 22:53     ` Rob Herring
2020-12-11  1:19 ` [PATCH v2 06/21] clk: sunxi-ng: Add support for the Allwinner H616 R-CCU Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-11  1:19 ` [PATCH v2 07/21] clk: sunxi-ng: Add support for the Allwinner H616 CCU Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-11  1:19 ` [PATCH v2 08/21] dt-bindings: mmc: sunxi: Add Allwinner A100 and H616 compatibles Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14 22:54   ` Rob Herring
2020-12-14 22:54     ` Rob Herring
2021-01-11 18:06   ` Ulf Hansson
2021-01-11 18:06     ` Ulf Hansson
2020-12-11  1:19 ` [PATCH v2 09/21] mmc: sunxi: add support for A100 mmc controller Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2021-01-11 18:06   ` Ulf Hansson
2021-01-11 18:06     ` Ulf Hansson
2020-12-11  1:19 ` Andre Przywara [this message]
2020-12-11  1:19   ` [PATCH v2 10/21] mfd: axp20x: Allow AXP chips without interrupt lines Andre Przywara
2020-12-11  1:19 ` [PATCH v2 11/21] dt-bindings: sram: sunxi-sram: Add H616 compatible string Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14 22:54   ` Rob Herring
2020-12-14 22:54     ` Rob Herring
2020-12-11  1:19 ` [PATCH v2 12/21] soc: sunxi: sram: Add support for more than one EMAC clock Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-11  1:19 ` [PATCH v2 13/21] net: stmmac: dwmac-sun8i: Prepare for second EMAC clock register Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-11  1:19 ` [PATCH v2 14/21] phy: sun4i-usb: Rework "pmu_unk1" handling Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-13 18:24   ` Icenowy Zheng
2020-12-13 18:24     ` Icenowy Zheng
2020-12-14  1:35     ` André Przywara
2020-12-14  1:35       ` André Przywara
2020-12-14  4:45       ` Icenowy Zheng
2020-12-14  4:45         ` Icenowy Zheng
2020-12-11  1:19 ` [PATCH v2 15/21] phy: sun4i-usb: Add support for the H616 USB PHY Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14  9:52   ` Maxime Ripard
2020-12-14  9:52     ` Maxime Ripard
2020-12-11  1:19 ` [PATCH v2 16/21] dt-bindings: watchdog: sun4i: Add A100 compatible Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-13 16:12   ` Guenter Roeck
2020-12-13 16:12     ` Guenter Roeck
2020-12-11  1:19 ` [PATCH v2 17/21] dt-bindings: watchdog: sun4i: Add H616 compatible string Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14 22:55   ` Rob Herring
2020-12-14 22:55     ` Rob Herring
2021-01-23 17:29   ` Guenter Roeck
2021-01-23 17:29     ` Guenter Roeck
2020-12-11  1:19 ` [PATCH v2 18/21] dt-bindings: allwinner: Add H616 compatible strings Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14 22:56   ` Rob Herring
2020-12-14 22:56     ` Rob Herring
2021-01-05 16:29   ` Wolfram Sang
2021-01-05 16:29     ` Wolfram Sang
2020-12-11  1:19 ` [PATCH v2 19/21] arm64: dts: allwinner: Add Allwinner H616 .dtsi file Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14  9:58   ` Maxime Ripard
2020-12-14  9:58     ` Maxime Ripard
2020-12-14 12:53     ` Andre Przywara
2020-12-14 12:53       ` Andre Przywara
2020-12-14 13:28       ` [linux-sunxi] " Chen-Yu Tsai
2020-12-14 13:28         ` Chen-Yu Tsai
2020-12-14 14:14         ` Maxime Ripard
2020-12-14 14:14           ` Maxime Ripard
2020-12-14 14:12       ` Maxime Ripard
2020-12-14 14:12         ` Maxime Ripard
2020-12-11  1:19 ` [PATCH v2 20/21] dt-bindings: arm: sunxi: Add OrangePi Zero 2 binding Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14 22:56   ` Rob Herring
2020-12-14 22:56     ` Rob Herring
2020-12-11  1:19 ` [PATCH v2 21/21] arm64: dts: allwinner: Add OrangePi Zero 2 .dts Andre Przywara
2020-12-11  1:19   ` Andre Przywara
2020-12-14  9:59   ` Maxime Ripard
2020-12-14  9:59     ` Maxime Ripard
2020-12-13 17:47 ` [PATCH v2 00/21] arm64: sunxi: Initial Allwinner H616 SoC support Icenowy Zheng
2020-12-13 17:47   ` Icenowy Zheng
2020-12-14  1:18   ` André Przywara
2020-12-14  1:18     ` André Przywara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201211011934.6171-11-andre.przywara@arm.com \
    --to=andre.przywara@arm.com \
    --cc=huangshuosheng@allwinnertech.com \
    --cc=icenowy@aosc.xyz \
    --cc=jernej.skrabec@siol.net \
    --cc=lee.jones@linaro.org \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=mripard@kernel.org \
    --cc=peron.clem@gmail.com \
    --cc=robh@kernel.org \
    --cc=tiny.windzz@gmail.com \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.