From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: MIME-version: 1.0 Content-type: text/plain; charset="UTF-8" Message-id: <5B6170F4.4070102@samsung.com> Date: Wed, 01 Aug 2018 17:36:04 +0900 From: Chanwoo Choi To: Enric Balletbo i Serra , MyungJoo Ham , Kyungmin Park , Rob Herring , Will Deacon , Heiko Stuebner , Michael Turquette , Stephen Boyd , Sandy Huang , David Airlie Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Derek Basehore , linux-clk@vger.kernel.org, linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, Lin Huang , kernel@collabora.com, robin.murphy@arm.com, Sean Paul , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 1/8] devfreq: rockchip-dfi: Move GRF definitions to a common place. In-reply-to: <20180730081124.30698-2-enric.balletbo@collabora.com> References: <20180730081124.30698-1-enric.balletbo@collabora.com> <20180730081124.30698-2-enric.balletbo@collabora.com> List-ID: Hi Enric, On 2018년 07월 30일 17:11, Enric Balletbo i Serra wrote: > 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 > --- > > Changes in v1: > - [RFC 1/10] Add Acked-by: Chanwoo Choi Even if you add the changes log, you are missing my Acked-by tag. > - [RFC 1/10] s/Generic/General/ (Robin Murphy) > - [RFC 4/10] Removed from the series. I did not found a use case where not holding the mutex causes the issue. > - [RFC 7/10] Removed from the series. I did not found a use case where this matters. > > drivers/devfreq/event/rockchip-dfi.c | 23 +++++++---------------- > include/soc/rockchip/rk3399_grf.h | 21 +++++++++++++++++++++ > 2 files changed, 28 insertions(+), 16 deletions(-) > create mode 100644 include/soc/rockchip/rk3399_grf.h > > diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockchip-dfi.c > index 22b113363ffc..2fbbcbeb644f 100644 > --- a/drivers/devfreq/event/rockchip-dfi.c > +++ b/drivers/devfreq/event/rockchip-dfi.c > @@ -26,6 +26,8 @@ > #include > #include > > +#include > + > #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 */ > diff --git a/include/soc/rockchip/rk3399_grf.h b/include/soc/rockchip/rk3399_grf.h > new file mode 100644 > index 000000000000..3eebabcb2812 > --- /dev/null > +++ b/include/soc/rockchip/rk3399_grf.h > @@ -0,0 +1,21 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Rockchip General Register Files definitions > + * > + * Copyright (c) 2018, Collabora Ltd. > + * Author: Enric Balletbo i Serra > + */ > + > +#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 > -- Best Regards, Chanwoo Choi Samsung Electronics