1 files changed, 34 insertions, 33 deletions

diff --git a/drivers/serial/serial_clps711x.c b/drivers/serial/serial_clps711x.c
index 294c88b92f..2a284909bf 100644
--- a/drivers/serial/serial_clps711x.c
+++ b/drivers/serial/serial_clps711x.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* Author: Alexander Shiyan <shc_work@mail.ru> */
 
 #include <common.h>
@@ -8,6 +8,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <mfd/syscon.h>
+#include <linux/regmap.h>
 
 #define UARTDR			0x00
 # define UARTDR_FRMERR		(1 << 8)
@@ -35,7 +36,7 @@
 
 struct clps711x_uart {
 	void __iomem		*base;
-	void __iomem		*syscon;
+	struct regmap		*regmap;
 	struct clk		*uart_clk;
 	struct console_device	cdev;
 };
@@ -61,8 +62,7 @@ static void clps711x_init_port(struct console_device *cdev)
 	u32 tmp;
 
 	/* Disable the UART */
-	tmp = readl(s->syscon + SYSCON);
-	writel(tmp & ~SYSCON_UARTEN, s->syscon + SYSCON);
+	regmap_update_bits(s->regmap, SYSCON, SYSCON_UARTEN, 0);
 
 	/* Setup Line Control Register */
 	tmp = readl(s->base + UBRLCR) & UBRLCR_BAUD_MASK;
@@ -70,17 +70,19 @@ static void clps711x_init_port(struct console_device *cdev)
 	writel(tmp, s->base + UBRLCR);
 
 	/* Enable the UART */
-	tmp = readl(s->syscon + SYSCON);
-	writel(tmp | SYSCON_UARTEN, s->syscon + SYSCON);
+	regmap_update_bits(s->regmap, SYSCON, SYSCON_UARTEN, SYSCON_UARTEN);
 }
 
 static void clps711x_putc(struct console_device *cdev, char c)
 {
 	struct clps711x_uart *s = cdev->dev->priv;
+	u32 tmp;
 
 	/* Wait until there is space in the FIFO */
 	do {
-	} while (readl(s->syscon + SYSFLG) & SYSFLG_UTXFF);
+		regmap_read(s->regmap, SYSFLG, &tmp);
+
+	} while (tmp & SYSFLG_UTXFF);
 
 	/* Send the character */
 	writew(c, s->base + UARTDR);
@@ -90,10 +92,12 @@ static int clps711x_getc(struct console_device *cdev)
 {
 	struct clps711x_uart *s = cdev->dev->priv;
 	u16 data;
+	u32 tmp;
 
 	/* Wait until there is data in the FIFO */
 	do {
-	} while (readl(s->syscon + SYSFLG) & SYSFLG_URXFE);
+		regmap_read(s->regmap, SYSFLG, &tmp);
+	} while (tmp & SYSFLG_URXFE);
 
 	data = readw(s->base + UARTDR);
 
@@ -107,32 +111,32 @@ static int clps711x_getc(struct console_device *cdev)
 static int clps711x_tstc(struct console_device *cdev)
 {
 	struct clps711x_uart *s = cdev->dev->priv;
+	u32 tmp;
+
+	regmap_read(s->regmap, SYSFLG, &tmp);
 
-	return !(readl(s->syscon + SYSFLG) & SYSFLG_URXFE);
+	return !(tmp & SYSFLG_URXFE);
 }
 
 static void clps711x_flush(struct console_device *cdev)
 {
 	struct clps711x_uart *s = cdev->dev->priv;
+	u32 tmp;
 
 	do {
-	} while (readl(s->syscon + SYSFLG) & SYSFLG_UBUSY);
+		regmap_read(s->regmap, SYSFLG, &tmp);
+	} while (tmp & SYSFLG_UBUSY);
 }
 
-static int clps711x_probe(struct device_d *dev)
+static int clps711x_probe(struct device *dev)
 {
+	struct device_node *syscon;
 	struct clps711x_uart *s;
-	int err, id = dev->id;
-	char syscon_dev[8];
 	const char *devname;
-
-	if (dev->device_node)
-		id = of_alias_get_id(dev->device_node, "serial");
-
-	if (id != 0 && id != 1)
-		return -EINVAL;
+	int err;
 
 	s = xzalloc(sizeof(struct clps711x_uart));
+
 	s->uart_clk = clk_get(dev, NULL);
 	if (IS_ERR(s->uart_clk)) {
 		err = PTR_ERR(s->uart_clk);
@@ -140,19 +144,15 @@ static int clps711x_probe(struct device_d *dev)
 	}
 
 	s->base = dev_get_mem_region(dev, 0);
-	if (IS_ERR(s->base))
-		return PTR_ERR(s->base);
-
-	if (!dev->device_node) {
-		sprintf(syscon_dev, "syscon%i", id + 1);
-		s->syscon = syscon_base_lookup_by_pdevname(syscon_dev);
-	} else {
-		s->syscon = syscon_base_lookup_by_phandle(dev->device_node,
-							  "syscon");
+	if (IS_ERR(s->base)) {
+		err = PTR_ERR(s->base);
+		goto out_err;
 	}
 
-	if (IS_ERR(s->syscon)) {
-		err = PTR_ERR(s->syscon);
+	syscon = of_parse_phandle(dev->of_node, "syscon", 0);
+	s->regmap = syscon_node_to_regmap(syscon);
+	if (IS_ERR(s->regmap)) {
+		err = PTR_ERR(s->regmap);
 		goto out_err;
 	}
 
@@ -165,7 +165,7 @@ static int clps711x_probe(struct device_d *dev)
 	s->cdev.setbrg	= clps711x_setbaudrate;
 	s->cdev.linux_console_name = "ttyCL";
 
-	devname = of_alias_get(dev->device_node);
+	devname = of_alias_get(dev->of_node);
 	if (devname) {
 		s->cdev.devname = xstrdup(devname);
 		s->cdev.devid = DEVICE_ID_SINGLE;
@@ -182,12 +182,13 @@ out_err:
 	return err;
 }
 
-static struct of_device_id __maybe_unused clps711x_uart_dt_ids[] = {
+static const struct of_device_id __maybe_unused clps711x_uart_dt_ids[] = {
 	{ .compatible = "cirrus,ep7209-uart", },
 	{ /* sentinel */ }
 };
+MODULE_DEVICE_TABLE(of, clps711x_uart_dt_ids);
 
-static struct driver_d clps711x_driver = {
+static struct driver clps711x_driver = {
 	.name		= "clps711x-uart",
 	.probe		= clps711x_probe,
 	.of_compatible	= DRV_OF_COMPAT(clps711x_uart_dt_ids),