Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adfe3b76 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by MyungJoo Ham
Browse files

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: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Acked-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarGaël PORTAY <gael.portay@collabora.com>
Signed-off-by: default avatarMyungJoo Ham <myungjoo.ham@samsung.com>
parent fbb9c3c9

drivers/devfreq/event/rockchip-dfi.c

+7 −16
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <linux/list.h>

#include <linux/of.h>



#include <soc/rockchip/rk3399_grf.h>



#define RK3399_DMC_NUM_CH	2



/* DDRMON_CTRL */
@@ -43,18 +45,6 @@ 
#define DDRMON_CH1_COUNT_NUM		0x3c

#define DDRMON_CH1_DFI_ACCESS_NUM	0x40



/* pmu grf */

#define PMUGRF_OS_REG2	0x308

#define DDRTYPE_SHIFT	13

#define DDRTYPE_MASK	7



enum {

	DDR3 = 3,

	LPDDR3 = 6,

	LPDDR4 = 7,

	UNUSED = 0xFF

};



struct dmc_usage {

	u32 access;

	u32 total;
@@ -83,16 +73,17 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev) 
	u32 ddr_type;



	/* get ddr type */

	regmap_read(info->regmap_pmu, PMUGRF_OS_REG2, &val);

	ddr_type = (val >> DDRTYPE_SHIFT) & DDRTYPE_MASK;

	regmap_read(info->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);

	ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) &

		    RK3399_PMUGRF_DDRTYPE_MASK;



	/* clear DDRMON_CTRL setting */

	writel_relaxed(CLR_DDRMON_CTRL, dfi_regs + DDRMON_CTRL);



	/* set ddr type to dfi */

	if (ddr_type == LPDDR3)

	if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR3)

		writel_relaxed(LPDDR3_EN, dfi_regs + DDRMON_CTRL);

	else if (ddr_type == LPDDR4)

	else if (ddr_type == RK3399_PMUGRF_DDRTYPE_LPDDR4)

		writel_relaxed(LPDDR4_EN, dfi_regs + DDRMON_CTRL);



	/* enable count, use software mode */

include/soc/rockchip/rk3399_grf.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * Rockchip General Register Files definitions

 *

 * Copyright (c) 2018, Collabora Ltd.

 * Author: Enric Balletbo i Serra <enric.balletbo@collabora.com>

 */



#ifndef __SOC_RK3399_GRF_H

#define __SOC_RK3399_GRF_H



/* PMU GRF Registers */

#define RK3399_PMUGRF_OS_REG2		0x308

#define RK3399_PMUGRF_DDRTYPE_SHIFT	13

#define RK3399_PMUGRF_DDRTYPE_MASK	7

#define RK3399_PMUGRF_DDRTYPE_DDR3	3

#define RK3399_PMUGRF_DDRTYPE_LPDDR2	5

#define RK3399_PMUGRF_DDRTYPE_LPDDR3	6

#define RK3399_PMUGRF_DDRTYPE_LPDDR4	7



#endif