diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 16:52:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 16:52:19 +0100 |
| commit | 49774d86fd485873e736470ea1cb03f84d39ce3f (patch) | |
| tree | 7e9f731516dacd037ca0c2a7c0bb4422fb331f62 /drivers/soc | |
| parent | a7e66ff96beb616067b3b2b9934f5974b2dd2758 (diff) | |
| parent | 7353c54620732797dcc3b4b1fc6f3cc0c0d9b6ef (diff) | |
| download | blackbird-op-linux-49774d86fd485873e736470ea1cb03f84d39ce3f.tar.gz blackbird-op-linux-49774d86fd485873e736470ea1cb03f84d39ce3f.zip | |
Merge tag 'samsung-drivers-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers
Pull "Samsung soc drivers changes for v4.17" from Krzysztof Kozłowski:
1. Add SPDX license identifiers.
2. Populate children syscon nodes in PMU driver to properly model HW in
DeviceTree.
* tag 'samsung-drivers-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
soc: samsung: pmu: Populate children syscon nodes
soc: samsung: Add SPDX license identifiers to headers
memory: samsung: Add SPDX license identifiers
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/samsung/exynos-pmu.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/soc/samsung/exynos-pmu.c b/drivers/soc/samsung/exynos-pmu.c index f56adbd9fb8b..d34ca201b8b7 100644 --- a/drivers/soc/samsung/exynos-pmu.c +++ b/drivers/soc/samsung/exynos-pmu.c @@ -85,10 +85,14 @@ static const struct of_device_id exynos_pmu_of_device_ids[] = { .compatible = "samsung,exynos5250-pmu", .data = exynos_pmu_data_arm_ptr(exynos5250_pmu_data), }, { + .compatible = "samsung,exynos5410-pmu", + }, { .compatible = "samsung,exynos5420-pmu", .data = exynos_pmu_data_arm_ptr(exynos5420_pmu_data), }, { .compatible = "samsung,exynos5433-pmu", + }, { + .compatible = "samsung,exynos7-pmu", }, { /*sentinel*/ }, }; @@ -126,6 +130,9 @@ static int exynos_pmu_probe(struct platform_device *pdev) platform_set_drvdata(pdev, pmu_context); + if (devm_of_platform_populate(dev)) + dev_err(dev, "Error populating children, reboot and poweroff might not work properly\n"); + dev_dbg(dev, "Exynos PMU Driver probe done\n"); return 0; } |
