[v2] ARM: dt: fix up PL011 device tree bindings

Message ID 1399887437-32154-1-git-send-email-linus.walleij@linaro.org
State New
Headers show

Commit Message

Linus Walleij May 12, 2014, 9:37 a.m.
Make the map match the reality, the current binding text is
nonsense:

- The clock required for the clocking of the serial port
  must come first and is not optional (as the driver will
  otherwise proceed to grab and use the apb_pclk as uartclk),
  and the apb_pclk that clocks the logic must come second
  as the code will retrieve the first clock by index,
  whereas the PrimeCell but will explicitly look for
  "apb_pclk" so this can be specified later, as it is
  looked up by name.

- The pin control state "default" is the only mandated
  state, the sleep state is entirely optional.

We also add an example to avoid further confusion.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v1->v2:
- Rename amba_pclk to apb_pclk
- Split clock/clocks properties and indicate that listin one
  clock only is deprecated
---
 Documentation/devicetree/bindings/serial/pl011.txt | 28 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

Comments

Mark Rutland May 12, 2014, 10:48 a.m. | #1
Hi Linus,

On Mon, May 12, 2014 at 10:37:17AM +0100, Linus Walleij wrote:
> Make the map match the reality, the current binding text is
> nonsense:
> 
> - The clock required for the clocking of the serial port
>   must come first and is not optional (as the driver will
>   otherwise proceed to grab and use the apb_pclk as uartclk),
>   and the apb_pclk that clocks the logic must come second
>   as the code will retrieve the first clock by index,
>   whereas the PrimeCell but will explicitly look for
>   "apb_pclk" so this can be specified later, as it is
>   looked up by name.

This is a problem with basically all the primecell bindings. I posted a
series a while ago [1,2], but got a bit sidetracked and didn't manage to
follow it up. Sorry about that.

> - The pin control state "default" is the only mandated
>   state, the sleep state is entirely optional.
> 
> We also add an example to avoid further confusion.
> 
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ChangeLog v1->v2:
> - Rename amba_pclk to apb_pclk
> - Split clock/clocks properties and indicate that listin one
>   clock only is deprecated
> ---
>  Documentation/devicetree/bindings/serial/pl011.txt | 28 +++++++++++++++++++---
>  1 file changed, 25 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/serial/pl011.txt b/Documentation/devicetree/bindings/serial/pl011.txt
> index 5d2e840ae65c..52464918cfe2 100644
> --- a/Documentation/devicetree/bindings/serial/pl011.txt
> +++ b/Documentation/devicetree/bindings/serial/pl011.txt
> @@ -6,12 +6,34 @@ Required properties:
>  - interrupts: exactly one interrupt specifier
>  
>  Optional properties:
> -- pinctrl: When present, must have one state named "sleep"
> -	   and one state named "default"
> -- clocks:  When present, must refer to exactly one clock named
> +- pinctrl: When present, must have one state named "default",
> +	   and may contain a second name named "sleep". The former
> +	   state sets up pins for ordinary operation whereas
> +	   the latter state will put the associated pins to sleep
> +	   when the UART is unused
> +- clocks:  When present, the first clock listed must correspond to
> +	   the clock named UARTCLK on the IP block, i.e. the clock
> +	   to the external serial line, whereas the second clock
> +	   must correspond to the PCLK clocking the internal logic
> +	   of the block. Just listing one clock (the first one) is
> +	   deprecated.
> +- clocks-names: When present, the first clock listed must be named
> +	   "uartclk" and the second clock listed must be named
>  	   "apb_pclk"

This looks good to me, though I'd prefer to have the binding define the
sane case (both clocks are required and should be acquired by name), and
leave the awkward compatibility mechanism as a kernel implementation
detail if possible.

Would you be happy with the pl011 clock portions from my original
series?

Otherwise, this looks good to me.

Cheers,
Mark.

[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-February/231572.html
[2] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-February/231573.html
Linus Walleij Sept. 8, 2014, 11:31 a.m. | #2
On Mon, May 12, 2014 at 11:37 AM, Linus Walleij
<linus.walleij@linaro.org> wrote:

> Make the map match the reality, the current binding text is
> nonsense:
>
> - The clock required for the clocking of the serial port
>   must come first and is not optional (as the driver will
>   otherwise proceed to grab and use the apb_pclk as uartclk),
>   and the apb_pclk that clocks the logic must come second
>   as the code will retrieve the first clock by index,
>   whereas the PrimeCell but will explicitly look for
>   "apb_pclk" so this can be specified later, as it is
>   looked up by name.
>
> - The pin control state "default" is the only mandated
>   state, the sleep state is entirely optional.
>
> We also add an example to avoid further confusion.
>
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ChangeLog v1->v2:
> - Rename amba_pclk to apb_pclk
> - Split clock/clocks properties and indicate that listin one
>   clock only is deprecated

I don't see either this or Mark's related patch being applied and the DT
binding for PL011 left in a sad state. Can we please apply this?

Yours,
Linus Walleij
Linus Walleij Nov. 27, 2014, 1:40 p.m. | #3
On Mon, May 12, 2014 at 11:37 AM, Linus Walleij
<linus.walleij@linaro.org> wrote:

> Make the map match the reality, the current binding text is
> nonsense:
>
> - The clock required for the clocking of the serial port
>   must come first and is not optional (as the driver will
>   otherwise proceed to grab and use the apb_pclk as uartclk),
>   and the apb_pclk that clocks the logic must come second
>   as the code will retrieve the first clock by index,
>   whereas the PrimeCell but will explicitly look for
>   "apb_pclk" so this can be specified later, as it is
>   looked up by name.
>
> - The pin control state "default" is the only mandated
>   state, the sleep state is entirely optional.
>
> We also add an example to avoid further confusion.
>
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ChangeLog v1->v2:
> - Rename amba_pclk to apb_pclk
> - Split clock/clocks properties and indicate that listin one
>   clock only is deprecated

PING on this, 6 months and the bindings still look like hell.

Greg can you pick this up through the serial tree?

I can resend the patch if you don't have it...

Yours,
Linus Walleij
Grant Likely Nov. 27, 2014, 2 p.m. | #4
On Thu, Nov 27, 2014 at 1:40 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Mon, May 12, 2014 at 11:37 AM, Linus Walleij
> <linus.walleij@linaro.org> wrote:
>
>> Make the map match the reality, the current binding text is
>> nonsense:
>>
>> - The clock required for the clocking of the serial port
>>   must come first and is not optional (as the driver will
>>   otherwise proceed to grab and use the apb_pclk as uartclk),
>>   and the apb_pclk that clocks the logic must come second
>>   as the code will retrieve the first clock by index,
>>   whereas the PrimeCell but will explicitly look for
>>   "apb_pclk" so this can be specified later, as it is
>>   looked up by name.
>>
>> - The pin control state "default" is the only mandated
>>   state, the sleep state is entirely optional.
>>
>> We also add an example to avoid further confusion.
>>
>> Reported-by: Arnd Bergmann <arnd@arndb.de>
>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>> ---
>> ChangeLog v1->v2:
>> - Rename amba_pclk to apb_pclk
>> - Split clock/clocks properties and indicate that listin one
>>   clock only is deprecated
>
> PING on this, 6 months and the bindings still look like hell.
>
> Greg can you pick this up through the serial tree?
>
> I can resend the patch if you don't have it...

Ugh, sorry. I'll merge it in my tree right now.

g.

>
> Yours,
> Linus Walleij

Patch

diff --git a/Documentation/devicetree/bindings/serial/pl011.txt b/Documentation/devicetree/bindings/serial/pl011.txt
index 5d2e840ae65c..52464918cfe2 100644
--- a/Documentation/devicetree/bindings/serial/pl011.txt
+++ b/Documentation/devicetree/bindings/serial/pl011.txt
@@ -6,12 +6,34 @@  Required properties:
 - interrupts: exactly one interrupt specifier
 
 Optional properties:
-- pinctrl: When present, must have one state named "sleep"
-	   and one state named "default"
-- clocks:  When present, must refer to exactly one clock named
+- pinctrl: When present, must have one state named "default",
+	   and may contain a second name named "sleep". The former
+	   state sets up pins for ordinary operation whereas
+	   the latter state will put the associated pins to sleep
+	   when the UART is unused
+- clocks:  When present, the first clock listed must correspond to
+	   the clock named UARTCLK on the IP block, i.e. the clock
+	   to the external serial line, whereas the second clock
+	   must correspond to the PCLK clocking the internal logic
+	   of the block. Just listing one clock (the first one) is
+	   deprecated.
+- clocks-names: When present, the first clock listed must be named
+	   "uartclk" and the second clock listed must be named
 	   "apb_pclk"
 - dmas:	   When present, may have one or two dma channels.
 	   The first one must be named "rx", the second one
 	   must be named "tx".
 
 See also bindings/arm/primecell.txt
+
+Example:
+
+uart@80120000 {
+	compatible = "arm,pl011", "arm,primecell";
+	reg = <0x80120000 0x1000>;
+	interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
+	dmas = <&dma 13 0 0x2>, <&dma 13 0 0x0>;
+	dma-names = "rx", "tx";
+	clocks = <&foo_clk>, <&bar_clk>;
+	clock-names = "uartclk", "apb_pclk";
+};