Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c053784454550cf750399caa65482b31ffbe3c57

Authored by Paul Mundt
1 parent 9eb79bb3f5
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

sh: maple: ctrl_in/outX to __raw_read/writeX conversion. 

The ctrl_xxx routines are deprecated, switch over to the __raw_xxx
versions.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Showing 1 changed file with 10 additions and 10 deletions Side-by-side Diff

drivers/sh/maple/maple.c
Diff comments   View file @ c053784
... ... @@ -94,9 +94,9 @@
94 94 /* set hardware registers to enable next round of dma */
95 95 static void maple_dma_reset(void)
96 96 {
97   - ctrl_outl(MAPLE_MAGIC, MAPLE_RESET);
  97 + __raw_writel(MAPLE_MAGIC, MAPLE_RESET);
98 98 /* set trig type to 0 for software trigger, 1 for hardware (VBLANK) */
99   - ctrl_outl(1, MAPLE_TRIGTYPE);
  99 + __raw_writel(1, MAPLE_TRIGTYPE);
100 100 /*
101 101 * Maple system register
102 102 * bits 31 - 16 timeout in units of 20nsec
... ... @@ -105,9 +105,9 @@
105 105 * bits 3 - 0 delay (in 1.3ms) between VBLANK and start of DMA
106 106 * max delay is 11
107 107 */
108   - ctrl_outl(MAPLE_2MBPS | MAPLE_TIMEOUT(0xFFFF), MAPLE_SPEED);
109   - ctrl_outl(virt_to_phys(maple_sendbuf), MAPLE_DMAADDR);
110   - ctrl_outl(1, MAPLE_ENABLE);
  108 + __raw_writel(MAPLE_2MBPS | MAPLE_TIMEOUT(0xFFFF), MAPLE_SPEED);
  109 + __raw_writel(virt_to_phys(maple_sendbuf), MAPLE_DMAADDR);
  110 + __raw_writel(1, MAPLE_ENABLE);
111 111 }
112 112  
113 113 /**
... ... @@ -130,7 +130,7 @@
130 130  
131 131 static int maple_dma_done(void)
132 132 {
133   - return (ctrl_inl(MAPLE_STATE) & 1) == 0;
  133 + return (__raw_readl(MAPLE_STATE) & 1) == 0;
134 134 }
135 135  
136 136 static void maple_release_device(struct device *dev)
... ... @@ -275,7 +275,7 @@
275 275 return;
276 276  
277 277 /* disable DMA */
278   - ctrl_outl(0, MAPLE_ENABLE);
  278 + __raw_writel(0, MAPLE_ENABLE);
279 279  
280 280 if (!list_empty(&maple_sentq))
281 281 goto finish;
... ... @@ -450,7 +450,7 @@
450 450 if (!maple_dma_done())
451 451 return;
452 452  
453   - ctrl_outl(0, MAPLE_ENABLE);
  453 + __raw_writel(0, MAPLE_ENABLE);
454 454  
455 455 if (!list_empty(&maple_sentq))
456 456 goto finish;
... ... @@ -636,7 +636,7 @@
636 636  
637 637 if (!maple_dma_done())
638 638 return;
639   - ctrl_outl(0, MAPLE_ENABLE);
  639 + __raw_writel(0, MAPLE_ENABLE);
640 640 if (!list_empty(&maple_sentq)) {
641 641 list_for_each_entry_safe(mq, nmq, &maple_sentq, list) {
642 642 mdev = mq->dev;
... ... @@ -796,7 +796,7 @@
796 796 int retval, i;
797 797 struct maple_device *mdev[MAPLE_PORTS];
798 798  
799   - ctrl_outl(0, MAPLE_ENABLE);
  799 + __raw_writel(0, MAPLE_ENABLE);
800 800  
801 801 retval = device_register(&maple_bus);
802 802 if (retval)