Add IC, SI and SIRAM document of QE to
Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
Acked-by: Rob Herring <robh@kernel.org>
---
changes for v2
- Add interrupt-controller in Required properties
- delete address-cells and size-cells for qe-si and qe-siram
Changes for v3
- Add SoC specific caompatible strings to qe-si and qe-siram
Changes for v4
- NA
Changes for v5
- NA
.../devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt | 50 ++++++++++++++++++++++
1 file changed, 50 insertions(+)
@@ -69,6 +69,56 @@ Example: }; };+* Interrupt Controller (IC)++Required properties:+- compatible : should be "fsl,qe-ic".+- reg : Address range of IC register set.+- interrupts : interrupts generated by the device.+- interrupt-controller : this device is a interrupt controller.++Example:++ qeic: interrupt-controller@80 {+ interrupt-controller;+ compatible = "fsl,qe-ic";+ #address-cells = <0>;+ #interrupt-cells = <1>;+ reg = <0x80 0x80>;+ interrupts = <95 2 0 0 94 2 0 0>; //high:79 low:78+ };++* Serial Interface Block (SI)++The SI manages the routing of eight TDM lines to the QE block serial drivers+, the MCC and the UCCs, for receive and transmit.++Required properties:+- compatible : should be "fsl,t1040-qe-si".+- reg : Address range of SI register set.++Example:++ si1: si@700 {+ compatible = "fsl,t1040-qe-si";+ reg = <0x700 0x80>;+ };++* Serial Interface Block RAM(SIRAM)++store the routing entries of SI++Required properties:+- compatible : should be "fsl,t1040-qe-siram".+- reg : Address range of SI RAM.++Example:++ siram1: siram@1000 {+ compatible = "fsl,t1040-qe-siram";+ reg = <0x1000 0x800>;+ };+ * QE Firmware Node This node defines a firmware binary that is embedded in the device tree, for
@@ -0,0 +1,18 @@+* Serial++Currently defined compatibles:+- fsl,t1040-ucc-uart++Properties for fsl,t1040-ucc-uart:+port-number : port number of UCC-UART+tx/rx-clock-name : should be "brg1"-"brg16" for internal clock source,+ should be "clk1"-"clk28" for external clock source.++Example:++ ucc_serial: ucc@2200 {+ compatible = "fsl,t1040-ucc-uart";+ port-number = <0>;+ rx-clock-name = "brg2";+ tx-clock-name = "brg2";+ };
add qe node to t104xrdb.dtsi
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
---
Changes for v2
- rebase
Changes for v3
- rebase
Changes for v4
- rebase
Changes for v5
- rebase
arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 38 +++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
Add ucc hdlc document to
Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
Acked-by: Rob Herring <robh@kernel.org>
---
Changes for v2
- use ucc-hdlc instead of ucc_hdlc
- add more information to properties.
Changes for v3
- use fsl,tx-timeslot-mask instead of fsl,tx-timeslot
- use fsl,rx-timeslot-mask instead of fsl,rx-timeslot
- add more info
Changes for v4
- NA
Changes for v5
- NA
.../bindings/powerpc/fsl/cpm_qe/network.txt | 81 ++++++++++++++++++++++
1 file changed, 81 insertions(+)
@@ -41,3 +41,84 @@ Example: fsl,mdio-pin = <12>; fsl,mdc-pin = <13>; };++* HDLC++Currently defined compatibles:+- fsl,ucc-hdlc++Properties for fsl,ucc-hdlc:+- rx-clock-name+- tx-clock-name+ Usage: required+ Value type: <string>+ Definition : Must be "brg1"-"brg16" for internal clock source,+ Must be "clk1"-"clk24" for external clock source.++- fsl,tdm-interface+ Usage: optional+ Value type: <empty>+ Definition : Specify that hdlc is based on tdm-interface++The property below is dependent on fsl,tdm-interface:+- fsl,rx-sync-clock+ Usage: required+ Value type: <string>+ Definition : Must be "none", "rsync_pin", "brg9-11" and "brg13-15".++- fsl,tx-sync-clock+ Usage: required+ Value type: <string>+ Definition : Must be "none", "tsync_pin", "brg9-11" and "brg13-15".++- fsl,tdm-framer-type+ Usage: required for tdm interface+ Value type: <string>+ Definition : "e1" or "t1".Now e1 and t1 are used, other framer types+ are not supported.++- fsl,tdm-id+ Usage: required for tdm interface+ Value type: <u32>+ Definition : number of TDM ID++- fsl,tx-timeslot-mask+- fsl,rx-timeslot-mask+ Usage: required for tdm interface+ Value type: <u32>+ Definition : time slot mask for TDM operation. Indicates which time+ slots used for transmitting and receiving.++- fsl,siram-entry-id+ Usage: required for tdm interface+ Value type: <u32>+ Definition : Must be 0,2,4...64. the number of TDM entry.++- fsl,tdm-internal-loopback+ usage: optional for tdm interface+ value type: <empty>+ Definition : Internal loopback connecting on TDM layer.++Example for tdm interface:++ ucc@2000 {+ compatible = "fsl,ucc-hdlc";+ rx-clock-name = "clk8";+ tx-clock-name = "clk9";+ fsl,rx-sync-clock = "rsync_pin";+ fsl,tx-sync-clock = "tsync_pin";+ fsl,tx-timeslot-mask = <0xfffffffe>;+ fsl,rx-timeslot-mask = <0xfffffffe>;+ fsl,tdm-framer-type = "e1";+ fsl,tdm-id = <0>;+ fsl,siram-entry-id = <0>;+ fsl,tdm-interface;+ };++Example for hdlc without tdm interface:++ ucc@2000 {+ compatible = "fsl,ucc-hdlc";+ rx-clock-name = "brg1";+ tx-clock-name = "brg1";+ };
add qe node to t104xd4rdb.dtsi and t1040si-post.dtsi.
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
---
Changes for v2
- rebase
Changes for v3
- rebase
Changes for v4
- rebase
Changes for v5
- rebase
arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 45 +++++++++++++++++++++++++++++
arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi | 38 ++++++++++++++++++++++++
2 files changed, 83 insertions(+)
cpm_qe is supported on both powerpc and arm.
and the QE code has been moved from arch/powerpc into
drivers/soc/fsl, so move cpm_qe binding from powerpc/fsl
to soc/fsl
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
Acked-by: Rob Herring<robh@kernel.org>
---
Changes for v3
- NA
Changes for v4
- NA
Changes for v5
- NA
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm.txt | 0
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/brg.txt | 0
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/i2c.txt | 0
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/pic.txt | 0
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/usb.txt | 0
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/gpio.txt | 0
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/network.txt | 0
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe.txt | 0
.../devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/firmware.txt | 0
.../devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/par_io.txt | 0
.../devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/pincfg.txt | 0
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/ucc.txt | 0
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/usb.txt | 0
Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/serial.txt | 0
.../devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/uqe_serial.txt | 0
15 files changed, 0 insertions(+), 0 deletions(-)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/brg.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/i2c.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/pic.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/cpm/usb.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/gpio.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/network.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/firmware.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/par_io.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/pincfg.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/ucc.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/qe/usb.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/serial.txt (100%)
rename Documentation/devicetree/bindings/{powerpc => soc}/fsl/cpm_qe/uqe_serial.txt (100%)
diff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/brg.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/brg.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/brg.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/brg.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/i2c.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/i2c.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/i2c.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/i2c.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/pic.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/pic.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/pic.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/pic.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/usb.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/usb.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/cpm/usb.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/cpm/usb.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/gpio.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/gpio.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/gpio.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/gpio.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/network.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/network.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/firmware.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/firmware.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/firmware.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/firmware.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/par_io.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/par_io.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/par_io.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/par_io.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/pincfg.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/pincfg.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/pincfg.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/pincfg.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/ucc.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/ucc.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/ucc.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/ucc.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/usb.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/usb.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe/usb.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/qe/usb.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/serial.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/serial.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/serial.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/serial.txtdiff --git a/Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/uqe_serial.txt b/Documentation/devicetree/bindings/soc/fsl/cpm_qe/uqe_serial.txtsimilarity index 100%rename from Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/uqe_serial.txtrename to Documentation/devicetree/bindings/soc/fsl/cpm_qe/uqe_serial.txt
--
2.1.0.27.g96db324
add qe node to t104xqds.dtsi
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
---
Changes for v2
- rebase
Changes for v3
- rebase
Changes for v4
- rebase
Changes for v5
- rebase
arch/powerpc/boot/dts/fsl/t104xqds.dtsi | 38 +++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
On Fri, Mar 18, 2016 at 12:28AM, Rob Herring wrote:
-----Original Message-----
From: Rob Herring [mailto:robh@kernel.org]
Sent: Friday, March 18, 2016 12:28 AM
To: Qiang Zhao <qiang.zhao@nxp.com>
Cc: oss@buserror.net; Yang-Leo Li <redacted>; Xiaobo Xie
[off-list ref]; linux-kernel@vger.kernel.org;
devicetree@vger.kernel.org; linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH v5 3/7] QE: Add uqe_serial document to bindings
=20
On Wed, Mar 09, 2016 at 09:21:30AM +0800, Zhao Qiang wrote:
quoted
Add uqe_serial document to
Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/uqe_serial.txt
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
---
Changes for v2
- modify tx/rx-clock-name specification Changes for v3
- NA
Changes for v4
- drop device_type
- modify to SoC specific compatible
Changes for v5
- add fsl to compatible as prefix
.../bindings/powerpc/fsl/cpm_qe/uqe_serial.txt | 18
From: Scott Wood <oss@buserror.net> Date: 2016-05-16 23:22:18
On Wed, Mar 09, 2016 at 09:21:28AM +0800, Zhao Qiang wrote:
quoted hunk
Add IC, SI and SIRAM document of QE to
Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
Acked-by: Rob Herring <robh@kernel.org>
---
changes for v2
- Add interrupt-controller in Required properties
- delete address-cells and size-cells for qe-si and qe-siram
Changes for v3
- Add SoC specific caompatible strings to qe-si and qe-siram
Changes for v4
- NA
Changes for v5
- NA
.../devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt | 50 ++++++++++++++++++++++
1 file changed, 50 insertions(+)
@@ -69,6 +69,56 @@ Example: }; };+* Interrupt Controller (IC)++Required properties:+- compatible : should be "fsl,qe-ic".+- reg : Address range of IC register set.+- interrupts : interrupts generated by the device.+- interrupt-controller : this device is a interrupt controller.++Example:++ qeic: interrupt-controller@80 {+ interrupt-controller;+ compatible = "fsl,qe-ic";+ #address-cells = <0>;+ #interrupt-cells = <1>;+ reg = <0x80 0x80>;+ interrupts = <95 2 0 0 94 2 0 0>; //high:79 low:78+ };
Why is the information about which interrupt is "high" and which is
"low" in a comment in the example, rather than in the definition of the
interrupts property?
+* Serial Interface Block (SI)
+
+The SI manages the routing of eight TDM lines to the QE block serial drivers
+, the MCC and the UCCs, for receive and transmit.
+
+Required properties:
+- compatible : should be "fsl,t1040-qe-si".
+- reg : Address range of SI register set.
Is t1040 the only chip that has or will ever have this?
-Scott
On Tue, May 17, 2016 at 07:22AM, Scott Wood wrote:
-----Original Message-----
From: Scott Wood [mailto:oss@buserror.net]
Sent: Tuesday, May 17, 2016 7:22 AM
To: Qiang Zhao <qiang.zhao@nxp.com>
Cc: robh+dt@kernel.org; devicetree@vger.kernel.org; linux-
kernel@vger.kernel.org; Xiaobo Xie [off-list ref]; Yang-Leo Li
[off-list ref]; linuxppc-dev@lists.ozlabs.org
Subject: Re: [v5,1/7] QE: Add IC, SI and SIRAM document to device tree
bindings.
=20
On Wed, Mar 09, 2016 at 09:21:28AM +0800, Zhao Qiang wrote:
quoted
Add IC, SI and SIRAM document of QE to
Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
Acked-by: Rob Herring <robh@kernel.org>
---
changes for v2
- Add interrupt-controller in Required properties
- delete address-cells and size-cells for qe-si and qe-siram Changes
for v3
- Add SoC specific caompatible strings to qe-si and qe-siram Changes
for v4
- NA
Changes for v5
- NA
.../devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt | 50
++++++++++++++++++++++
1 file changed, 50 insertions(+)
+* Serial Interface Block (SI)
+
+The SI manages the routing of eight TDM lines to the QE block serial
+drivers , the MCC and the UCCs, for receive and transmit.
+
+Required properties:
+- compatible : should be "fsl,t1040-qe-si".
+- reg : Address range of SI register set.
=20
Is t1040 the only chip that has or will ever have this?
There also be t1024 and ls1043 supporting si.
I thought to add them when adding their device node.
If you think it is better to add them now, I will modify.
-Zhao Qiang
From: Scott Wood <oss@buserror.net> Date: 2016-05-17 01:42:05
On Tue, 2016-05-17 at 01:18 +0000, Qiang Zhao wrote:
On Tue, May 17, 2016 at 07:22AM, Scott Wood wrote:
quoted
-----Original Message-----
From: Scott Wood [mailto:oss@buserror.net]
Sent: Tuesday, May 17, 2016 7:22 AM
To: Qiang Zhao <qiang.zhao@nxp.com>
Cc: robh+dt@kernel.org; devicetree@vger.kernel.org; linux-
kernel@vger.kernel.org; Xiaobo Xie [off-list ref]; Yang-Leo Li
[off-list ref]; linuxppc-dev@lists.ozlabs.org
Subject: Re: [v5,1/7] QE: Add IC, SI and SIRAM document to device tree
bindings.
On Wed, Mar 09, 2016 at 09:21:28AM +0800, Zhao Qiang wrote:
quoted
Add IC, SI and SIRAM document of QE to
Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
Acked-by: Rob Herring <robh@kernel.org>
---
changes for v2
- Add interrupt-controller in Required properties
- delete address-cells and size-cells for qe-si and qe-siram Changes
for v3
- Add SoC specific caompatible strings to qe-si and qe-siram Changes
for v4
- NA
Changes for v5
- NA
.../devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt | 50
++++++++++++++++++++++
1 file changed, 50 insertions(+)
+* Serial Interface Block (SI)
+
+The SI manages the routing of eight TDM lines to the QE block serial
+drivers , the MCC and the UCCs, for receive and transmit.
+
+Required properties:
+- compatible : should be "fsl,t1040-qe-si".
+- reg : Address range of SI register set.
Is t1040 the only chip that has or will ever have this?
There also be t1024 and ls1043 supporting si.
I thought to add them when adding their device node.
If you think it is better to add them now, I will modify.
The binding is saying that the compatible "should" be "fsl,t1040-qe-si"
regardless of whether it's actually a t1040. Instead say that compatible must
include "fsl,<chip>-qe-si" and give t1040 as an example. If you intend
"fsl,t1040-qe-si" to be something that other compatible chips list, in
addition to their own <chip> compatibles, then also say that explicitly.
-Scott