PM / devfreq: rk3399_dmc,dfi: generalize DDRTYPE defines

[linux-2.6-microblaze.git] / drivers / devfreq / rk3399_dmc.c

diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
index daff407..fd2c5ff 100644 (file)
--- a/drivers/devfreq/rk3399_dmc.c
+++ b/drivers/devfreq/rk3399_dmc.c
@@ -22,6 +22,7 @@
 #include <linux/suspend.h>
 
 #include <soc/rockchip/pm_domains.h>
+#include <soc/rockchip/rockchip_grf.h>
 #include <soc/rockchip/rk3399_grf.h>
 #include <soc/rockchip/rockchip_sip.h>
 
@@ -381,17 +382,16 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
        }
 
        regmap_read(data->regmap_pmu, RK3399_PMUGRF_OS_REG2, &val);
-       ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) &
-                   RK3399_PMUGRF_DDRTYPE_MASK;
+       ddr_type = FIELD_GET(RK3399_PMUGRF_OS_REG2_DDRTYPE, val);
 
        switch (ddr_type) {
-       case RK3399_PMUGRF_DDRTYPE_DDR3:
+       case ROCKCHIP_DDRTYPE_DDR3:
                data->odt_dis_freq = data->ddr3_odt_dis_freq;
                break;
-       case RK3399_PMUGRF_DDRTYPE_LPDDR3:
+       case ROCKCHIP_DDRTYPE_LPDDR3:
                data->odt_dis_freq = data->lpddr3_odt_dis_freq;
                break;
-       case RK3399_PMUGRF_DDRTYPE_LPDDR4:
+       case ROCKCHIP_DDRTYPE_LPDDR4:
                data->odt_dis_freq = data->lpddr4_odt_dis_freq;
                break;
        default: