diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-12 08:39:06 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-12 08:39:08 -0700 |
| commit | 05a3a767667ef5bfa9ac99b76b57be504f01a7a9 (patch) | |
| tree | b9987bb93b222ba0d659e3e2796d25762321eb4d /MAINTAINERS | |
| parent | 8639a12370babf10abab002123a1d3cd87552c15 (diff) | |
| parent | a6419e53c779302f8d5dd409eccf5b41ffa184a4 (diff) | |
| download | linux-next-05a3a767667ef5bfa9ac99b76b57be504f01a7a9.tar.gz | |
Merge tag 'samsung-soc-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc
Samsung mach/soc changes for v5.14
1. Fix: add missing of_node_put.
2. Extend Samsung maintainers entry to cover Samsung PWM driver files,
because they do not have a dedicated entry.
3. Minor cleanups.
* tag 'samsung-soc-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
MAINTAINERS: Include Samsung PWM in Samsung SoC entry
soc: samsung: pmu: drop EXYNOS_CENTRAL_SEQ_OPTION defines
ARM: exynos: add missing of_node_put for loop iteration
ARM: s3c: Remove unnecessary break in RX1950
Link: https://lore.kernel.org/r/20210610074055.12474-2-krzysztof.kozlowski@canonical.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 88fd0a84d294..17a85bc550cd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2436,9 +2436,12 @@ F: drivers/*/*/*s3c24* F: drivers/*/*s3c24* F: drivers/*/*s3c64xx* F: drivers/*/*s5pv210* +F: drivers/clocksource/samsung_pwm_timer.c F: drivers/memory/samsung/ +F: drivers/pwm/pwm-samsung.c F: drivers/soc/samsung/ F: drivers/tty/serial/samsung* +F: include/clocksource/samsung_pwm.h F: include/linux/platform_data/*s3c* F: include/linux/serial_s3c.h F: include/linux/soc/samsung/ |