Skip to content

Commit 8bb5c5f

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents e6cedaa + eecff33 commit 8bb5c5f

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

MAINTAINERS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5370,7 +5370,7 @@ M: Kukjin Kim <[email protected]>
53705370
R: Krzysztof Kozlowski <[email protected]>
53715371
53725372
5373-
S: Supported
5373+
S: Maintained
53745374
F: arch/arm/mach-exynos/pm.c
53755375
F: drivers/cpuidle/cpuidle-exynos.c
53765376
F: include/linux/platform_data/cpuidle-exynos.h
@@ -12837,7 +12837,7 @@ F: drivers/power/supply/max77976_charger.c
1283712837
MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
1283812838
M: Krzysztof Kozlowski <[email protected]>
1283912839
12840-
S: Supported
12840+
S: Maintained
1284112841
1284212842
F: Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
1284312843
F: Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml
@@ -12848,7 +12848,7 @@ MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
1284812848
M: Chanwoo Choi <[email protected]>
1284912849
M: Krzysztof Kozlowski <[email protected]>
1285012850
12851-
S: Supported
12851+
S: Maintained
1285212852
1285312853
F: Documentation/devicetree/bindings/*/maxim,max14577.yaml
1285412854
F: Documentation/devicetree/bindings/*/maxim,max77686.yaml
@@ -18798,7 +18798,7 @@ SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
1879818798
M: Krzysztof Kozlowski <[email protected]>
1879918799
1880018800
18801-
S: Supported
18801+
S: Maintained
1880218802
1880318803
F: Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
1880418804
F: Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml
@@ -18870,7 +18870,7 @@ M: Tomasz Figa <[email protected]>
1887018870
M: Chanwoo Choi <[email protected]>
1887118871
R: Alim Akhtar <[email protected]>
1887218872
18873-
S: Supported
18873+
S: Maintained
1887418874
T: git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
1887518875
T: git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
1887618876
F: Documentation/devicetree/bindings/clock/samsung,*.yaml

drivers/genpd/samsung/exynos-pm-domains.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111

1212
#include <linux/io.h>
1313
#include <linux/err.h>
14+
#include <linux/platform_device.h>
1415
#include <linux/slab.h>
1516
#include <linux/pm_domain.h>
1617
#include <linux/delay.h>
18+
#include <linux/of.h>
1719
#include <linux/of_address.h>
18-
#include <linux/of_platform.h>
1920
#include <linux/pm_runtime.h>
2021

2122
struct exynos_pm_domain_config {

drivers/soc/samsung/exynos-chipid.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <linux/mfd/syscon.h>
1818
#include <linux/module.h>
1919
#include <linux/of.h>
20-
#include <linux/of_device.h>
2120
#include <linux/platform_device.h>
2221
#include <linux/regmap.h>
2322
#include <linux/slab.h>

drivers/soc/samsung/exynos-pmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
#include <linux/of.h>
99
#include <linux/of_address.h>
10-
#include <linux/of_device.h>
1110
#include <linux/mfd/core.h>
1211
#include <linux/mfd/syscon.h>
12+
#include <linux/of_platform.h>
1313
#include <linux/platform_device.h>
1414
#include <linux/delay.h>
1515

0 commit comments

Comments
 (0)