diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-12 13:09:42 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-12 13:09:43 +0300 |
| commit | 8bb5c5fa24e13723780686f898c46cb5f6132355 (patch) | |
| tree | 4e562e0704d0776b8bd1c9ff9a8c75607a06bb5b | |
| parent | e6cedaa9025e4410b14a8496f430823ad46fd940 (diff) | |
| parent | eecff3319287179032600eeec5fa357a53ae0fe1 (diff) | |
| download | linux-8bb5c5fa24e13723780686f898c46cb5f6132355.tar.xz | |
Merge tag 'samsung-drivers-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/drivers
Samsung SoC driver changes for v6.6
Minor cleanup of headers and maintainer entries for Samsung SoC drivers.
* tag 'samsung-drivers-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
MAINTAINERS: mfd: Un-support Maxim and Samsung PMIC drivers
MAINTAINERS: samsung: Un-support cpuidle and clock drivers
soc: samsung: Explicitly include correct DT includes
Link: https://lore.kernel.org/r/20230810151250.220202-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | MAINTAINERS | 10 | ||||
| -rw-r--r-- | drivers/genpd/samsung/exynos-pm-domains.c | 3 | ||||
| -rw-r--r-- | drivers/soc/samsung/exynos-chipid.c | 1 | ||||
| -rw-r--r-- | drivers/soc/samsung/exynos-pmu.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 892b237f30dc..35ff333efa47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5370,7 +5370,7 @@ M: Kukjin Kim <kgene@kernel.org> R: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> L: linux-pm@vger.kernel.org L: linux-samsung-soc@vger.kernel.org -S: Supported +S: Maintained F: arch/arm/mach-exynos/pm.c F: drivers/cpuidle/cpuidle-exynos.c F: include/linux/platform_data/cpuidle-exynos.h @@ -12837,7 +12837,7 @@ F: drivers/power/supply/max77976_charger.c MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> L: linux-pm@vger.kernel.org -S: Supported +S: Maintained B: mailto:linux-samsung-soc@vger.kernel.org F: Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml F: Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml @@ -12848,7 +12848,7 @@ MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS M: Chanwoo Choi <cw00.choi@samsung.com> M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> L: linux-kernel@vger.kernel.org -S: Supported +S: Maintained B: mailto:linux-samsung-soc@vger.kernel.org F: Documentation/devicetree/bindings/*/maxim,max14577.yaml F: Documentation/devicetree/bindings/*/maxim,max77686.yaml @@ -18798,7 +18798,7 @@ SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS M: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> L: linux-kernel@vger.kernel.org L: linux-samsung-soc@vger.kernel.org -S: Supported +S: Maintained B: mailto:linux-samsung-soc@vger.kernel.org F: Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml F: Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml @@ -18870,7 +18870,7 @@ M: Tomasz Figa <tomasz.figa@gmail.com> M: Chanwoo Choi <cw00.choi@samsung.com> R: Alim Akhtar <alim.akhtar@samsung.com> L: linux-samsung-soc@vger.kernel.org -S: Supported +S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git F: Documentation/devicetree/bindings/clock/samsung,*.yaml diff --git a/drivers/genpd/samsung/exynos-pm-domains.c b/drivers/genpd/samsung/exynos-pm-domains.c index d07f3c9d6903..9b502e8751d1 100644 --- a/drivers/genpd/samsung/exynos-pm-domains.c +++ b/drivers/genpd/samsung/exynos-pm-domains.c @@ -11,11 +11,12 @@ #include <linux/io.h> #include <linux/err.h> +#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/pm_domain.h> #include <linux/delay.h> +#include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_platform.h> #include <linux/pm_runtime.h> struct exynos_pm_domain_config { diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c index 0fb3631e7346..7ba45c4aff97 100644 --- a/drivers/soc/samsung/exynos-chipid.c +++ b/drivers/soc/samsung/exynos-chipid.c @@ -17,7 +17,6 @@ #include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/slab.h> diff --git a/drivers/soc/samsung/exynos-pmu.c b/drivers/soc/samsung/exynos-pmu.c index 5b2664da9853..250537d7cfd6 100644 --- a/drivers/soc/samsung/exynos-pmu.c +++ b/drivers/soc/samsung/exynos-pmu.c @@ -7,9 +7,9 @@ #include <linux/of.h> #include <linux/of_address.h> -#include <linux/of_device.h> #include <linux/mfd/core.h> #include <linux/mfd/syscon.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/delay.h> |