github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 16:44:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Renesas ARM Based SoC Updates for v5.2

Browse Source 
* Power Management
   - Fix a leaked reference by adding missing of_node_put
 
 * R-Car M2-W (R8A77910) based Porter board
   - Enable regulator quirk
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4nzZofWswv9L/nKF189kaWo3T74FAly5178ACgkQ189kaWo3
 T769YA//SVefsl6hXo1QOfvgXo0L7URBz+wIziF7v2pPtCjdy68WNpThB0pHmpdF
 VjEzjRN8Xi6b+7BIj9yhCDbeJhrDiKUK92GEhdOJHE59lFWq0WhQfybW9vwAErAc
 UZ+Yy7gUkbQazkyDV3BLlnvCvH7YYtiaeNmy7N6qyZskyMsKossGFE2PEaBT10v0
 TaRldwVEoApELrq4xLV3rDYarzzNBCLCM1C3dx5PdTtd5lsSL/nCXOTF7+frZKUS
 13KQO2EVifGL30mb2rnHRxiMFUZMG0DnDnEivzMbOd50jw62lrsoinxrBv/c2pAY
 FbpL1ConhrYI7IEo93oPvxLbFbZq/mKTGvoES74ccJECj39wj0041hLKwlOo2bKZ
 Lm1ElkkLGFq2BkDog0YU+SUKgCsVGxgvXKiyTzcgaRlD70ea0QoyUeZOvsPrT4m6
 T+F4LdGZGk7b+1h1KCNuFJ7Hm0qJV+OLnqJp6EhJHj+gwZytzqlTajWs5FL4+z23
 MO0piTlBzJ2Fwn5+L07b/yWGM8uxWguG1w6I0U/0dYY2RZTMbSGHVAvWfNf7pUuP
 wPl8pIGP0QO+nlWB75MyyoE27ATHtv3YOl/AAWzxcpB6hB7T57INvOHI5g3deXW/
 6xN3ySQgrKPkH3+dNpu9TvjXc4W46MIaIEtVMbJqh7Kd6ZNMzzE=
 =jjre
 -----END PGP SIGNATURE-----

Merge tag 'renesas-arm-soc-for-v5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into arm/soc

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

* tag 'renesas-arm-soc-for-v5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: fix a leaked reference by adding missing of_node_put
  ARM: shmobile: porter: enable R-Car Gen2 regulator quirk

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-04-28 23:40:51 -07:00
commit 6a508f98d9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-shmobile/pm-rcar-gen2.c
View File

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

6
arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
View File

@ -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, &regulator_quirk_nb);
return 0;