History

Merge tag 'samsung-drivers-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/drivers

Samsung soc drivers changes for v5.6 1. Convert to managed (devm_x()) versions, 2. Cleanups (Samsung and Exynos names). * tag 'samsung-drivers-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: memory: samsung: Rename Exynos to lowercase soc: samsung: Rename Samsung and Exynos to lowercase memory: samsung: exynos5422-dmc: Convert to devm_platform_ioremap_resource soc: samsung: exynos-pmu: Convert to devm_platform_ioremap_resource

Olof Johansson committed 6 years ago

Commit 06d3d722 parents 3abda7c 053630913 files · +22 −27Browse files

Showing the changes to include/linux (2 of 13 files). Show all

Unified · Split

2 files
  1. include/linux/soc/samsung/exynos-pmu.h +1 −1
  2. include/linux/soc/samsung/exynos-regs-pmu.h +8 −8
include/linux/soc/samsung/exynos-pmu.h+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 * Copyright (c) 2014 Samsung Electronics Co., Ltd.
44 * http://www.samsung.com
55 *
6− * Header for EXYNOS PMU Driver support
6+ * Header for Exynos PMU Driver support
77 */
88
99 #ifndef __LINUX_SOC_EXYNOS_PMU_H
include/linux/soc/samsung/exynos-regs-pmu.h+8−8
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 * Copyright (c) 2010-2015 Samsung Electronics Co., Ltd.
44 * http://www.samsung.com
55 *
6− * EXYNOS - Power management unit definition
6+ * Exynos - Power management unit definition
77 *
88 * Notice:
99 * This is not a list of all Exynos Power Management Unit SFRs.
@@ -185,7 +185,7 @@ · 175 unmodified lines
185185 /* Only for S5Pv210 */
186186 #define S5PV210_EINT_WAKEUP_MASK 0xC004
187187
188−/* Only for EXYNOS4210 */
188+/* Only for Exynos4210 */
189189 #define S5P_CMU_CLKSTOP_LCD1_LOWPWR 0x1154
190190 #define S5P_CMU_RESET_LCD1_LOWPWR 0x1174
191191 #define S5P_MODIMIF_MEM_LOWPWR 0x11C4
@@ -193,7 +193,7 @@ · 1 unmodified line
193193 #define S5P_SATA_MEM_LOWPWR 0x11E4
194194 #define S5P_LCD1_LOWPWR 0x1394
195195
196−/* Only for EXYNOS4x12 */
196+/* Only for Exynos4x12 */
197197 #define S5P_ISP_ARM_LOWPWR 0x1050
198198 #define S5P_DIS_IRQ_ISP_ARM_LOCAL_LOWPWR 0x1054
199199 #define S5P_DIS_IRQ_ISP_ARM_CENTRAL_LOWPWR 0x1058
@@ -234,7 +234,7 @@ · 34 unmodified lines
234234 #define S5P_SECSS_MEM_OPTION 0x2EC8
235235 #define S5P_ROTATOR_MEM_OPTION 0x2F48
236236
237−/* Only for EXYNOS4412 */
237+/* Only for Exynos4412 */
238238 #define S5P_ARM_CORE2_LOWPWR 0x1020
239239 #define S5P_DIS_IRQ_CORE2 0x1024
240240 #define S5P_DIS_IRQ_CENTRAL2 0x1028
@@ -242,7 +242,7 @@ · 1 unmodified line
242242 #define S5P_DIS_IRQ_CORE3 0x1034
243243 #define S5P_DIS_IRQ_CENTRAL3 0x1038
244244
245−/* Only for EXYNOS3XXX */
245+/* Only for Exynos3XXX */
246246 #define EXYNOS3_ARM_CORE0_SYS_PWR_REG 0x1000
247247 #define EXYNOS3_DIS_IRQ_ARM_CORE0_LOCAL_SYS_PWR_REG 0x1004
248248 #define EXYNOS3_DIS_IRQ_ARM_CORE0_CENTRAL_SYS_PWR_REG 0x1008
@@ -347,7 +347,7 @@ · 98 unmodified lines
347347 #define EXYNOS3_OPTION_USE_SC_FEEDBACK (1 << 1)
348348 #define EXYNOS3_OPTION_SKIP_DEACTIVATE_ACEACP_IN_PWDN (1 << 7)
349349
350−/* For EXYNOS5 */
350+/* For Exynos5 */
351351
352352 #define EXYNOS5_AUTO_WDTRESET_DISABLE 0x0408
353353 #define EXYNOS5_MASK_WDTRESET_REQUEST 0x040C
@@ -484,7 +484,7 @@ · 130 unmodified lines
484484
485485 #define EXYNOS5420_SWRESET_KFC_SEL 0x3
486486
487−/* Only for EXYNOS5420 */
487+/* Only for Exynos5420 */
488488 #define EXYNOS5420_L2RSTDISABLE_VALUE BIT(3)
489489
490490 #define EXYNOS5420_LPI_MASK 0x0004
@@ -645,7 +645,7 @@ · 154 unmodified lines
645645 | EXYNOS5420_KFC_USE_STANDBY_WFI2 \
646646 | EXYNOS5420_KFC_USE_STANDBY_WFI3)
647647
648−/* For EXYNOS5433 */
648+/* For Exynos5433 */
649649 #define EXYNOS5433_EINT_WAKEUP_MASK (0x060C)
650650 #define EXYNOS5433_USBHOST30_PHY_CONTROL (0x0728)
651651 #define EXYNOS5433_PAD_RETENTION_AUD_OPTION (0x3028)