Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PM / devfreq: rockchip-dfi: Move GRF definitions to a common place.

Some rk3399 GRF (Generic Register Files) definitions can be used for
different drivers. Move these definitions to a common include so we
don't need to duplicate these definitions.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Gaël PORTAY <gael.portay@collabora.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

authored by

Enric Balletbo i Serra and committed by
MyungJoo Ham
adfe3b76 fbb9c3c9

+28 -16
+7 -16
drivers/devfreq/event/rockchip-dfi.c
··· 26 26 #include <linux/list.h> 27 27 #include <linux/of.h> 28 28 29 + #include <soc/rockchip/rk3399_grf.h> 30 + 29 31 #define RK3399_DMC_NUM_CH 2 30 32 31 33 /* DDRMON_CTRL */ ··· 44 42 #define DDRMON_CH0_DFI_ACCESS_NUM 0x2c 45 43 #define DDRMON_CH1_COUNT_NUM 0x3c 46 44 #define DDRMON_CH1_DFI_ACCESS_NUM 0x40 47 - 48 - /* pmu grf */ 49 - #define PMUGRF_OS_REG2 0x308 50 - #define DDRTYPE_SHIFT 13 51 - #define DDRTYPE_MASK 7 52 - 53 - enum { 54 - DDR3 = 3, 55 - LPDDR3 = 6, 56 - LPDDR4 = 7, 57 - UNUSED = 0xFF 58 - }; 59 45 60 46 struct dmc_usage { 61 47 u32 access; ··· 73 83 u32 ddr_type; 74 84 75 85 /* get ddr type */ 76 - regmap_read(info->regmap_pmu, PMUGRF_OS_REG2, &val); 77 - ddr_type = (val >> DDRTYPE_SHIFT) & DDRTYPE_MASK; 86 + regmap_read(info->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val); 87 + ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) & 88 + RK3399_PMUGRF_DDRTYPE_MASK; 78 89 79 90 /* clear DDRMON_CTRL setting */ 80 91 writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL); 81 92 82 93 /* set ddr type to dfi */ 83 - if (ddr_type == LPDDR3) 94 + if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3) 84 95 writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL); 85 - else if (ddr_type == LPDDR4) 96 + else if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4) 86 97 writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL); 87 98 88 99 /* enable count, use software mode */
+21
include/soc/rockchip/rk3399_grf.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0+ */ 2 + /* 3 + * Rockchip General Register Files definitions 4 + * 5 + * Copyright (c) 2018, Collabora Ltd. 6 + * Author: Enric Balletbo i Serra <enric.balletbo@collabora.com> 7 + */ 8 + 9 + #ifndef __SOC_RK3399_GRF_H 10 + #define __SOC_RK3399_GRF_H 11 + 12 + /* PMU GRF Registers */ 13 + #define RK3399_PMUGRF_OS_REG2 0x308 14 + #define RK3399_PMUGRF_DDRTYPE_SHIFT 13 15 + #define RK3399_PMUGRF_DDRTYPE_MASK 7 16 + #define RK3399_PMUGRF_DDRTYPE_DDR3 3 17 + #define RK3399_PMUGRF_DDRTYPE_LPDDR2 5 18 + #define RK3399_PMUGRF_DDRTYPE_LPDDR3 6 19 + #define RK3399_PMUGRF_DDRTYPE_LPDDR4 7 20 + 21 + #endif