On Wed, Aug 28, 2013 at 08:08:22PM +0100, Kumar Gala wrote:
> We had two bindings for the same serial device, it looks like the one in
> tty/serial/fsl-imx-uart.txt is the more up to date one so go with it and
> merge a few things about the use/need for aliases in from
> serial/fsl-imx-uart.txt.
Oh my, that's a mess.
>
> Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxx>
> ---
> .../devicetree/bindings/serial/fsl-imx-uart.txt | 35 ----------------------
> .../bindings/tty/serial/fsl-imx-uart.txt | 9 +++++-
> 2 files changed, 8 insertions(+), 36 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
>
> diff --git a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
> deleted file mode 100644
> index c58573b..0000000
> --- a/Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -* Freescale i.MX UART controller
> -
> -Required properties:
> -- compatible : should be "fsl,imx21-uart"
> -- reg : Address and length of the register set for the device
> -- interrupts : Should contain UART interrupt number
> -
> -Optional properties:
> -- fsl,uart-has-rtscts: indicate that RTS/CTS signals are used
> -
> -Note: Each uart controller should have an alias correctly numbered
> -in "aliases" node.
> -
> -Example:
> -
> -- From imx51.dtsi:
> -aliases {
> - serial0 = &uart1;
> - serial1 = &uart2;
> - serial2 = &uart3;
> -};
> -
> -uart1: serial@73fbc000 {
> - compatible = "fsl,imx51-uart", "fsl,imx21-uart";
> - reg = <0x73fbc000 0x4000>;
> - interrupts = <31>;
> - status = "disabled";
> -}
> -
> -- From imx51-babbage.dts:
> -uart1: serial@73fbc000 {
> - fsl,uart-has-rtscts;
> - status = "okay";
> -};
> -
> diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
> index c662eb3..35ae1fb 100644
> --- a/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
> +++ b/Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt
> @@ -11,9 +11,16 @@ Optional properties:
I note this binding doesn't actually define the set of compatible
strings, as it has:
Compatible : Should be "fsl,<soc>-uart"
... the other binding had:
compatible : should be "fsl,imx21-uart"
.. and the driver accepts "fsl,imx21-uart" and "fsl,imx1-uart".
Would it be possible to clarify this at the same time, something like:
Compatible : Should contain one of:
* "fsl,imx21-uart" for UARTs compatible with that in
i.MX21 SoCs.
* "fsl,imx1-uart" for UARTs compatible with that in
i.MX1x SoCs·.
Otherwise, this seems sensible. With something like the above:
Acked-by: Mark Rutland <mark.rutland@xxxxxxx>
Cheers,
Mark.
> - fsl,dte-mode : Indicate the uart works in DTE mode. The uart works
> is DCE mode by default.
>
> +Note: Each uart controller should have an alias correctly numbered
> +in "aliases" node.
> +
> Example:
>
> -serial@73fbc000 {
> +aliases {
> + serial0 = &uart1;
> +};
> +
> +uart1: serial@73fbc000 {
> compatible = "fsl,imx51-uart", "fsl,imx21-uart";
> reg = <0x73fbc000 0x4000>;
> interrupts = <31>;
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> hosted by The Linux Foundation
>
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
