Skip to contentSkip to conversation

meson_uart: adds the core clock handling to the driver

PATCH New Helmut Klein 2 participants 2 messages Mar 22, 2017 – Mar 23, 2017

Subsystems (2)
Arm/Amlogic Meson SoC support TTY layer and serial drivers
lore
Share & tools
lore

Helmut Klein

author
#0 lore raw

PATCH 3/3 meson_uart: adds the core clock handling to the driver

the added lines are 1:1 ripped off amlogic's driver. They do what i want them to do.

I've hot no idea, if they are acceptable in that form.

diff -Napur a/drivers/tty/serial/meson_uart.c
b/drivers/tty/serial/meson_uart.c

drivers/tty/serial/meson_uart.c +10 -0
@@ -600,6 +600,7 @@ static int meson_uart_probe(struct platf
  	struct resource *res_mem, *res_irq;
  	struct uart_port *port;
  	struct clk *clk;
+	struct clk *core_clk;
  	int ret = 0;
 
  	if (pdev->dev.of_node)

@@ -625,6 +626,15 @@ static int meson_uart_probe(struct platf
  	if (!port)
  		return -ENOMEM;
 
+	core_clk = devm_clk_get(&pdev->dev, "core");
+	if (!IS_ERR(core_clk)) {
+		ret = clk_prepare_enable(core_clk);
+		if(ret) {
+			dev_err(&pdev->dev, "couldn't enable clkc\n");
+			return ret;
+		}
+	}
+
  	clk = clk_get(&pdev->dev, NULL);
  	if (IS_ERR(clk))
  		return PTR_ERR(clk);
#1 lore raw

PATCH 3/3 meson_uart: adds the core clock handling to the driver

Le 22/03/2017 21:46, Helmut Klein a ?crit :

Quoted 18 lines

the added lines are 1:1 ripped off amlogic's driver. They do what i want them to do.

I've hot no idea, if they are acceptable in that form.

diff -Napur a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c

drivers/tty/serial/meson_uart.c 2017-03-22 19:01:38.581613578 +0100 renamed from drivers/tty/serial/meson_uart.c 2017-03-09 21:09:47.000000000 +0100 +1 -0
@@ -600,6 +600,7 @@ static int meson_uart_probe(struct platf
     struct resource *res_mem, *res_irq;
     struct uart_port *port;
     struct clk *clk;
+    struct clk *core_clk;
     int ret = 0;
 
     if (pdev->dev.of_node)

@@ -625,6 +626,15 @@ static int meson_uart_probe(struct platf
     if (!port)

drivers/tty/serial/meson_uart.c 2017-03-22 19:01:38.581613578 +0100 static int meson_uart_probe(struct platf · line 636

Quoted 10 lines
drivers/tty/serial/meson_uart.c 2017-03-22 19:01:38.581613578 +0100 renamed from drivers/tty/serial/meson_uart.c 2017-03-09 21:09:47.000000000 +0100 +8 -0
         return -ENOMEM;
 
+    core_clk = devm_clk_get(&pdev->dev, "core");
+    if (!IS_ERR(core_clk)) {
+        ret = clk_prepare_enable(core_clk);
+        if(ret) {
+            dev_err(&pdev->dev, "couldn't enable clkc\n");
+            return ret;
+        }
+    }

it's correct, but the another way to go is :
if (IS_ERR(core_clk))

	core_clk = NULL;

ret = clk_prepare_enable(core_clk);

if(ret) {
    dev_err(&pdev->dev, "couldn't enable clkc\n");
    return ret;
}

clk_prepare_enable will accept NULL clk.

drivers/tty/serial/meson_uart.c 2017-03-22 19:01:38.581613578 +0100 static int meson_uart_probe(struct platf · line 640

Quoted 5 lines
drivers/tty/serial/meson_uart.c 2017-03-22 19:01:38.581613578 +0100 renamed from drivers/tty/serial/meson_uart.c 2017-03-09 21:09:47.000000000 +0100 +1 -0
+
     clk = clk_get(&pdev->dev, NULL);
     if (IS_ERR(clk))
         return PTR_ERR(clk);

Please also Cc the tty/serial maintainer here also.

Neil