xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent abfcba1c35 115bbc30c6
commit 6a508f98d9
2 changed files with 5 additions and 2 deletions
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); error = of_address_to_resource(np, 0, &res);
of_node_put(np);
if (error) { if (error) {
pr_err("Failed to get smp-sram address: %d\n", error); pr_err("Failed to get smp-sram address: %d\n", error);
return; return;

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

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // 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 * Certain Gen2 development boards have an da9063 and one or more da9210
* regulators. All of these regulators have their interrupt request lines * 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[] = { static const struct of_device_id rcar_gen2_quirk_match[] = {
{ .compatible = "dlg,da9063", .data = &da9063_msg }, { .compatible = "dlg,da9063", .data = &da9063_msg },
{ .compatible = "dlg,da9063l", .data = &da9063_msg },
{ .compatible = "dlg,da9210", .data = &da9210_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") && if (!of_machine_is_compatible("renesas,koelsch") &&
!of_machine_is_compatible("renesas,lager") && !of_machine_is_compatible("renesas,lager") &&
!of_machine_is_compatible("renesas,porter") &&
!of_machine_is_compatible("renesas,stout") && !of_machine_is_compatible("renesas,stout") &&
!of_machine_is_compatible("renesas,gose")) !of_machine_is_compatible("renesas,gose"))
return -ENODEV; return -ENODEV;
@@ -210,7 +212,7 @@ static int __init rcar_gen2_regulator_quirk(void)
goto err_free; 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); bus_register_notifier(&i2c_bus_type, &regulator_quirk_nb);
return 0; return 0;