* [PATCH 1/6] serial: 8250_dw: add support for clocks property when using DeviceTree
2013-03-07 22:14 [PATCHv2 0/6] Extend UART support for Allwinner SoCs Maxime Ripard
@ 2013-03-07 22:14 ` Maxime Ripard
2013-03-15 12:56 ` Heikki Krogerus
2013-03-07 22:14 ` [PATCH 2/6] ARM: sunxi: dt: Use clocks property instead of clock-frequency for the UARTs Maxime Ripard
` (5 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Maxime Ripard @ 2013-03-07 22:14 UTC (permalink / raw)
To: linux-arm-kernel
From: Emilio L?pez <emilio@elopez.com.ar>
This commit implements support for using the "clocks" DT property, instead
of having to use clock-frequency.
Signed-off-by: Emilio L?pez <emilio@elopez.com.ar>
---
drivers/tty/serial/8250/8250_dw.c | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index db0e66f..8f03800 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -26,6 +26,7 @@
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/acpi.h>
+#include <linux/clk.h>
#include "8250.h"
@@ -55,8 +56,9 @@
struct dw8250_data {
- int last_lcr;
- int line;
+ int last_lcr;
+ int line;
+ struct clk *clk;
};
static void dw8250_serial_out(struct uart_port *p, int offset, int value)
@@ -116,6 +118,7 @@ static int dw8250_handle_irq(struct uart_port *p)
static int dw8250_probe_of(struct uart_port *p)
{
struct device_node *np = p->dev->of_node;
+ struct dw8250_data *data = p->private_data;
u32 val;
if (!of_property_read_u32(np, "reg-io-width", &val)) {
@@ -137,8 +140,15 @@ static int dw8250_probe_of(struct uart_port *p)
p->regshift = val;
if (of_property_read_u32(np, "clock-frequency", &val)) {
- dev_err(p->dev, "no clock-frequency property set\n");
- return -EINVAL;
+ /* Get clk rate through clk driver if present */
+ data->clk = clk_get(p->dev, NULL);
+ if (IS_ERR(data->clk)) {
+ dev_err(p->dev, "clk or clock-frequency not defined\n");
+ return -EINVAL;
+ }
+
+ clk_prepare_enable(data->clk);
+ val = clk_get_rate(data->clk);
}
p->uartclk = val;
@@ -300,6 +310,12 @@ static int dw8250_probe(struct platform_device *pdev)
dw8250_setup_port(&uart);
+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ uart.port.private_data = data;
+
if (pdev->dev.of_node) {
err = dw8250_probe_of(&uart.port);
if (err)
@@ -312,12 +328,6 @@ static int dw8250_probe(struct platform_device *pdev)
return -ENODEV;
}
- data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
- if (!data)
- return -ENOMEM;
-
- uart.port.private_data = data;
-
data->line = serial8250_register_8250_port(&uart);
if (data->line < 0)
return data->line;
@@ -333,6 +343,8 @@ static int dw8250_remove(struct platform_device *pdev)
serial8250_unregister_port(data->line);
+ clk_disable_unprepare(data->clk);
+
return 0;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 1/6] serial: 8250_dw: add support for clocks property when using DeviceTree
2013-03-07 22:14 ` [PATCH 1/6] serial: 8250_dw: add support for clocks property when using DeviceTree Maxime Ripard
@ 2013-03-15 12:56 ` Heikki Krogerus
2013-03-15 19:48 ` Maxime Ripard
0 siblings, 1 reply; 10+ messages in thread
From: Heikki Krogerus @ 2013-03-15 12:56 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Thu, Mar 07, 2013 at 11:14:15PM +0100, Maxime Ripard wrote:
> From: Emilio L?pez <emilio@elopez.com.ar>
>
> This commit implements support for using the "clocks" DT property, instead
> of having to use clock-frequency.
>
> Signed-off-by: Emilio L?pez <emilio@elopez.com.ar>
> ---
> drivers/tty/serial/8250/8250_dw.c | 32 ++++++++++++++++++++++----------
> 1 file changed, 22 insertions(+), 10 deletions(-)
<snip>
> @@ -137,8 +140,15 @@ static int dw8250_probe_of(struct uart_port *p)
> p->regshift = val;
>
> if (of_property_read_u32(np, "clock-frequency", &val)) {
> - dev_err(p->dev, "no clock-frequency property set\n");
> - return -EINVAL;
> + /* Get clk rate through clk driver if present */
> + data->clk = clk_get(p->dev, NULL);
> + if (IS_ERR(data->clk)) {
> + dev_err(p->dev, "clk or clock-frequency not defined\n");
> + return -EINVAL;
> + }
> +
> + clk_prepare_enable(data->clk);
> + val = clk_get_rate(data->clk);
Don't get the clk here..
> }
> p->uartclk = val;
>
> @@ -300,6 +310,12 @@ static int dw8250_probe(struct platform_device *pdev)
Get it here so it is then handled for also others besides DT users.
And prefer devm_clk_get(). Something like this:
...
uart.port.membase = ioremap(regs->start, resource_size(regs));
if (!uart.port.membase)
return -ENOMEM;
+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
+
+ data->clk = devm_clk_get(&pdev->dev, NULL);
+ clk_prepare_enable(data->clk);
+
uart.port.iotype = UPIO_MEM;
uart.port.serial_in = dw8250_serial_in;
uart.port.serial_out = dw8250_serial_out;
+ uart.port.private_data = data;
+ uart.port.uartclk = clk_get_rate(data->clk);
dw8250_setup_port(&uart);
...
Then in dw8250_probe_of() you need to use the "clock-frequency"
property only when p->uartclk is 0.
Thanks,
--
heikki
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/6] serial: 8250_dw: add support for clocks property when using DeviceTree
2013-03-15 12:56 ` Heikki Krogerus
@ 2013-03-15 19:48 ` Maxime Ripard
0 siblings, 0 replies; 10+ messages in thread
From: Maxime Ripard @ 2013-03-15 19:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi Heikki
Le 15/03/2013 13:56, Heikki Krogerus a ?crit :
>> @@ -137,8 +140,15 @@ static int dw8250_probe_of(struct uart_port *p)
>> p->regshift = val;
>>
>> if (of_property_read_u32(np, "clock-frequency", &val)) {
>> - dev_err(p->dev, "no clock-frequency property set\n");
>> - return -EINVAL;
>> + /* Get clk rate through clk driver if present */
>> + data->clk = clk_get(p->dev, NULL);
>> + if (IS_ERR(data->clk)) {
>> + dev_err(p->dev, "clk or clock-frequency not defined\n");
>> + return -EINVAL;
>> + }
>> +
>> + clk_prepare_enable(data->clk);
>> + val = clk_get_rate(data->clk);
>
> Don't get the clk here..
>
>> }
>> p->uartclk = val;
>>
>> @@ -300,6 +310,12 @@ static int dw8250_probe(struct platform_device *pdev)
>
> Get it here so it is then handled for also others besides DT users.
> And prefer devm_clk_get(). Something like this:
>
> ...
> uart.port.membase = ioremap(regs->start, resource_size(regs));
> if (!uart.port.membase)
> return -ENOMEM;
>
> + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
> + if (!data)
> + return -ENOMEM;
> +
> + data->clk = devm_clk_get(&pdev->dev, NULL);
> + clk_prepare_enable(data->clk);
> +
> uart.port.iotype = UPIO_MEM;
> uart.port.serial_in = dw8250_serial_in;
> uart.port.serial_out = dw8250_serial_out;
> + uart.port.private_data = data;
> + uart.port.uartclk = clk_get_rate(data->clk);
>
> dw8250_setup_port(&uart);
> ...
>
> Then in dw8250_probe_of() you need to use the "clock-frequency"
> property only when p->uartclk is 0.
Thanks for your feedback.
Emilio made a new version of this patch, I'll send it soon.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/6] ARM: sunxi: dt: Use clocks property instead of clock-frequency for the UARTs
2013-03-07 22:14 [PATCHv2 0/6] Extend UART support for Allwinner SoCs Maxime Ripard
2013-03-07 22:14 ` [PATCH 1/6] serial: 8250_dw: add support for clocks property when using DeviceTree Maxime Ripard
@ 2013-03-07 22:14 ` Maxime Ripard
2013-03-07 22:14 ` [PATCH 3/6] ARM: sunxi: dt: Move uart0 to sun4i-a10.dtsi Maxime Ripard
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Maxime Ripard @ 2013-03-07 22:14 UTC (permalink / raw)
To: linux-arm-kernel
It will be especially useful when we will have the clock definitions in
the device tree.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sunxi.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sunxi.dtsi b/arch/arm/boot/dts/sunxi.dtsi
index 8b36abe..791c02a 100644
--- a/arch/arm/boot/dts/sunxi.dtsi
+++ b/arch/arm/boot/dts/sunxi.dtsi
@@ -65,7 +65,7 @@
interrupts = <1>;
reg-shift = <2>;
reg-io-width = <4>;
- clock-frequency = <24000000>;
+ clocks = <&osc>;
status = "disabled";
};
@@ -75,7 +75,7 @@
interrupts = <2>;
reg-shift = <2>;
reg-io-width = <4>;
- clock-frequency = <24000000>;
+ clocks = <&osc>;
status = "disabled";
};
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/6] ARM: sunxi: dt: Move uart0 to sun4i-a10.dtsi
2013-03-07 22:14 [PATCHv2 0/6] Extend UART support for Allwinner SoCs Maxime Ripard
2013-03-07 22:14 ` [PATCH 1/6] serial: 8250_dw: add support for clocks property when using DeviceTree Maxime Ripard
2013-03-07 22:14 ` [PATCH 2/6] ARM: sunxi: dt: Use clocks property instead of clock-frequency for the UARTs Maxime Ripard
@ 2013-03-07 22:14 ` Maxime Ripard
2013-03-07 22:14 ` [PATCH 4/6] ARM: sunxi: dt: Add uart3 dt node Maxime Ripard
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Maxime Ripard @ 2013-03-07 22:14 UTC (permalink / raw)
To: linux-arm-kernel
The UART0 is only available on the Allwinner A10 SoCs, and not on the
A13, so move the uart0 node to sun4i-a10.dtsi.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun4i-a10.dtsi | 10 ++++++++++
arch/arm/boot/dts/sunxi.dtsi | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 03d2b53..703e7cb 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -47,5 +47,15 @@
allwinner,pull = <0>;
};
};
+
+ uart0: uart at 01c28000 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c28000 0x400>;
+ interrupts = <1>;
+ reg-shift = <2>;
+ reg-io-width = <4>;
+ clocks = <&osc>;
+ status = "disabled";
+ };
};
};
diff --git a/arch/arm/boot/dts/sunxi.dtsi b/arch/arm/boot/dts/sunxi.dtsi
index 791c02a..4f78ef7 100644
--- a/arch/arm/boot/dts/sunxi.dtsi
+++ b/arch/arm/boot/dts/sunxi.dtsi
@@ -59,16 +59,6 @@
#interrupt-cells = <1>;
};
- uart0: uart at 01c28000 {
- compatible = "snps,dw-apb-uart";
- reg = <0x01c28000 0x400>;
- interrupts = <1>;
- reg-shift = <2>;
- reg-io-width = <4>;
- clocks = <&osc>;
- status = "disabled";
- };
-
uart1: uart at 01c28400 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28400 0x400>;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/6] ARM: sunxi: dt: Add uart3 dt node
2013-03-07 22:14 [PATCHv2 0/6] Extend UART support for Allwinner SoCs Maxime Ripard
` (2 preceding siblings ...)
2013-03-07 22:14 ` [PATCH 3/6] ARM: sunxi: dt: Move uart0 to sun4i-a10.dtsi Maxime Ripard
@ 2013-03-07 22:14 ` Maxime Ripard
2013-03-07 22:14 ` [PATCH 5/6] ARM: sunxi: dt: Add A10 UARTs to the dtsi Maxime Ripard
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Maxime Ripard @ 2013-03-07 22:14 UTC (permalink / raw)
To: linux-arm-kernel
Both A10 and A13 Allwinner SoCs have a Synopsys APB uart3 device
available, so add it to the sunxi.dtsi file
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sunxi.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/arm/boot/dts/sunxi.dtsi b/arch/arm/boot/dts/sunxi.dtsi
index 4f78ef7..324da45 100644
--- a/arch/arm/boot/dts/sunxi.dtsi
+++ b/arch/arm/boot/dts/sunxi.dtsi
@@ -68,5 +68,15 @@
clocks = <&osc>;
status = "disabled";
};
+
+ uart3: uart at 01c28c00 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c28c00 0x400>;
+ interrupts = <4>;
+ reg-shift = <2>;
+ reg-io-width = <4>;
+ clocks = <&osc>;
+ status = "disabled";
+ };
};
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/6] ARM: sunxi: dt: Add A10 UARTs to the dtsi.
2013-03-07 22:14 [PATCHv2 0/6] Extend UART support for Allwinner SoCs Maxime Ripard
` (3 preceding siblings ...)
2013-03-07 22:14 ` [PATCH 4/6] ARM: sunxi: dt: Add uart3 dt node Maxime Ripard
@ 2013-03-07 22:14 ` Maxime Ripard
2013-03-07 22:14 ` [PATCH 6/6] ARM: sunxi: hackberry: Add UART muxing Maxime Ripard
2013-03-08 11:45 ` [PATCHv2 0/6] Extend UART support for Allwinner SoCs Emilio López
6 siblings, 0 replies; 10+ messages in thread
From: Maxime Ripard @ 2013-03-07 22:14 UTC (permalink / raw)
To: linux-arm-kernel
The Allwinner A10 SoC has 8 available UARTs, which is 6 more than on the
A13, so add the missing UARTs to the sun4i-a10 dtsi.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun4i-a10.dtsi | 51 ++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 703e7cb..0142ca0 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -57,5 +57,56 @@
clocks = <&osc>;
status = "disabled";
};
+
+ uart2: uart at 01c28800 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c28800 0x400>;
+ interrupts = <3>;
+ reg-shift = <2>;
+ reg-io-width = <4>;
+ clocks = <&osc>;
+ status = "disabled";
+ };
+
+
+ uart4: uart at 01c29000 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c29000 0x400>;
+ interrupts = <17>;
+ reg-shift = <2>;
+ reg-io-width = <4>;
+ clocks = <&osc>;
+ status = "disabled";
+ };
+
+ uart5: uart at 01c29400 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c29400 0x400>;
+ interrupts = <18>;
+ reg-shift = <2>;
+ reg-io-width = <4>;
+ clocks = <&osc>;
+ status = "disabled";
+ };
+
+ uart6: uart at 01c29800 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c29800 0x400>;
+ interrupts = <19>;
+ reg-shift = <2>;
+ reg-io-width = <4>;
+ clocks = <&osc>;
+ status = "disabled";
+ };
+
+ uart7: uart at 01c29c00 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c29c00 0x400>;
+ interrupts = <20>;
+ reg-shift = <2>;
+ reg-io-width = <4>;
+ clocks = <&osc>;
+ status = "disabled";
+ };
};
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 6/6] ARM: sunxi: hackberry: Add UART muxing
2013-03-07 22:14 [PATCHv2 0/6] Extend UART support for Allwinner SoCs Maxime Ripard
` (4 preceding siblings ...)
2013-03-07 22:14 ` [PATCH 5/6] ARM: sunxi: dt: Add A10 UARTs to the dtsi Maxime Ripard
@ 2013-03-07 22:14 ` Maxime Ripard
2013-03-08 11:45 ` [PATCHv2 0/6] Extend UART support for Allwinner SoCs Emilio López
6 siblings, 0 replies; 10+ messages in thread
From: Maxime Ripard @ 2013-03-07 22:14 UTC (permalink / raw)
To: linux-arm-kernel
We previously relied on the bootloader to do the muxing of the UART for
the Hackberry. Don't rely on it anymore and use pinctrl.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index f84549a..97703fe 100644
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -24,6 +24,8 @@
soc {
uart0: uart at 01c28000 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
status = "okay";
};
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCHv2 0/6] Extend UART support for Allwinner SoCs
2013-03-07 22:14 [PATCHv2 0/6] Extend UART support for Allwinner SoCs Maxime Ripard
` (5 preceding siblings ...)
2013-03-07 22:14 ` [PATCH 6/6] ARM: sunxi: hackberry: Add UART muxing Maxime Ripard
@ 2013-03-08 11:45 ` Emilio López
6 siblings, 0 replies; 10+ messages in thread
From: Emilio López @ 2013-03-08 11:45 UTC (permalink / raw)
To: linux-arm-kernel
Hi Maxime,
El 07/03/13 19:14, Maxime Ripard escribi?:
> Hi,
>
> This patchset reworks a bit the UART support that is found in the DT
> for Allwinner SoCs, which was quite limited until now.
>
> It first switches to using the clocks property, then rework a bit the
> DTSI to have only the UART available in the A10 and the A13 (the A10
> has 8 UARTs, while A13 has only the uart1 and uart3).
>
> Thanks,
> Maxime
The DT bits look correct to me, so
Acked-by: Emilio L?pez <emilio@elopez.com.ar>
I also tested the series on a Cubieboard (have a look at my followup
patch, "ARM: sunxi: cubieboard: Add UART muxing") and UART0 worked
correctly, so you can also have my
Tested-by: Emilio L?pez <emilio@elopez.com.ar>
for the sun4i parts.
Thanks,
Emilio
^ permalink raw reply [flat|nested] 10+ messages in thread