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