Merge tag 'arm-soc-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / tty / goldfish.c

diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c
index c8c5cdf..cd23a4b 100644 (file)
--- a/drivers/tty/goldfish.c
+++ b/drivers/tty/goldfish.c
@@ -61,13 +61,13 @@ static void do_rw_io(struct goldfish_tty *qtty,
        spin_lock_irqsave(&qtty->lock, irq_flags);
        gf_write_ptr((void *)address, base + GOLDFISH_TTY_REG_DATA_PTR,
                     base + GOLDFISH_TTY_REG_DATA_PTR_HIGH);
-       writel(count, base + GOLDFISH_TTY_REG_DATA_LEN);
+       __raw_writel(count, base + GOLDFISH_TTY_REG_DATA_LEN);
 
        if (is_write)
-               writel(GOLDFISH_TTY_CMD_WRITE_BUFFER,
+               __raw_writel(GOLDFISH_TTY_CMD_WRITE_BUFFER,
                       base + GOLDFISH_TTY_REG_CMD);
        else
-               writel(GOLDFISH_TTY_CMD_READ_BUFFER,
+               __raw_writel(GOLDFISH_TTY_CMD_READ_BUFFER,
                       base + GOLDFISH_TTY_REG_CMD);
 
        spin_unlock_irqrestore(&qtty->lock, irq_flags);
@@ -142,7 +142,7 @@ static irqreturn_t goldfish_tty_interrupt(int irq, void *dev_id)
        unsigned char *buf;
        u32 count;
 
-       count = readl(base + GOLDFISH_TTY_REG_BYTES_READY);
+       count = __raw_readl(base + GOLDFISH_TTY_REG_BYTES_READY);
        if (count == 0)
                return IRQ_NONE;
 
@@ -159,7 +159,7 @@ static int goldfish_tty_activate(struct tty_port *port, struct tty_struct *tty)
 {
        struct goldfish_tty *qtty = container_of(port, struct goldfish_tty,
                                                                        port);
-       writel(GOLDFISH_TTY_CMD_INT_ENABLE, qtty->base + GOLDFISH_TTY_REG_CMD);
+       __raw_writel(GOLDFISH_TTY_CMD_INT_ENABLE, qtty->base + GOLDFISH_TTY_REG_CMD);
        return 0;
 }
 
@@ -167,7 +167,7 @@ static void goldfish_tty_shutdown(struct tty_port *port)
 {
        struct goldfish_tty *qtty = container_of(port, struct goldfish_tty,
                                                                        port);
-       writel(GOLDFISH_TTY_CMD_INT_DISABLE, qtty->base + GOLDFISH_TTY_REG_CMD);
+       __raw_writel(GOLDFISH_TTY_CMD_INT_DISABLE, qtty->base + GOLDFISH_TTY_REG_CMD);
 }
 
 static int goldfish_tty_open(struct tty_struct *tty, struct file *filp)
@@ -202,7 +202,7 @@ static int goldfish_tty_chars_in_buffer(struct tty_struct *tty)
 {
        struct goldfish_tty *qtty = &goldfish_ttys[tty->index];
        void __iomem *base = qtty->base;
-       return readl(base + GOLDFISH_TTY_REG_BYTES_READY);
+       return __raw_readl(base + GOLDFISH_TTY_REG_BYTES_READY);
 }
 
 static void goldfish_tty_console_write(struct console *co, const char *b,
@@ -357,7 +357,7 @@ static int goldfish_tty_probe(struct platform_device *pdev)
         * on Ranchu emulator (qemu2) returns 1 here and
         * driver will use physical addresses.
         */
-       qtty->version = readl(base + GOLDFISH_TTY_REG_VERSION);
+       qtty->version = __raw_readl(base + GOLDFISH_TTY_REG_VERSION);
 
        /*
         * Goldfish TTY device on Ranchu emulator (qemu2)
@@ -376,7 +376,7 @@ static int goldfish_tty_probe(struct platform_device *pdev)
                }
        }
 
-       writel(GOLDFISH_TTY_CMD_INT_DISABLE, base + GOLDFISH_TTY_REG_CMD);
+       __raw_writel(GOLDFISH_TTY_CMD_INT_DISABLE, base + GOLDFISH_TTY_REG_CMD);
 
        ret = request_irq(irq, goldfish_tty_interrupt, IRQF_SHARED,
                          "goldfish_tty", qtty);