* [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1
@ 2015-03-15 23:03 Simon Horman
2015-03-15 23:03 ` [PATCH 1/5] ARM: shmobile: R-Car Gen2: Add da9063/da9210 regulator quirk Simon Horman
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Simon Horman @ 2015-03-15 23:03 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider these Renesas ARM based SoC da9063/da9210 regulator quirk
for v4.1.
The following changes since commit c517d838eb7d07bbe9507871fab3931deccff539:
Linux 4.0-rc1 (2015-02-22 18:21:14 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-da9063-da9210-quirk-for-v4.1
for you to fetch changes up to 46dd8a809effdc7ebe6ec760e3e421d5ac2a40f1:
ARM: shmobile: lager: Add da9063 PMIC device node for system restart (2015-03-11 09:52:21 +0900)
----------------------------------------------------------------
Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1
The r8a7790/lager and r8a7791/koelsch development boards have da9063 and
da9210 regulators. Both regulators have their interrupt request lines
tied to the same interrupt pin (IRQ2) on the SoC.
After cold boot or da9063-induced restart, both the da9063 and da9210
seem to assert their interrupt request lines. Hence as soon as one
driver requests this irq, it gets stuck in an interrupt storm, as it
only manages to deassert its own interrupt request line, and the other
driver hasn't installed an interrupt handler yet.
To handle this, install a quirk that masks the interrupts in both the
da9063 and da9210. This quirk has to run after the i2c master driver
has been initialized, but before the i2c slave drivers are initialized.
As it depends on i2c, select I2C if one of the affected platforms is
enabled in the kernel config.
----------------------------------------------------------------
Geert Uytterhoeven (5):
ARM: shmobile: R-Car Gen2: Add da9063/da9210 regulator quirk
ARM: shmobile: koelsch dts: Add da9210 regulator interrupt
ARM: shmobile: koelsch: Add da9063 PMIC device node for system restart
ARM: shmobile: lager dts: Add da9210 regulator interrupt
ARM: shmobile: lager: Add da9063 PMIC device node for system restart
arch/arm/boot/dts/r8a7790-lager.dts | 18 +++
arch/arm/boot/dts/r8a7791-koelsch.dts | 18 +++
arch/arm/mach-shmobile/Kconfig | 2 +
arch/arm/mach-shmobile/Makefile | 2 +
arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 147 +++++++++++++++++++++
5 files changed, 187 insertions(+)
create mode 100644 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/5] ARM: shmobile: R-Car Gen2: Add da9063/da9210 regulator quirk 2015-03-15 23:03 [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 Simon Horman @ 2015-03-15 23:03 ` Simon Horman 2015-03-15 23:03 ` [PATCH 2/5] ARM: shmobile: koelsch dts: Add da9210 regulator interrupt Simon Horman ` (4 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2015-03-15 23:03 UTC (permalink / raw) To: linux-arm-kernel From: Geert Uytterhoeven <geert+renesas@glider.be> The r8a7790/lager and r8a7791/koelsch development boards have da9063 and da9210 regulators. Both regulators have their interrupt request lines tied to the same interrupt pin (IRQ2) on the SoC. After cold boot or da9063-induced restart, both the da9063 and da9210 seem to assert their interrupt request lines. Hence as soon as one driver requests this irq, it gets stuck in an interrupt storm, as it only manages to deassert its own interrupt request line, and the other driver hasn't installed an interrupt handler yet. To handle this, install a quirk that masks the interrupts in both the da9063 and da9210. This quirk has to run after the i2c master driver has been initialized, but before the i2c slave drivers are initialized. As it depends on i2c, select I2C if one of the affected platforms is enabled in the kernel config. On koelsch, the following happens: - Cold boot or reboot using the da9063 restart handler: IRQ2 is asserted, installing da9063/da9210 regulator quirk ... i2c i2c-6: regulator_quirk_notify: 1, IRQC_MONITOR = 0x3fb i2c 6-0058: regulator_quirk_notify: 1, IRQC_MONITOR = 0x3fb i2c 6-0058: Detected da9063 i2c 6-0058: Masking da9063 interrupt sources i2c 6-0068: regulator_quirk_notify: 1, IRQC_MONITOR = 0x3fb i2c 6-0068: Detected da9210 i2c 6-0068: Masking da9210 interrupt sources i2c 6-0068: IRQ2 is not asserted, removing quirk - Warm boot (reset button): rcar_gen2_regulator_quirk: IRQ2 is not asserted, not installing quirk Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/mach-shmobile/Kconfig | 2 + arch/arm/mach-shmobile/Makefile | 2 + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 147 +++++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 2f36c85..347b6a5 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -69,10 +69,12 @@ config ARCH_R8A7779 config ARCH_R8A7790 bool "R-Car H2 (R8A77900)" select ARCH_RCAR_GEN2 + select I2C config ARCH_R8A7791 bool "R-Car M2-W (R8A77910)" select ARCH_RCAR_GEN2 + select I2C config ARCH_R8A7794 bool "R-Car E2 (R8A77940)" diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index d53996e..fb9ef90 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -35,6 +35,8 @@ cpu-y := platsmp.o headsmp.o # Shared SoC family objects obj-$(CONFIG_ARCH_RCAR_GEN2) += setup-rcar-gen2.o platsmp-apmu.o $(cpu-y) CFLAGS_setup-rcar-gen2.o += -march=armv7-a +obj-$(CONFIG_ARCH_R8A7790) += regulator-quirk-rcar-gen2.o +obj-$(CONFIG_ARCH_R8A7791) += regulator-quirk-rcar-gen2.o # SMP objects smp-y := $(cpu-y) diff --git a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c new file mode 100644 index 0000000..384e6e9 --- /dev/null +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c @@ -0,0 +1,147 @@ +/* + * R-Car Generation 2 da9063/da9210 regulator quirk + * + * The r8a7790/lager and r8a7791/koelsch development boards have da9063 and + * da9210 regulators. Both regulators have their interrupt request lines tied + * to the same interrupt pin (IRQ2) on the SoC. + * + * After cold boot or da9063-induced restart, both the da9063 and da9210 seem + * to assert their interrupt request lines. Hence as soon as one driver + * requests this irq, it gets stuck in an interrupt storm, as it only manages + * to deassert its own interrupt request line, and the other driver hasn't + * installed an interrupt handler yet. + * + * To handle this, install a quirk that masks the interrupts in both the + * da9063 and da9210. This quirk has to run after the i2c master driver has + * been initialized, but before the i2c slave drivers are initialized. + * + * Copyright (C) 2015 Glider bvba + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/device.h> +#include <linux/i2c.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/notifier.h> +#include <linux/of.h> +#include <linux/mfd/da9063/registers.h> + + +#define IRQC_BASE 0xe61c0000 +#define IRQC_MONITOR 0x104 /* IRQn Signal Level Monitor Register */ + +#define REGULATOR_IRQ_MASK BIT(2) /* IRQ2, active low */ + +static void __iomem *irqc; + +static const u8 da9063_mask_regs[] = { + DA9063_REG_IRQ_MASK_A, + DA9063_REG_IRQ_MASK_B, + DA9063_REG_IRQ_MASK_C, + DA9063_REG_IRQ_MASK_D, +}; + +/* DA9210 System Control and Event Registers */ +#define DA9210_REG_MASK_A 0x54 +#define DA9210_REG_MASK_B 0x55 + +static const u8 da9210_mask_regs[] = { + DA9210_REG_MASK_A, + DA9210_REG_MASK_B, +}; + +static void da9xxx_mask_irqs(struct i2c_client *client, const u8 regs[], + unsigned int nregs) +{ + unsigned int i; + + dev_info(&client->dev, "Masking %s interrupt sources\n", client->name); + + for (i = 0; i < nregs; i++) { + int error = i2c_smbus_write_byte_data(client, regs[i], ~0); + if (error) { + dev_err(&client->dev, "i2c error %d\n", error); + return; + } + } +} + +static int regulator_quirk_notify(struct notifier_block *nb, + unsigned long action, void *data) +{ + struct device *dev = data; + struct i2c_client *client; + u32 mon; + + mon = ioread32(irqc + IRQC_MONITOR); + dev_dbg(dev, "%s: %ld, IRQC_MONITOR = 0x%x\n", __func__, action, mon); + if (mon & REGULATOR_IRQ_MASK) + goto remove; + + if (action != BUS_NOTIFY_ADD_DEVICE || dev->type == &i2c_adapter_type) + return 0; + + client = to_i2c_client(dev); + dev_dbg(dev, "Detected %s\n", client->name); + + if ((client->addr == 0x58 && !strcmp(client->name, "da9063"))) + da9xxx_mask_irqs(client, da9063_mask_regs, + ARRAY_SIZE(da9063_mask_regs)); + else if (client->addr == 0x68 && !strcmp(client->name, "da9210")) + da9xxx_mask_irqs(client, da9210_mask_regs, + ARRAY_SIZE(da9210_mask_regs)); + + mon = ioread32(irqc + IRQC_MONITOR); + if (mon & REGULATOR_IRQ_MASK) + goto remove; + + return 0; + +remove: + dev_info(dev, "IRQ2 is not asserted, removing quirk\n"); + + bus_unregister_notifier(&i2c_bus_type, nb); + iounmap(irqc); + return 0; +} + +static struct notifier_block regulator_quirk_nb = { + .notifier_call = regulator_quirk_notify +}; + +static int __init rcar_gen2_regulator_quirk(void) +{ + u32 mon; + + if (!of_machine_is_compatible("renesas,koelsch") && + !of_machine_is_compatible("renesas,lager")) + return -ENODEV; + + irqc = ioremap(IRQC_BASE, PAGE_SIZE); + if (!irqc) + return -ENOMEM; + + mon = ioread32(irqc + IRQC_MONITOR); + if (mon & REGULATOR_IRQ_MASK) { + pr_debug("%s: IRQ2 is not asserted, not installing quirk\n", + __func__); + iounmap(irqc); + return 0; + } + + pr_info("IRQ2 is asserted, installing da9063/da9210 regulator quirk\n"); + + bus_register_notifier(&i2c_bus_type, ®ulator_quirk_nb); + return 0; +} + +arch_initcall(rcar_gen2_regulator_quirk); -- 2.1.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] ARM: shmobile: koelsch dts: Add da9210 regulator interrupt 2015-03-15 23:03 [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 Simon Horman 2015-03-15 23:03 ` [PATCH 1/5] ARM: shmobile: R-Car Gen2: Add da9063/da9210 regulator quirk Simon Horman @ 2015-03-15 23:03 ` Simon Horman 2015-03-15 23:03 ` [PATCH 3/5] ARM: shmobile: koelsch: Add da9063 PMIC device node for system restart Simon Horman ` (3 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2015-03-15 23:03 UTC (permalink / raw) To: linux-arm-kernel From: Geert Uytterhoeven <geert+renesas@glider.be> The da9210 regulator is connected to IRQ2. Reflect this in its device node, so the driver can use it when it gains interrupt support. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7791-koelsch.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index a3c2780..213a643 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -520,6 +520,8 @@ vdd_dvfs: regulator at 68 { compatible = "dlg,da9210"; reg = <0x68>; + interrupt-parent = <&irqc0>; + interrupts = <2 IRQ_TYPE_LEVEL_LOW>; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; -- 2.1.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] ARM: shmobile: koelsch: Add da9063 PMIC device node for system restart 2015-03-15 23:03 [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 Simon Horman 2015-03-15 23:03 ` [PATCH 1/5] ARM: shmobile: R-Car Gen2: Add da9063/da9210 regulator quirk Simon Horman 2015-03-15 23:03 ` [PATCH 2/5] ARM: shmobile: koelsch dts: Add da9210 regulator interrupt Simon Horman @ 2015-03-15 23:03 ` Simon Horman 2015-03-15 23:03 ` [PATCH 4/5] ARM: shmobile: lager dts: Add da9210 regulator interrupt Simon Horman ` (2 subsequent siblings) 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2015-03-15 23:03 UTC (permalink / raw) To: linux-arm-kernel From: Geert Uytterhoeven <geert+renesas@glider.be> Add a device node for the da9063 PMIC, with subnodes for rtc and wdt. Regulator support is not yet included. This allows the system to be restarted when the watchdog timer times out, or when a system restart is requested. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7791-koelsch.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index 213a643..b2dcf64 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -517,6 +517,22 @@ status = "okay"; clock-frequency = <100000>; + pmic at 58 { + compatible = "dlg,da9063"; + reg = <0x58>; + interrupt-parent = <&irqc0>; + interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + interrupt-controller; + + rtc { + compatible = "dlg,da9063-rtc"; + }; + + wdt { + compatible = "dlg,da9063-watchdog"; + }; + }; + vdd_dvfs: regulator at 68 { compatible = "dlg,da9210"; reg = <0x68>; -- 2.1.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] ARM: shmobile: lager dts: Add da9210 regulator interrupt 2015-03-15 23:03 [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 Simon Horman ` (2 preceding siblings ...) 2015-03-15 23:03 ` [PATCH 3/5] ARM: shmobile: koelsch: Add da9063 PMIC device node for system restart Simon Horman @ 2015-03-15 23:03 ` Simon Horman 2015-03-15 23:03 ` [PATCH 5/5] ARM: shmobile: lager: Add da9063 PMIC device node for system restart Simon Horman 2015-03-16 14:39 ` [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 Arnd Bergmann 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2015-03-15 23:03 UTC (permalink / raw) To: linux-arm-kernel From: Geert Uytterhoeven <geert+renesas@glider.be> The da9210 regulator is connected to IRQ2. Reflect this in its device node, so the driver can use it when it gains interrupt support. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7790-lager.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index 0c3b678..e2f4746 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -516,6 +516,8 @@ vdd_dvfs: regulator at 68 { compatible = "dlg,da9210"; reg = <0x68>; + interrupt-parent = <&irqc0>; + interrupts = <2 IRQ_TYPE_LEVEL_LOW>; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; -- 2.1.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] ARM: shmobile: lager: Add da9063 PMIC device node for system restart 2015-03-15 23:03 [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 Simon Horman ` (3 preceding siblings ...) 2015-03-15 23:03 ` [PATCH 4/5] ARM: shmobile: lager dts: Add da9210 regulator interrupt Simon Horman @ 2015-03-15 23:03 ` Simon Horman 2015-03-16 14:39 ` [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 Arnd Bergmann 5 siblings, 0 replies; 7+ messages in thread From: Simon Horman @ 2015-03-15 23:03 UTC (permalink / raw) To: linux-arm-kernel From: Geert Uytterhoeven <geert+renesas@glider.be> Add a device node for the da9063 PMIC, with subnodes for rtc and wdt. Regulator support is not yet included. This allows the system to be restarted when the watchdog timer times out, or when a system restart is requested. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r8a7790-lager.dts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index e2f4746..2a0f895 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -513,6 +513,22 @@ pinctrl-0 = <&iic3_pins>; status = "okay"; + pmic at 58 { + compatible = "dlg,da9063"; + reg = <0x58>; + interrupt-parent = <&irqc0>; + interrupts = <2 IRQ_TYPE_LEVEL_LOW>; + interrupt-controller; + + rtc { + compatible = "dlg,da9063-rtc"; + }; + + wdt { + compatible = "dlg,da9063-watchdog"; + }; + }; + vdd_dvfs: regulator at 68 { compatible = "dlg,da9210"; reg = <0x68>; -- 2.1.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 2015-03-15 23:03 [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 Simon Horman ` (4 preceding siblings ...) 2015-03-15 23:03 ` [PATCH 5/5] ARM: shmobile: lager: Add da9063 PMIC device node for system restart Simon Horman @ 2015-03-16 14:39 ` Arnd Bergmann 5 siblings, 0 replies; 7+ messages in thread From: Arnd Bergmann @ 2015-03-16 14:39 UTC (permalink / raw) To: linux-arm-kernel On Monday 16 March 2015 08:03:07 Simon Horman wrote: > Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 > > The r8a7790/lager and r8a7791/koelsch development boards have da9063 and > da9210 regulators. Both regulators have their interrupt request lines > tied to the same interrupt pin (IRQ2) on the SoC. > > After cold boot or da9063-induced restart, both the da9063 and da9210 > seem to assert their interrupt request lines. Hence as soon as one > driver requests this irq, it gets stuck in an interrupt storm, as it > only manages to deassert its own interrupt request line, and the other > driver hasn't installed an interrupt handler yet. > > To handle this, install a quirk that masks the interrupts in both the > da9063 and da9210. This quirk has to run after the i2c master driver > has been initialized, but before the i2c slave drivers are initialized. > As it depends on i2c, select I2C if one of the affected platforms is > enabled in the kernel config. > Pulled into next/soc, thanks! Arnd ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-03-16 14:39 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-03-15 23:03 [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 Simon Horman 2015-03-15 23:03 ` [PATCH 1/5] ARM: shmobile: R-Car Gen2: Add da9063/da9210 regulator quirk Simon Horman 2015-03-15 23:03 ` [PATCH 2/5] ARM: shmobile: koelsch dts: Add da9210 regulator interrupt Simon Horman 2015-03-15 23:03 ` [PATCH 3/5] ARM: shmobile: koelsch: Add da9063 PMIC device node for system restart Simon Horman 2015-03-15 23:03 ` [PATCH 4/5] ARM: shmobile: lager dts: Add da9210 regulator interrupt Simon Horman 2015-03-15 23:03 ` [PATCH 5/5] ARM: shmobile: lager: Add da9063 PMIC device node for system restart Simon Horman 2015-03-16 14:39 ` [GIT PULL] Renesas ARM Based SoC da9063/da9210 Regulator Quirk for v4.1 Arnd Bergmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).