Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 03ff858c09c81a659b2a90a08826bc0abdbb784c

Authored by Magnus Damm
Committed by Paul Mundt
1 parent 3985c7ce85
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ARM: shmobile: remove sh_timer_config clk member 

Now when the SH-Mobile ARM platforms have been converted
to use device name it is possible to remove "clk" from
struct sh_timer_config.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 4 changed files with 9 additions and 22 deletions Side-by-side Diff

drivers/clocksource/sh_cmt.c
Diff comments   View file @ 03ff858
... ... @@ -616,13 +616,9 @@
616 616 /* get hold of clock */
617 617 p->clk = clk_get(&p->pdev->dev, "cmt_fck");
618 618 if (IS_ERR(p->clk)) {
619   - dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
620   - p->clk = clk_get(&p->pdev->dev, cfg->clk);
621   - if (IS_ERR(p->clk)) {
622   - dev_err(&p->pdev->dev, "cannot get clock\n");
623   - ret = PTR_ERR(p->clk);
624   - goto err1;
625   - }
  619 + dev_err(&p->pdev->dev, "cannot get clock\n");
  620 + ret = PTR_ERR(p->clk);
  621 + goto err1;
626 622 }
627 623  
628 624 if (resource_size(res) == 6) {
drivers/clocksource/sh_mtu2.c
Diff comments   View file @ 03ff858
... ... @@ -287,13 +287,9 @@
287 287 /* get hold of clock */
288 288 p->clk = clk_get(&p->pdev->dev, "mtu2_fck");
289 289 if (IS_ERR(p->clk)) {
290   - dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
291   - p->clk = clk_get(&p->pdev->dev, cfg->clk);
292   - if (IS_ERR(p->clk)) {
293   - dev_err(&p->pdev->dev, "cannot get clock\n");
294   - ret = PTR_ERR(p->clk);
295   - goto err1;
296   - }
  290 + dev_err(&p->pdev->dev, "cannot get clock\n");
  291 + ret = PTR_ERR(p->clk);
  292 + goto err1;
297 293 }
298 294  
299 295 return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),
drivers/clocksource/sh_tmu.c
Diff comments   View file @ 03ff858
... ... @@ -393,13 +393,9 @@
393 393 /* get hold of clock */
394 394 p->clk = clk_get(&p->pdev->dev, "tmu_fck");
395 395 if (IS_ERR(p->clk)) {
396   - dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
397   - p->clk = clk_get(&p->pdev->dev, cfg->clk);
398   - if (IS_ERR(p->clk)) {
399   - dev_err(&p->pdev->dev, "cannot get clock\n");
400   - ret = PTR_ERR(p->clk);
401   - goto err1;
402   - }
  396 + dev_err(&p->pdev->dev, "cannot get clock\n");
  397 + ret = PTR_ERR(p->clk);
  398 + goto err1;
403 399 }
404 400  
405 401 return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
include/linux/sh_timer.h
Diff comments   View file @ 03ff858
... ... @@ -5,7 +5,6 @@
5 5 char *name;
6 6 long channel_offset;
7 7 int timer_bit;
8   - char *clk;
9 8 unsigned long clockevent_rating;
10 9 unsigned long clocksource_rating;
11 10 };