serial: fsl-imx-uart: Cleanup duplicate device tree binding
Subsystems (5)
PATCH 1/2 serial: fsl-imx-uart: Cleanup duplicate device tree binding
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.
--- .../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
Documentation/devicetree/bindings/serial/fsl-imx-uart.txt deleted +0 -35
@@ -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"; -}; -
Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt +8 -1
@@ -11,9 +11,16 @@ Optional properties: - 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>;
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH 2/2 serial: unify serial bindings into a single dir
Move all bindings in bindings/tty/serial into bindings/serial so we only have one place dir with serial/uart related bindings in it.
---
Note: I did not move msm_serial.txt with the feeling that Stephen will end up removing it in his patch set.
.../devicetree/bindings/serial/arc-uart.txt | 26 ++++++++++++ .../devicetree/bindings/serial/atmel-usart.txt | 43 +++++++++++++++++++ .../devicetree/bindings/serial/efm32-uart.txt | 20 +++++++++ .../devicetree/bindings/serial/fsl-imx-uart.txt | 29 +++++++++++++ .../devicetree/bindings/serial/fsl-lpuart.txt | 14 +++++++ .../devicetree/bindings/serial/fsl-mxs-auart.txt | 37 ++++++++++++++++ .../bindings/serial/nxp-lpc32xx-hsuart.txt | 14 +++++++ .../devicetree/bindings/serial/of-serial.txt | 49 ++++++++++++++++++++++ .../devicetree/bindings/serial/sirf-uart.txt | 33 +++++++++++++++ .../bindings/serial/snps-dw-apb-uart.txt | 25 +++++++++++ .../devicetree/bindings/serial/st-asc.txt | 18 ++++++++ .../devicetree/bindings/serial/via,vt8500-uart.txt | 17 ++++++++ .../devicetree/bindings/tty/serial/arc-uart.txt | 26 ------------ .../devicetree/bindings/tty/serial/atmel-usart.txt | 43 ------------------- .../devicetree/bindings/tty/serial/efm32-uart.txt | 20 --------- .../bindings/tty/serial/fsl-imx-uart.txt | 29 ------------- .../devicetree/bindings/tty/serial/fsl-lpuart.txt | 14 ------- .../bindings/tty/serial/fsl-mxs-auart.txt | 37 ---------------- .../bindings/tty/serial/nxp-lpc32xx-hsuart.txt | 14 ------- .../devicetree/bindings/tty/serial/of-serial.txt | 49 ---------------------- .../devicetree/bindings/tty/serial/sirf-uart.txt | 33 --------------- .../bindings/tty/serial/snps-dw-apb-uart.txt | 25 ----------- .../devicetree/bindings/tty/serial/st-asc.txt | 18 -------- .../bindings/tty/serial/via,vt8500-uart.txt | 17 -------- 24 files changed, 325 insertions(+), 325 deletions(-) create mode 100644 Documentation/devicetree/bindings/serial/arc-uart.txt create mode 100644 Documentation/devicetree/bindings/serial/atmel-usart.txt create mode 100644 Documentation/devicetree/bindings/serial/efm32-uart.txt create mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.txt create mode 100644 Documentation/devicetree/bindings/serial/fsl-lpuart.txt create mode 100644 Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt create mode 100644 Documentation/devicetree/bindings/serial/nxp-lpc32xx-hsuart.txt create mode 100644 Documentation/devicetree/bindings/serial/of-serial.txt create mode 100644 Documentation/devicetree/bindings/serial/sirf-uart.txt create mode 100644 Documentation/devicetree/bindings/serial/snps-dw-apb-uart.txt create mode 100644 Documentation/devicetree/bindings/serial/st-asc.txt create mode 100644 Documentation/devicetree/bindings/serial/via,vt8500-uart.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/arc-uart.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/atmel-usart.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/efm32-uart.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/nxp-lpc32xx-hsuart.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/of-serial.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/sirf-uart.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/snps-dw-apb-uart.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/st-asc.txt delete mode 100644 Documentation/devicetree/bindings/tty/serial/via,vt8500-uart.txt
Documentation/devicetree/bindings/serial/arc-uart.txt new file +26 -0
@@ -0,0 +1,26 @@ +* Synopsys ARC UART : Non standard UART used in some of the ARC FPGA boards + +Required properties: +- compatible : "snps,arc-uart" +- reg : offset and length of the register set for the device. +- interrupts : device interrupt +- clock-frequency : the input clock frequency for the UART +- current-speed : baud rate for UART + +e.g. + +arcuart0: serial@c0fc1000 { + compatible = "snps,arc-uart"; + reg = <0xc0fc1000 0x100>; + interrupts = <5>; + clock-frequency = <80000000>; + current-speed = <115200>; + status = "okay"; +}; + +Note: Each port should have an alias correctly numbered in "aliases" node. + +e.g. +aliases { + serial0 = &arcuart0; +};
Documentation/devicetree/bindings/serial/atmel-usart.txt new file +43 -0
43 lines not on this page · raw message
Documentation/devicetree/bindings/serial/efm32-uart.txt new file +20 -0
@@ -0,0 +1,20 @@ +* Energymicro efm32 UART + +Required properties: +- compatible : Should be "efm32,uart" +- reg : Address and length of the register set +- interrupts : Should contain uart interrupt + +Optional properties: +- location : Decides the location of the USART I/O pins. + Allowed range : [0 .. 5] + Default: 0 + +Example: + +uart@0x4000c400 { + compatible = "efm32,uart"; + reg = <0x4000c400 0x400>; + interrupts = <15>; + location = <0>; +};
Documentation/devicetree/bindings/serial/fsl-imx-uart.txt new file +29 -0
@@ -0,0 +1,29 @@ +* Freescale i.MX Universal Asynchronous Receiver/Transmitter (UART) + +Required properties: +- compatible : Should be "fsl,<soc>-uart" +- reg : Address and length of the register set for the device +- interrupts : Should contain uart interrupt + +Optional properties: +- fsl,uart-has-rtscts : Indicate the uart has rts and cts +- fsl,irda-mode : Indicate the uart supports irda mode +- 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: + +aliases { + serial0 = &uart1; +}; + +uart1: serial@73fbc000 { + compatible = "fsl,imx51-uart", "fsl,imx21-uart"; + reg = <0x73fbc000 0x4000>; + interrupts = <31>; + fsl,uart-has-rtscts; + fsl,dte-mode; +};
Documentation/devicetree/bindings/serial/fsl-lpuart.txt new file +14 -0
@@ -0,0 +1,14 @@ +* Freescale low power universal asynchronous receiver/transmitter (lpuart) + +Required properties: +- compatible : Should be "fsl,<soc>-lpuart" +- reg : Address and length of the register set for the device +- interrupts : Should contain uart interrupt + +Example: + +uart0: serial@40027000 { + compatible = "fsl,vf610-lpuart"; + reg = <0x40027000 0x1000>; + interrupts = <0 61 0x00>; + };
Documentation/devicetree/bindings/serial/fsl-mxs-auart.txt new file +37 -0
@@ -0,0 +1,37 @@ +* Freescale MXS Application UART (AUART) + +Required properties: +- compatible : Should be "fsl,<soc>-auart". The supported SoCs include + imx23 and imx28. +- reg : Address and length of the register set for the device +- interrupts : Should contain the auart interrupt numbers +- dmas: DMA specifier, consisting of a phandle to DMA controller node + and AUART DMA channel ID. + Refer to dma.txt and fsl-mxs-dma.txt for details. +- dma-names: "rx" for RX channel, "tx" for TX channel. + +Optional properties: +- fsl,uart-has-rtscts : Indicate the UART has RTS and CTS lines, + it also means you enable the DMA support for this UART. + +Example: +auart0: serial@8006a000 { + compatible = "fsl,imx28-auart", "fsl,imx23-auart"; + reg = <0x8006a000 0x2000>; + interrupts = <112>; + dmas = <&dma_apbx 8>, <&dma_apbx 9>; + dma-names = "rx", "tx"; +}; + +Note: Each auart port should have an alias correctly numbered in "aliases" +node. + +Example: + +aliases { + serial0 = &auart0; + serial1 = &auart1; + serial2 = &auart2; + serial3 = &auart3; + serial4 = &auart4; +};
Documentation/devicetree/bindings/serial/nxp-lpc32xx-hsuart.txt new file +14 -0
@@ -0,0 +1,14 @@ +* NXP LPC32xx SoC High Speed UART + +Required properties: +- compatible: Should be "nxp,lpc3220-hsuart" +- reg: Should contain registers location and length +- interrupts: Should contain interrupt + +Example: + + uart1: serial@40014000 { + compatible = "nxp,lpc3220-hsuart"; + reg = <0x40014000 0x1000>; + interrupts = <26 0>; + };
Documentation/devicetree/bindings/serial/of-serial.txt new file +49 -0
49 lines not on this page · raw message
Documentation/devicetree/bindings/serial/sirf-uart.txt new file +33 -0
@@ -0,0 +1,33 @@ +* CSR SiRFprimaII/atlasVI Universal Synchronous Asynchronous Receiver/Transmitter * + +Required properties: +- compatible : Should be "sirf,prima2-uart" or "sirf, prima2-usp-uart" +- reg : Offset and length of the register set for the device +- interrupts : Should contain uart interrupt +- fifosize : Should define hardware rx/tx fifo size +- clocks : Should contain uart clock number + +Optional properties: +- sirf,uart-has-rtscts: we have hardware flow controller pins in hardware +- rts-gpios: RTS pin for USP-based UART if sirf,uart-has-rtscts is true +- cts-gpios: CTS pin for USP-based UART if sirf,uart-has-rtscts is true + +Example: + +uart0: uart@b0050000 { + cell-index = <0>; + compatible = "sirf,prima2-uart"; + reg = <0xb0050000 0x1000>; + interrupts = <17>; + fifosize = <128>; + clocks = <&clks 13>; +}; + +On the board-specific dts, we can put rts-gpios and cts-gpios like + +usp@b0090000 { + compatible = "sirf,prima2-usp-uart"; + sirf,uart-has-rtscts; + rts-gpios = <&gpio 15 0>; + cts-gpios = <&gpio 46 0>; +};
Documentation/devicetree/bindings/serial/snps-dw-apb-uart.txt new file +25 -0
@@ -0,0 +1,25 @@ +* Synopsys DesignWare ABP UART + +Required properties: +- compatible : "snps,dw-apb-uart" +- reg : offset and length of the register set for the device. +- interrupts : should contain uart interrupt. +- clock-frequency : the input clock frequency for the UART. + +Optional properties: +- reg-shift : quantity to shift the register offsets by. If this property is + not present then the register offsets are not shifted. +- reg-io-width : the size (in bytes) of the IO accesses that should be + performed on the device. If this property is not present then single byte + accesses are used. + +Example: + + uart@80230000 { + compatible = "snps,dw-apb-uart"; + reg = <0x80230000 0x100>; + clock-frequency = <3686400>; + interrupts = <10>; + reg-shift = <2>; + reg-io-width = <4>; + };
Documentation/devicetree/bindings/serial/st-asc.txt new file +18 -0
@@ -0,0 +1,18 @@ +*st-asc(Serial Port) + +Required properties: +- compatible : Should be "st,asc". +- reg, reg-names, interrupts, interrupt-names : Standard way to define device + resources with names. look in + Documentation/devicetree/bindings/resource-names.txt + +Optional properties: +- st,hw-flow-ctrl bool flag to enable hardware flow control. +- st,force-m1 bool flat to force asc to be in Mode-1 recommeded + for high bit rates (above 19.2K) +Example: +serial@fe440000{ + compatible = "st,asc"; + reg = <0xfe440000 0x2c>; + interrupts = <0 209 0>; +};
Documentation/devicetree/bindings/serial/via,vt8500-uart.txt new file +17 -0
@@ -0,0 +1,17 @@ +VIA/Wondermedia VT8500 UART Controller +----------------------------------------------------- + +Required properties: +- compatible : "via,vt8500-uart" +- reg : Should contain 1 register ranges(address and length) +- interrupts : UART interrupt +- clocks : phandle to the uart source clock (usually a 24Mhz fixed clock) + +Example: + + uart@d8210000 { + compatible = "via,vt8500-uart"; + reg = <0xd8210000 0x1040>; + interrupts = <47>; + clocks = <&ref24>; + };
Documentation/devicetree/bindings/tty/serial/arc-uart.txt deleted +0 -26
@@ -1,26 +0,0 @@ -* Synopsys ARC UART : Non standard UART used in some of the ARC FPGA boards - -Required properties: -- compatible : "snps,arc-uart" -- reg : offset and length of the register set for the device. -- interrupts : device interrupt -- clock-frequency : the input clock frequency for the UART -- current-speed : baud rate for UART - -e.g. - -arcuart0: serial@c0fc1000 { - compatible = "snps,arc-uart"; - reg = <0xc0fc1000 0x100>; - interrupts = <5>; - clock-frequency = <80000000>; - current-speed = <115200>; - status = "okay"; -}; - -Note: Each port should have an alias correctly numbered in "aliases" node. - -e.g. -aliases { - serial0 = &arcuart0; -};
Documentation/devicetree/bindings/tty/serial/atmel-usart.txt deleted +0 -43
43 lines not on this page · raw message
Documentation/devicetree/bindings/tty/serial/efm32-uart.txt deleted +0 -20
@@ -1,20 +0,0 @@ -* Energymicro efm32 UART - -Required properties: -- compatible : Should be "efm32,uart" -- reg : Address and length of the register set -- interrupts : Should contain uart interrupt - -Optional properties: -- location : Decides the location of the USART I/O pins. - Allowed range : [0 .. 5] - Default: 0 - -Example: - -uart@0x4000c400 { - compatible = "efm32,uart"; - reg = <0x4000c400 0x400>; - interrupts = <15>; - location = <0>; -};
Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt deleted +0 -29
@@ -1,29 +0,0 @@ -* Freescale i.MX Universal Asynchronous Receiver/Transmitter (UART) - -Required properties: -- compatible : Should be "fsl,<soc>-uart" -- reg : Address and length of the register set for the device -- interrupts : Should contain uart interrupt - -Optional properties: -- fsl,uart-has-rtscts : Indicate the uart has rts and cts -- fsl,irda-mode : Indicate the uart supports irda mode -- 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: - -aliases { - serial0 = &uart1; -}; - -uart1: serial@73fbc000 { - compatible = "fsl,imx51-uart", "fsl,imx21-uart"; - reg = <0x73fbc000 0x4000>; - interrupts = <31>; - fsl,uart-has-rtscts; - fsl,dte-mode; -};
Documentation/devicetree/bindings/tty/serial/fsl-lpuart.txt deleted +0 -14
@@ -1,14 +0,0 @@ -* Freescale low power universal asynchronous receiver/transmitter (lpuart) - -Required properties: -- compatible : Should be "fsl,<soc>-lpuart" -- reg : Address and length of the register set for the device -- interrupts : Should contain uart interrupt - -Example: - -uart0: serial@40027000 { - compatible = "fsl,vf610-lpuart"; - reg = <0x40027000 0x1000>; - interrupts = <0 61 0x00>; - };
Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt deleted +0 -37
@@ -1,37 +0,0 @@ -* Freescale MXS Application UART (AUART) - -Required properties: -- compatible : Should be "fsl,<soc>-auart". The supported SoCs include - imx23 and imx28. -- reg : Address and length of the register set for the device -- interrupts : Should contain the auart interrupt numbers -- dmas: DMA specifier, consisting of a phandle to DMA controller node - and AUART DMA channel ID. - Refer to dma.txt and fsl-mxs-dma.txt for details. -- dma-names: "rx" for RX channel, "tx" for TX channel. - -Optional properties: -- fsl,uart-has-rtscts : Indicate the UART has RTS and CTS lines, - it also means you enable the DMA support for this UART. - -Example: -auart0: serial@8006a000 { - compatible = "fsl,imx28-auart", "fsl,imx23-auart"; - reg = <0x8006a000 0x2000>; - interrupts = <112>; - dmas = <&dma_apbx 8>, <&dma_apbx 9>; - dma-names = "rx", "tx"; -}; - -Note: Each auart port should have an alias correctly numbered in "aliases" -node. - -Example: - -aliases { - serial0 = &auart0; - serial1 = &auart1; - serial2 = &auart2; - serial3 = &auart3; - serial4 = &auart4; -};
Documentation/devicetree/bindings/tty/serial/nxp-lpc32xx-hsuart.txt deleted +0 -14
@@ -1,14 +0,0 @@ -* NXP LPC32xx SoC High Speed UART - -Required properties: -- compatible: Should be "nxp,lpc3220-hsuart" -- reg: Should contain registers location and length -- interrupts: Should contain interrupt - -Example: - - uart1: serial@40014000 { - compatible = "nxp,lpc3220-hsuart"; - reg = <0x40014000 0x1000>; - interrupts = <26 0>; - };
Documentation/devicetree/bindings/tty/serial/of-serial.txt deleted +0 -49
49 lines not on this page · raw message
Documentation/devicetree/bindings/tty/serial/sirf-uart.txt deleted +0 -33
@@ -1,33 +0,0 @@ -* CSR SiRFprimaII/atlasVI Universal Synchronous Asynchronous Receiver/Transmitter * - -Required properties: -- compatible : Should be "sirf,prima2-uart" or "sirf, prima2-usp-uart" -- reg : Offset and length of the register set for the device -- interrupts : Should contain uart interrupt -- fifosize : Should define hardware rx/tx fifo size -- clocks : Should contain uart clock number - -Optional properties: -- sirf,uart-has-rtscts: we have hardware flow controller pins in hardware -- rts-gpios: RTS pin for USP-based UART if sirf,uart-has-rtscts is true -- cts-gpios: CTS pin for USP-based UART if sirf,uart-has-rtscts is true - -Example: - -uart0: uart@b0050000 { - cell-index = <0>; - compatible = "sirf,prima2-uart"; - reg = <0xb0050000 0x1000>; - interrupts = <17>; - fifosize = <128>; - clocks = <&clks 13>; -}; - -On the board-specific dts, we can put rts-gpios and cts-gpios like - -usp@b0090000 { - compatible = "sirf,prima2-usp-uart"; - sirf,uart-has-rtscts; - rts-gpios = <&gpio 15 0>; - cts-gpios = <&gpio 46 0>; -};
Documentation/devicetree/bindings/tty/serial/snps-dw-apb-uart.txt deleted +0 -25
@@ -1,25 +0,0 @@ -* Synopsys DesignWare ABP UART - -Required properties: -- compatible : "snps,dw-apb-uart" -- reg : offset and length of the register set for the device. -- interrupts : should contain uart interrupt. -- clock-frequency : the input clock frequency for the UART. - -Optional properties: -- reg-shift : quantity to shift the register offsets by. If this property is - not present then the register offsets are not shifted. -- reg-io-width : the size (in bytes) of the IO accesses that should be - performed on the device. If this property is not present then single byte - accesses are used. - -Example: - - uart@80230000 { - compatible = "snps,dw-apb-uart"; - reg = <0x80230000 0x100>; - clock-frequency = <3686400>; - interrupts = <10>; - reg-shift = <2>; - reg-io-width = <4>; - };
Documentation/devicetree/bindings/tty/serial/st-asc.txt deleted +0 -18
@@ -1,18 +0,0 @@ -*st-asc(Serial Port) - -Required properties: -- compatible : Should be "st,asc". -- reg, reg-names, interrupts, interrupt-names : Standard way to define device - resources with names. look in - Documentation/devicetree/bindings/resource-names.txt - -Optional properties: -- st,hw-flow-ctrl bool flag to enable hardware flow control. -- st,force-m1 bool flat to force asc to be in Mode-1 recommeded - for high bit rates (above 19.2K) -Example: -serial@fe440000{ - compatible = "st,asc"; - reg = <0xfe440000 0x2c>; - interrupts = <0 209 0>; -};
Documentation/devicetree/bindings/tty/serial/via,vt8500-uart.txt deleted +0 -17
@@ -1,17 +0,0 @@ -VIA/Wondermedia VT8500 UART Controller ------------------------------------------------------ - -Required properties: -- compatible : "via,vt8500-uart" -- reg : Should contain 1 register ranges(address and length) -- interrupts : UART interrupt -- clocks : phandle to the uart source clock (usually a 24Mhz fixed clock) - -Example: - - uart@d8210000 { - compatible = "via,vt8500-uart"; - reg = <0xd8210000 0x1040>; - interrupts = <47>; - clocks = <&ref24>; - };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 6 lines · Kumar Gala
We had two bindings for the same serial device, it looks like the one in
tty/serial/fsl-imx-uart.txtis the more up to date one so go with it and merge a few things about the use/need for aliases in fromserial/fsl-imx-uart.txt.Signed-off-by Kumar Gala <[email protected]>
Quoted 4 lines · Kumar Gala
We had two bindings for the same serial device, it looks like the one in
tty/serial/fsl-imx-uart.txtis the more up to date one so go with it and merge a few things about the use/need for aliases in fromserial/fsl-imx-uart.txt.
Oh my, that's a mess.
Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt Optional properties:
Quoted 54 lines
Signed-off-by Kumar Gala <[email protected]>--- .../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.txtDocumentation/devicetree/bindings/serial/fsl-imx-uart.txt deleted +0
-35@@ -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"; -}; -Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt +0
-0@@ -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:
Cheers,
Mark.
Quoted 22 lines
Documentation/devicetree/bindings/tty/serial/fsl-imx-uart.txt +8
-1- 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>;Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation