Merge tag 'samsung-soc-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk...

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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 88fd0a8..17a85bc 100644 (file)
--- 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/

diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 25b01da..8b48326 100644 (file)
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -55,6 +55,7 @@ void __init exynos_sysram_init(void)
                sysram_base_addr = of_iomap(node, 0);
                sysram_base_phys = of_translate_address(node,
                                           of_get_address(node, 0, NULL, NULL));
+               of_node_put(node);
                break;
        }
 
@@ -62,6 +63,7 @@ void __init exynos_sysram_init(void)
                if (!of_device_is_available(node))
                        continue;
                sysram_ns_base_addr = of_iomap(node, 0);
+               of_node_put(node);
                break;
        }
 }

diff --git a/arch/arm/mach-s3c/mach-rx1950.c b/arch/arm/mach-s3c/mach-rx1950.c
index a3f46aa..313e080 100644 (file)
--- a/arch/arm/mach-s3c/mach-rx1950.c
+++ b/arch/arm/mach-s3c/mach-rx1950.c
@@ -271,7 +271,6 @@ static int rx1950_led_blink_set(struct gpio_desc *desc, int state,
                break;
        default:
                return -EINVAL;
-               break;
        }
 
        if (delay_on && delay_off && !*delay_on && !*delay_off)

diff --git a/include/linux/soc/samsung/exynos-regs-pmu.h b/include/linux/soc/samsung/exynos-regs-pmu.h
index fc9250f..aa840ed 100644 (file)
--- a/include/linux/soc/samsung/exynos-regs-pmu.h
+++ b/include/linux/soc/samsung/exynos-regs-pmu.h
@@ -611,12 +611,6 @@
 #define EXYNOS5420_FSYS2_OPTION                                        0x4168
 #define EXYNOS5420_PSGEN_OPTION                                        0x4188
 
-/* For EXYNOS_CENTRAL_SEQ_OPTION */
-#define EXYNOS5_USE_STANDBYWFI_ARM_CORE0                       BIT(16)
-#define EXYNOS5_USE_STANDBYWFI_ARM_CORE1                       BUT(17)
-#define EXYNOS5_USE_STANDBYWFE_ARM_CORE0                       BIT(24)
-#define EXYNOS5_USE_STANDBYWFE_ARM_CORE1                       BIT(25)
-
 #define EXYNOS5420_ARM_USE_STANDBY_WFI0                                BIT(4)
 #define EXYNOS5420_ARM_USE_STANDBY_WFI1                                BIT(5)
 #define EXYNOS5420_ARM_USE_STANDBY_WFI2                                BIT(6)