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

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

+26 -25
+6
Documentation/devicetree/bindings/arm/samsung/pmu.txt
··· 43 43 - interrupt-parent: a phandle indicating which interrupt controller 44 44 this PMU signals interrupts to. 45 45 46 + 47 + Optional nodes: 48 + 49 + - nodes defining the restart and poweroff syscon children 50 + 51 + 46 52 Example : 47 53 pmu_system_controller: system-controller@10040000 { 48 54 compatible = "samsung,exynos5250-pmu", "syscon";
+1
drivers/memory/samsung/Kconfig
··· 1 + # SPDX-License-Identifier: GPL-2.0 1 2 config SAMSUNG_MC 2 3 bool "Samsung Exynos Memory Controller support" if COMPILE_TEST 3 4 help
+1
drivers/memory/samsung/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0 1 2 obj-$(CONFIG_EXYNOS_SROM) += exynos-srom.o
+7 -11
drivers/memory/samsung/exynos-srom.c
··· 1 - /* 2 - * Copyright (c) 2015 Samsung Electronics Co., Ltd. 3 - * http://www.samsung.com/ 4 - * 5 - * EXYNOS - SROM Controller support 6 - * Author: Pankaj Dubey <pankaj.dubey@samsung.com> 7 - * 8 - * This program is free software; you can redistribute it and/or modify 9 - * it under the terms of the GNU General Public License version 2 as 10 - * published by the Free Software Foundation. 11 - */ 1 + // SPDX-License-Identifier: GPL-2.0 2 + // 3 + // Copyright (c) 2015 Samsung Electronics Co., Ltd. 4 + // http://www.samsung.com/ 5 + // 6 + // EXYNOS - SROM Controller support 7 + // Author: Pankaj Dubey <pankaj.dubey@samsung.com> 12 8 13 9 #include <linux/io.h> 14 10 #include <linux/init.h>
+2 -5
drivers/memory/samsung/exynos-srom.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (c) 2015 Samsung Electronics Co., Ltd. 3 4 * http://www.samsung.com 4 5 * 5 6 * Exynos SROMC register definitions 6 - * 7 - * This program is free software; you can redistribute it and/or modify 8 - * it under the terms of the GNU General Public License version 2 as 9 - * published by the Free Software Foundation. 10 - */ 7 + */ 11 8 12 9 #ifndef __EXYNOS_SROM_H 13 10 #define __EXYNOS_SROM_H __FILE__
+7
drivers/soc/samsung/exynos-pmu.c
··· 85 85 .compatible = "samsung,exynos5250-pmu", 86 86 .data = exynos_pmu_data_arm_ptr(exynos5250_pmu_data), 87 87 }, { 88 + .compatible = "samsung,exynos5410-pmu", 89 + }, { 88 90 .compatible = "samsung,exynos5420-pmu", 89 91 .data = exynos_pmu_data_arm_ptr(exynos5420_pmu_data), 90 92 }, { 91 93 .compatible = "samsung,exynos5433-pmu", 94 + }, { 95 + .compatible = "samsung,exynos7-pmu", 92 96 }, 93 97 { /*sentinel*/ }, 94 98 }; ··· 129 125 pmu_context->pmu_data->pmu_init(); 130 126 131 127 platform_set_drvdata(pdev, pmu_context); 128 + 129 + if (devm_of_platform_populate(dev)) 130 + dev_err(dev, "Error populating children, reboot and poweroff might not work properly\n"); 132 131 133 132 dev_dbg(dev, "Exynos PMU Driver probe done\n"); 134 133 return 0;
+1 -4
include/linux/soc/samsung/exynos-pmu.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (c) 2014 Samsung Electronics Co., Ltd. 3 4 * http://www.samsung.com 4 5 * 5 6 * Header for EXYNOS PMU Driver support 6 - * 7 - * This program is free software; you can redistribute it and/or modify 8 - * it under the terms of the GNU General Public License version 2 as 9 - * published by the Free Software Foundation. 10 7 */ 11 8 12 9 #ifndef __LINUX_SOC_EXYNOS_PMU_H
+1 -5
include/linux/soc/samsung/exynos-regs-pmu.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (c) 2010-2015 Samsung Electronics Co., Ltd. 3 4 * http://www.samsung.com 4 5 * 5 6 * EXYNOS - Power management unit definition 6 - * 7 - * This program is free software; you can redistribute it and/or modify 8 - * it under the terms of the GNU General Public License version 2 as 9 - * published by the Free Software Foundation. 10 - * 11 7 * 12 8 * Notice: 13 9 * This is not a list of all Exynos Power Management Unit SFRs.