diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-12 17:39:06 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-12 17:39:08 +0200 |
| commit | 05a3a767667ef5bfa9ac99b76b57be504f01a7a9 (patch) | |
| tree | b9987bb93b222ba0d659e3e2796d25762321eb4d /include | |
| parent | Merge tag 'omap-for-v5.14/cleanup-signed' of git://git.kernel.org/pub/scm/lin... (diff) | |
| parent | MAINTAINERS: Include Samsung PWM in Samsung SoC entry (diff) | |
| download | linux-05a3a767667ef5bfa9ac99b76b57be504f01a7a9.tar.xz linux-05a3a767667ef5bfa9ac99b76b57be504f01a7a9.zip | |
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 'include')
| -rw-r--r-- | include/linux/soc/samsung/exynos-regs-pmu.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/soc/samsung/exynos-regs-pmu.h b/include/linux/soc/samsung/exynos-regs-pmu.h index fc9250fb3133..aa840ed043e1 100644 --- 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) |