Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+5 -2
+1
arch/arm/mach-shmobile/pm-rcar-gen2.c
··· 72 72 } 73 73 74 74 error = of_address_to_resource(np, 0, &res); 75 + of_node_put(np); 75 76 if (error) { 76 77 pr_err("Failed to get smp-sram address: %d\n", error); 77 78 return;
+4 -2
arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* 3 - * R-Car Generation 2 da9063/da9210 regulator quirk 3 + * R-Car Generation 2 da9063(L)/da9210 regulator quirk 4 4 * 5 5 * Certain Gen2 development boards have an da9063 and one or more da9210 6 6 * regulators. All of these regulators have their interrupt request lines ··· 65 65 66 66 static const struct of_device_id rcar_gen2_quirk_match[] = { 67 67 { .compatible = "dlg,da9063", .data = &da9063_msg }, 68 + { .compatible = "dlg,da9063l", .data = &da9063_msg }, 68 69 { .compatible = "dlg,da9210", .data = &da9210_msg }, 69 70 {}, 70 71 }; ··· 148 147 149 148 if (!of_machine_is_compatible("renesas,koelsch") && 150 149 !of_machine_is_compatible("renesas,lager") && 150 + !of_machine_is_compatible("renesas,porter") && 151 151 !of_machine_is_compatible("renesas,stout") && 152 152 !of_machine_is_compatible("renesas,gose")) 153 153 return -ENODEV; ··· 212 210 goto err_free; 213 211 } 214 212 215 - pr_info("IRQ2 is asserted, installing da9063/da9210 regulator quirk\n"); 213 + pr_info("IRQ2 is asserted, installing regulator quirk\n"); 216 214 217 215 bus_register_notifier(&i2c_bus_type, &regulator_quirk_nb); 218 216 return 0;