* [PATCH 1/2] ARM: shmobile: porter: enable R-Car Gen2 regulator quirk
2019-04-19 14:35 [GIT PULL] Renesas ARM Based SoC Updates for v5.2 Simon Horman
@ 2019-04-19 14:35 ` Simon Horman
2019-04-19 14:35 ` [PATCH 2/2] ARM: shmobile: fix a leaked reference by adding missing of_node_put Simon Horman
2019-04-29 6:40 ` [GIT PULL] Renesas ARM Based SoC Updates for v5.2 Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2019-04-19 14:35 UTC (permalink / raw)
To: linux-renesas-soc
Cc: linux-arm-kernel, Magnus Damm, Marek Vasut, Simon Horman
From: Marek Vasut <marek.vasut+renesas@gmail.com>
Porter needs the regulator quirk, just like the other boards.
But unlike the other boards, the Porter uses DA9063L, which
is at 0x5a. Otherwise, DA9063L and DA9210 IRQ line is still
connected to CPU IRQ2 .
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
index dc526ef2e9b3..ee949255ced3 100644
--- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * R-Car Generation 2 da9063/da9210 regulator quirk
+ * R-Car Generation 2 da9063(L)/da9210 regulator quirk
*
* Certain Gen2 development boards have an da9063 and one or more da9210
* regulators. All of these regulators have their interrupt request lines
@@ -65,6 +65,7 @@ static struct i2c_msg da9210_msg = {
static const struct of_device_id rcar_gen2_quirk_match[] = {
{ .compatible = "dlg,da9063", .data = &da9063_msg },
+ { .compatible = "dlg,da9063l", .data = &da9063_msg },
{ .compatible = "dlg,da9210", .data = &da9210_msg },
{},
};
@@ -147,6 +148,7 @@ static int __init rcar_gen2_regulator_quirk(void)
if (!of_machine_is_compatible("renesas,koelsch") &&
!of_machine_is_compatible("renesas,lager") &&
+ !of_machine_is_compatible("renesas,porter") &&
!of_machine_is_compatible("renesas,stout") &&
!of_machine_is_compatible("renesas,gose"))
return -ENODEV;
@@ -210,7 +212,7 @@ static int __init rcar_gen2_regulator_quirk(void)
goto err_free;
}
- pr_info("IRQ2 is asserted, installing da9063/da9210 regulator quirk\n");
+ pr_info("IRQ2 is asserted, installing regulator quirk\n");
bus_register_notifier(&i2c_bus_type, ®ulator_quirk_nb);
return 0;
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] ARM: shmobile: fix a leaked reference by adding missing of_node_put
2019-04-19 14:35 [GIT PULL] Renesas ARM Based SoC Updates for v5.2 Simon Horman
2019-04-19 14:35 ` [PATCH 1/2] ARM: shmobile: porter: enable R-Car Gen2 regulator quirk Simon Horman
@ 2019-04-19 14:35 ` Simon Horman
2019-04-29 6:40 ` [GIT PULL] Renesas ARM Based SoC Updates for v5.2 Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2019-04-19 14:35 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: linux-arm-kernel, Magnus Damm, Wen Yang, Simon Horman
From: Wen Yang <wen.yang99@zte.com.cn>
The call to of_get_next_child returns a node pointer with refcount
incremented thus it must be explicitly decremented after the last
usage.
Detected by coccinelle with the following warnings:
./arch/arm/mach-shmobile/pm-rcar-gen2.c:77:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 66, but without a corresponding object release within this function.
./arch/arm/mach-shmobile/pm-rcar-gen2.c:85:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 66, but without a corresponding object release within this function.
./arch/arm/mach-shmobile/pm-rcar-gen2.c:90:2-8: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 66, but without a corresponding object release within this function.
Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/pm-rcar-gen2.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-shmobile/pm-rcar-gen2.c b/arch/arm/mach-shmobile/pm-rcar-gen2.c
index 8c2a20591524..e84599dd96f1 100644
--- a/arch/arm/mach-shmobile/pm-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/pm-rcar-gen2.c
@@ -72,6 +72,7 @@ void __init rcar_gen2_pm_init(void)
}
error = of_address_to_resource(np, 0, &res);
+ of_node_put(np);
if (error) {
pr_err("Failed to get smp-sram address: %d\n", error);
return;
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [GIT PULL] Renesas ARM Based SoC Updates for v5.2
2019-04-19 14:35 [GIT PULL] Renesas ARM Based SoC Updates for v5.2 Simon Horman
2019-04-19 14:35 ` [PATCH 1/2] ARM: shmobile: porter: enable R-Car Gen2 regulator quirk Simon Horman
2019-04-19 14:35 ` [PATCH 2/2] ARM: shmobile: fix a leaked reference by adding missing of_node_put Simon Horman
@ 2019-04-29 6:40 ` Olof Johansson
2 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2019-04-29 6:40 UTC (permalink / raw)
To: Simon Horman
Cc: arm, linux-renesas-soc, Kevin Hilman, Arnd Bergmann,
linux-arm-kernel, Magnus Damm
On Fri, Apr 19, 2019 at 04:35:07PM +0200, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC updates for v5.2.
>
>
> The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b:
>
> Linux 5.1-rc1 (2019-03-17 14:22:26 -0700)
>
> are available in the git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-arm-soc-for-v5.2
>
> for you to fetch changes up to 115bbc30c6d2d7c8eddf87f88c1b7033522d47d2:
>
> ARM: shmobile: fix a leaked reference by adding missing of_node_put (2019-03-18 10:32:36 +0100)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC Updates for v5.2
>
> * Power Management
> - Fix a leaked reference by adding missing of_node_put
>
> * R-Car M2-W (R8A77910) based Porter board
> - Enable regulator quirk
Merged, thanks.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread