@@ -59,13 +59,13 @@ struct rockchip_dfi {
5959
6060static void rockchip_dfi_start_hardware_counter (struct devfreq_event_dev * edev )
6161{
62- struct rockchip_dfi * info = devfreq_event_get_drvdata (edev );
63- void __iomem * dfi_regs = info -> regs ;
62+ struct rockchip_dfi * dfi = devfreq_event_get_drvdata (edev );
63+ void __iomem * dfi_regs = dfi -> regs ;
6464 u32 val ;
6565 u32 ddr_type ;
6666
6767 /* get ddr type */
68- regmap_read (info -> regmap_pmu , RK3399_PMUGRF_OS_REG2 , & val );
68+ regmap_read (dfi -> regmap_pmu , RK3399_PMUGRF_OS_REG2 , & val );
6969 ddr_type = (val >> RK3399_PMUGRF_DDRTYPE_SHIFT ) &
7070 RK3399_PMUGRF_DDRTYPE_MASK ;
7171
@@ -84,28 +84,28 @@ static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev *edev)
8484
8585static void rockchip_dfi_stop_hardware_counter (struct devfreq_event_dev * edev )
8686{
87- struct rockchip_dfi * info = devfreq_event_get_drvdata (edev );
88- void __iomem * dfi_regs = info -> regs ;
87+ struct rockchip_dfi * dfi = devfreq_event_get_drvdata (edev );
88+ void __iomem * dfi_regs = dfi -> regs ;
8989
9090 writel_relaxed (SOFTWARE_DIS , dfi_regs + DDRMON_CTRL );
9191}
9292
9393static int rockchip_dfi_get_busier_ch (struct devfreq_event_dev * edev )
9494{
95- struct rockchip_dfi * info = devfreq_event_get_drvdata (edev );
95+ struct rockchip_dfi * dfi = devfreq_event_get_drvdata (edev );
9696 u32 tmp , max = 0 ;
9797 u32 i , busier_ch = 0 ;
98- void __iomem * dfi_regs = info -> regs ;
98+ void __iomem * dfi_regs = dfi -> regs ;
9999
100100 rockchip_dfi_stop_hardware_counter (edev );
101101
102102 /* Find out which channel is busier */
103103 for (i = 0 ; i < RK3399_DMC_NUM_CH ; i ++ ) {
104- info -> ch_usage [i ].access = readl_relaxed (dfi_regs +
104+ dfi -> ch_usage [i ].access = readl_relaxed (dfi_regs +
105105 DDRMON_CH0_DFI_ACCESS_NUM + i * 20 ) * 4 ;
106- info -> ch_usage [i ].total = readl_relaxed (dfi_regs +
106+ dfi -> ch_usage [i ].total = readl_relaxed (dfi_regs +
107107 DDRMON_CH0_COUNT_NUM + i * 20 );
108- tmp = info -> ch_usage [i ].access ;
108+ tmp = dfi -> ch_usage [i ].access ;
109109 if (tmp > max ) {
110110 busier_ch = i ;
111111 max = tmp ;
@@ -118,20 +118,20 @@ static int rockchip_dfi_get_busier_ch(struct devfreq_event_dev *edev)
118118
119119static int rockchip_dfi_disable (struct devfreq_event_dev * edev )
120120{
121- struct rockchip_dfi * info = devfreq_event_get_drvdata (edev );
121+ struct rockchip_dfi * dfi = devfreq_event_get_drvdata (edev );
122122
123123 rockchip_dfi_stop_hardware_counter (edev );
124- clk_disable_unprepare (info -> clk );
124+ clk_disable_unprepare (dfi -> clk );
125125
126126 return 0 ;
127127}
128128
129129static int rockchip_dfi_enable (struct devfreq_event_dev * edev )
130130{
131- struct rockchip_dfi * info = devfreq_event_get_drvdata (edev );
131+ struct rockchip_dfi * dfi = devfreq_event_get_drvdata (edev );
132132 int ret ;
133133
134- ret = clk_prepare_enable (info -> clk );
134+ ret = clk_prepare_enable (dfi -> clk );
135135 if (ret ) {
136136 dev_err (& edev -> dev , "failed to enable dfi clk: %d\n" , ret );
137137 return ret ;
@@ -149,13 +149,13 @@ static int rockchip_dfi_set_event(struct devfreq_event_dev *edev)
149149static int rockchip_dfi_get_event (struct devfreq_event_dev * edev ,
150150 struct devfreq_event_data * edata )
151151{
152- struct rockchip_dfi * info = devfreq_event_get_drvdata (edev );
152+ struct rockchip_dfi * dfi = devfreq_event_get_drvdata (edev );
153153 int busier_ch ;
154154
155155 busier_ch = rockchip_dfi_get_busier_ch (edev );
156156
157- edata -> load_count = info -> ch_usage [busier_ch ].access ;
158- edata -> total_count = info -> ch_usage [busier_ch ].total ;
157+ edata -> load_count = dfi -> ch_usage [busier_ch ].access ;
158+ edata -> total_count = dfi -> ch_usage [busier_ch ].total ;
159159
160160 return 0 ;
161161}
@@ -176,47 +176,47 @@ MODULE_DEVICE_TABLE(of, rockchip_dfi_id_match);
176176static int rockchip_dfi_probe (struct platform_device * pdev )
177177{
178178 struct device * dev = & pdev -> dev ;
179- struct rockchip_dfi * data ;
179+ struct rockchip_dfi * dfi ;
180180 struct devfreq_event_desc * desc ;
181181 struct device_node * np = pdev -> dev .of_node , * node ;
182182
183- data = devm_kzalloc (dev , sizeof (struct rockchip_dfi ), GFP_KERNEL );
184- if (!data )
183+ dfi = devm_kzalloc (dev , sizeof (* dfi ), GFP_KERNEL );
184+ if (!dfi )
185185 return - ENOMEM ;
186186
187- data -> regs = devm_platform_ioremap_resource (pdev , 0 );
188- if (IS_ERR (data -> regs ))
189- return PTR_ERR (data -> regs );
187+ dfi -> regs = devm_platform_ioremap_resource (pdev , 0 );
188+ if (IS_ERR (dfi -> regs ))
189+ return PTR_ERR (dfi -> regs );
190190
191- data -> clk = devm_clk_get (dev , "pclk_ddr_mon" );
192- if (IS_ERR (data -> clk ))
193- return dev_err_probe (dev , PTR_ERR (data -> clk ),
191+ dfi -> clk = devm_clk_get (dev , "pclk_ddr_mon" );
192+ if (IS_ERR (dfi -> clk ))
193+ return dev_err_probe (dev , PTR_ERR (dfi -> clk ),
194194 "Cannot get the clk pclk_ddr_mon\n" );
195195
196196 node = of_parse_phandle (np , "rockchip,pmu" , 0 );
197197 if (!node )
198198 return dev_err_probe (& pdev -> dev , - ENODEV , "Can't find pmu_grf registers\n" );
199199
200- data -> regmap_pmu = syscon_node_to_regmap (node );
200+ dfi -> regmap_pmu = syscon_node_to_regmap (node );
201201 of_node_put (node );
202- if (IS_ERR (data -> regmap_pmu ))
203- return PTR_ERR (data -> regmap_pmu );
202+ if (IS_ERR (dfi -> regmap_pmu ))
203+ return PTR_ERR (dfi -> regmap_pmu );
204204
205- data -> dev = dev ;
205+ dfi -> dev = dev ;
206206
207- desc = & data -> desc ;
207+ desc = & dfi -> desc ;
208208 desc -> ops = & rockchip_dfi_ops ;
209- desc -> driver_data = data ;
209+ desc -> driver_data = dfi ;
210210 desc -> name = np -> name ;
211211
212- data -> edev = devm_devfreq_event_add_edev (& pdev -> dev , desc );
213- if (IS_ERR (data -> edev )) {
212+ dfi -> edev = devm_devfreq_event_add_edev (& pdev -> dev , desc );
213+ if (IS_ERR (dfi -> edev )) {
214214 dev_err (& pdev -> dev ,
215215 "failed to add devfreq-event device\n" );
216- return PTR_ERR (data -> edev );
216+ return PTR_ERR (dfi -> edev );
217217 }
218218
219- platform_set_drvdata (pdev , data );
219+ platform_set_drvdata (pdev , dfi );
220220
221221 return 0 ;
222222}
0 commit comments