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>
---
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
.../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
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
arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 45 +++++++++++++++++++++++++++++
arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi | 39 +++++++++++++++++++++++++
2 files changed, 84 insertions(+)
add qe node to t104xrdb.dtsi
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
---
Changes for v2
- rebase
Changes for v3
- rebase
arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 39 +++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
@@ -0,0 +1,19 @@+* Serial++Currently defined compatibles:+- ucc_uart++Properties for 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 {+ device_type = "serial";+ compatible = "ucc_uart";+ port-number = <1>;+ rx-clock-name = "brg2";+ tx-clock-name = "brg2";+ };
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 ucc hdlc document to
Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
---
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
.../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 t104xqds.dtsi
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
---
Changes for v2
- rebase
Changes for v3
- rebase
arch/powerpc/boot/dts/fsl/t104xqds.dtsi | 39 +++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
From: Rob Herring <robh@kernel.org> Date: 2016-03-05 04:25:24
On Tue, Mar 01, 2016 at 03:09:37PM +0800, Zhao Qiang wrote:
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>
---
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
.../devicetree/bindings/powerpc/fsl/cpm_qe/qe.txt | 50 ++++++++++++++++++++++
1 file changed, 50 insertions(+)
From: Rob Herring <robh@kernel.org> Date: 2016-03-05 04:25:39
On Tue, Mar 01, 2016 at 03:09:38PM +0800, Zhao Qiang wrote:
Add ucc hdlc document to
Documentation/devicetree/bindings/powerpc/fsl/cpm_qe/network.txt
Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
---
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
.../bindings/powerpc/fsl/cpm_qe/network.txt | 81 ++++++++++++++++++++++
1 file changed, 81 insertions(+)
@@ -0,0 +1,19 @@+* Serial++Currently defined compatibles:+- ucc_uart
I guess this is in use already and okay. However, looking at the driver
there really should be SoC specific compatible strings here since the
driver is looking up the SoC compatible string and composing the
firmware filename from that.
+
+Properties for 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 {
+ device_type = "serial";
Drop device_type. It should only be used in a few legacy cases.
Looks like the driver is matching on this. Please drop it from the
driver too. I'd leave dts files for now, but they should be updated too
later.
From: Rob Herring <robh@kernel.org> Date: 2016-03-05 04:26:00
On Tue, Mar 01, 2016 at 03:09:40PM +0800, Zhao Qiang wrote:
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>
---
I already acked this. In the future, please add acks on subsequent revs.
Acked-by: Rob Herring <robh@kernel.org>
@@ -0,0 +1,19 @@+* Serial++Currently defined compatibles:+- ucc_uart
=20
I guess this is in use already and okay. However, looking at the driver t=
here
really should be SoC specific compatible strings here since the driver is=
looking
up the SoC compatible string and composing the firmware filename from tha=
t.
Ok, I will changed both driver and this compatible.
=20
quoted
+
+Properties for 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 {
+ device_type =3D "serial";
=20
Drop device_type. It should only be used in a few legacy cases.
=20
Looks like the driver is matching on this. Please drop it from the driver=
too. I'd
leave dts files for now, but they should be updated too later.
@@ -0,0 +1,19 @@+* Serial++Currently defined compatibles:+- ucc_uart
I guess this is in use already and okay. However, looking at the driver
there
really should be SoC specific compatible strings here since the driver is
looking
up the SoC compatible string and composing the firmware filename from
that.
Ok, I will changed both driver and this compatible.
But don't break existing device trees while doing so.
-Scott
@@ -0,0 +1,19 @@+* Serial++Currently defined compatibles:+- ucc_uart
I guess this is in use already and okay. However, looking at the
driver there really should be SoC specific compatible strings here
since the driver is looking up the SoC compatible string and
composing the firmware filename from that.
Ok, I will changed both driver and this compatible.
But don't break existing device trees while doing so.
Do I need to send driver patch in this patchset or a individual patch?