* [PATCH 01/15] dt-bindings: arm: fsl: add ls1021a-tsn board
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-06 11:22 ` Krzysztof Kozlowski
2021-02-11 0:02 ` Rob Herring
2021-02-05 23:47 ` [PATCH 02/15] dt-bindings: i2c: imx: update schema to align with original binding Li Yang
` (13 subsequent siblings)
14 siblings, 2 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Add the missing board in the binding docuemnt.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
Documentation/devicetree/bindings/arm/fsl.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
index 297c87f45db8..85277c8045fe 100644
--- a/Documentation/devicetree/bindings/arm/fsl.yaml
+++ b/Documentation/devicetree/bindings/arm/fsl.yaml
@@ -834,6 +834,7 @@ properties:
- enum:
- fsl,ls1021a-moxa-uc-8410a
- fsl,ls1021a-qds
+ - fsl,ls1021a-tsn
- fsl,ls1021a-twr
- const: fsl,ls1021a
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 01/15] dt-bindings: arm: fsl: add ls1021a-tsn board
2021-02-05 23:47 ` [PATCH 01/15] dt-bindings: arm: fsl: add ls1021a-tsn board Li Yang
@ 2021-02-06 11:22 ` Krzysztof Kozlowski
2021-02-11 0:02 ` Rob Herring
1 sibling, 0 replies; 25+ messages in thread
From: Krzysztof Kozlowski @ 2021-02-06 11:22 UTC (permalink / raw)
To: Li Yang
Cc: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
linux-arm-kernel, linux-kernel
On Fri, Feb 05, 2021 at 05:47:20PM -0600, Li Yang wrote:
> Add the missing board in the binding docuemnt.
It's not necessarily missing as there are no DTS (in tree) using this
compatible, so maybe rephrase it to:
"Add board compatible for ls1021a-tsn board".
Best regards,
Krzysztof
>
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> ---
> Documentation/devicetree/bindings/arm/fsl.yaml | 1 +
> 1 file changed, 1 insertion(+)
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 01/15] dt-bindings: arm: fsl: add ls1021a-tsn board
2021-02-05 23:47 ` [PATCH 01/15] dt-bindings: arm: fsl: add ls1021a-tsn board Li Yang
2021-02-06 11:22 ` Krzysztof Kozlowski
@ 2021-02-11 0:02 ` Rob Herring
1 sibling, 0 replies; 25+ messages in thread
From: Rob Herring @ 2021-02-11 0:02 UTC (permalink / raw)
To: Li Yang
Cc: linux-arm-kernel, Oleksij Rempel, devicetree,
Krzysztof Kozlowski, Rob Herring, Shawn Guo, linux-kernel
On Fri, 05 Feb 2021 17:47:20 -0600, Li Yang wrote:
> Add the missing board in the binding docuemnt.
>
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> ---
> Documentation/devicetree/bindings/arm/fsl.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 02/15] dt-bindings: i2c: imx: update schema to align with original binding
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
2021-02-05 23:47 ` [PATCH 01/15] dt-bindings: arm: fsl: add ls1021a-tsn board Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-06 11:27 ` Krzysztof Kozlowski
2021-02-05 23:47 ` [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to yaml schema Li Yang
` (12 subsequent siblings)
14 siblings, 1 reply; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Layerscape SoCs doesn't use ipg as clock name. Remove the clock name
requirement in the schema. Also the original binding doesn't enforce
the order of "tx" and "rx" in dma-names. Both orders are used
extensively in existing dtses, update the schema to allow both.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/i2c/i2c-imx.yaml b/Documentation/devicetree/bindings/i2c/i2c-imx.yaml
index f23966b0d6c6..57237b0b7d89 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-imx.yaml
+++ b/Documentation/devicetree/bindings/i2c/i2c-imx.yaml
@@ -54,20 +54,19 @@ properties:
maxItems: 1
clock-names:
- const: ipg
+ maxItems: 1
clock-frequency:
enum: [ 100000, 400000 ]
dmas:
- items:
- - description: DMA controller phandle and request line for RX
- - description: DMA controller phandle and request line for TX
+ minItems: 2
+ maxItems: 2
dma-names:
items:
- - const: rx
- - const: tx
+ - enum: [ "rx", "tx" ]
+ - enum: [ "tx", "rx" ]
sda-gpios:
maxItems: 1
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 02/15] dt-bindings: i2c: imx: update schema to align with original binding
2021-02-05 23:47 ` [PATCH 02/15] dt-bindings: i2c: imx: update schema to align with original binding Li Yang
@ 2021-02-06 11:27 ` Krzysztof Kozlowski
0 siblings, 0 replies; 25+ messages in thread
From: Krzysztof Kozlowski @ 2021-02-06 11:27 UTC (permalink / raw)
To: Li Yang
Cc: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
linux-arm-kernel, linux-kernel
On Fri, Feb 05, 2021 at 05:47:21PM -0600, Li Yang wrote:
> Layerscape SoCs doesn't use ipg as clock name. Remove the clock name
> requirement in the schema. Also the original binding doesn't enforce
> the order of "tx" and "rx" in dma-names. Both orders are used
> extensively in existing dtses, update the schema to allow both.
>
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> ---
> Documentation/devicetree/bindings/i2c/i2c-imx.yaml | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/i2c/i2c-imx.yaml b/Documentation/devicetree/bindings/i2c/i2c-imx.yaml
> index f23966b0d6c6..57237b0b7d89 100644
> --- a/Documentation/devicetree/bindings/i2c/i2c-imx.yaml
> +++ b/Documentation/devicetree/bindings/i2c/i2c-imx.yaml
> @@ -54,20 +54,19 @@ properties:
> maxItems: 1
>
> clock-names:
> - const: ipg
> + maxItems: 1
No, for other SoCs the clock is I think required, so it should be there.
Add an allof-if statements to require it on specific compatibles and
skip on others.
>
> clock-frequency:
> enum: [ 100000, 400000 ]
>
> dmas:
> - items:
> - - description: DMA controller phandle and request line for RX
> - - description: DMA controller phandle and request line for TX
> + minItems: 2
> + maxItems: 2
>
> dma-names:
> items:
> - - const: rx
> - - const: tx
> + - enum: [ "rx", "tx" ]
> + - enum: [ "tx", "rx" ]
No, the order should be enforced. That was a generic recommendation from
Rob.
Also, I don't get the what does it mean "the original binding" in commit
msg. This is the original binding. Upstream. Mainline.
If your DTSes have different order, please adjust them, not the binding.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to yaml schema
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
2021-02-05 23:47 ` [PATCH 01/15] dt-bindings: arm: fsl: add ls1021a-tsn board Li Yang
2021-02-05 23:47 ` [PATCH 02/15] dt-bindings: i2c: imx: update schema to align with original binding Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-06 11:37 ` Krzysztof Kozlowski
2021-02-08 16:55 ` Rob Herring
2021-02-05 23:47 ` [PATCH 04/15] ARM: dts: ls1021a: change to use SPDX identifiers Li Yang
` (11 subsequent siblings)
14 siblings, 2 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Convert the txt binding to yaml format and add description. Also
updated the recommended node name to ifc-bus to align with the
simple-bus node name requirements.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
.../bindings/memory-controllers/fsl/ifc.txt | 82 ----------
.../bindings/memory-controllers/fsl/ifc.yaml | 140 ++++++++++++++++++
2 files changed, 140 insertions(+), 82 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml
diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
deleted file mode 100644
index 89427b018ba7..000000000000
--- a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-Integrated Flash Controller
-
-Properties:
-- name : Should be ifc
-- compatible : should contain "fsl,ifc". The version of the integrated
- flash controller can be found in the IFC_REV register at
- offset zero.
-
-- #address-cells : Should be either two or three. The first cell is the
- chipselect number, and the remaining cells are the
- offset into the chipselect.
-- #size-cells : Either one or two, depending on how large each chipselect
- can be.
-- reg : Offset and length of the register set for the device
-- interrupts: IFC may have one or two interrupts. If two interrupt
- specifiers are present, the first is the "common"
- interrupt (CM_EVTER_STAT), and the second is the NAND
- interrupt (NAND_EVTER_STAT). If there is only one,
- that interrupt reports both types of event.
-
-- little-endian : If this property is absent, the big-endian mode will
- be in use as default for registers.
-
-- ranges : Each range corresponds to a single chipselect, and covers
- the entire access window as configured.
-
-Child device nodes describe the devices connected to IFC such as NOR (e.g.
-cfi-flash) and NAND (fsl,ifc-nand). There might be board specific devices
-like FPGAs, CPLDs, etc.
-
-Example:
-
- ifc@ffe1e000 {
- compatible = "fsl,ifc", "simple-bus";
- #address-cells = <2>;
- #size-cells = <1>;
- reg = <0x0 0xffe1e000 0 0x2000>;
- interrupts = <16 2 19 2>;
- little-endian;
-
- /* NOR, NAND Flashes and CPLD on board */
- ranges = <0x0 0x0 0x0 0xee000000 0x02000000
- 0x1 0x0 0x0 0xffa00000 0x00010000
- 0x3 0x0 0x0 0xffb00000 0x00020000>;
-
- flash@0,0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "cfi-flash";
- reg = <0x0 0x0 0x2000000>;
- bank-width = <2>;
- device-width = <1>;
-
- partition@0 {
- /* 32MB for user data */
- reg = <0x0 0x02000000>;
- label = "NOR Data";
- };
- };
-
- flash@1,0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "fsl,ifc-nand";
- reg = <0x1 0x0 0x10000>;
-
- partition@0 {
- /* This location must not be altered */
- /* 1MB for u-boot Bootloader Image */
- reg = <0x0 0x00100000>;
- label = "NAND U-Boot Image";
- read-only;
- };
- };
-
- cpld@3,0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "fsl,p1010rdb-cpld";
- reg = <0x3 0x0 0x000001f>;
- };
- };
diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml
new file mode 100644
index 000000000000..d37cae66b027
--- /dev/null
+++ b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml
@@ -0,0 +1,140 @@
+# SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/memory-controllers/fsl/ifc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: FSL/NXP Integrated Flash Controller
+
+maintainers:
+ - Li Yang <leoyang.li@nxp.com>
+
+description: |
+ NXP's integrated flash controller (IFC) is an advanced version of the
+ enhanced local bus controller which includes similar programming and signal
+ interfaces with an extended feature set. The IFC provides access to multiple
+ external memory types, such as NAND flash (SLC and MLC), NOR flash, EPROM,
+ SRAM and other memories where address and data are shared on a bus.
+
+allOf:
+ - $ref: /schemas/simple-bus.yaml#
+
+properties:
+ $nodename:
+ pattern: "^ifc-bus@[0-9a-f]+$"
+
+ compatible:
+ contains:
+ const: fsl,ifc
+
+ "#address-cells":
+ enum: [2, 3]
+ description: |
+ Should be either two or three. The first cell is the chipselect
+ number, and the remaining cells are the offset into the chipselect.
+
+ "#size-cells":
+ enum: [1, 2]
+ description: |
+ Either one or two, depending on how large each chipselect can be.
+
+ reg:
+ maxItems: 1
+ description: |
+ Offset and length of the register set for the device.
+
+ interrupts:
+ minItems: 1
+ maxItems: 2
+ description: |
+ IFC may have one or two interrupts. If two interrupt specifiers are
+ present, the first is the "common" interrupt (CM_EVTER_STAT), and the
+ second is the NAND interrupt (NAND_EVTER_STAT). If there is only one,
+ that interrupt reports both types of event.
+
+ little-endian:
+ description: |
+ If this property is absent, the big-endian mode will be in use as default
+ for registers.
+
+ ranges:
+ description: |
+ Each range corresponds to a single chipselect, and covers the entire
+ access window as configured.
+
+patternProperties:
+ "^.*@[a-f0-9]+(,[a-f0-9]+)+$":
+ type: object
+ description: |
+ Child device nodes describe the devices connected to IFC such as NOR (e.g.
+ cfi-flash) and NAND (fsl,ifc-nand). There might be board specific devices
+ like FPGAs, CPLDs, etc.
+
+ required:
+ - compatible
+ - reg
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+additionalProperties: false
+
+examples:
+ - |
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ ifc-bus@ffe1e000 {
+ compatible = "fsl,ifc", "simple-bus";
+ #address-cells = <2>;
+ #size-cells = <1>;
+ reg = <0x0 0xffe1e000 0 0x2000>;
+ interrupts = <16 2 19 2>;
+ little-endian;
+
+ /* NOR, NAND Flashes and CPLD on board */
+ ranges = <0x0 0x0 0x0 0xee000000 0x02000000>,
+ <0x1 0x0 0x0 0xffa00000 0x00010000>,
+ <0x3 0x0 0x0 0xffb00000 0x00020000>;
+
+ flash@0,0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "cfi-flash";
+ reg = <0x0 0x0 0x2000000>;
+ bank-width = <2>;
+ device-width = <1>;
+
+ partition@0 {
+ /* 32MB for user data */
+ reg = <0x0 0x02000000>;
+ label = "NOR Data";
+ };
+ };
+
+ flash@1,0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "fsl,ifc-nand";
+ reg = <0x1 0x0 0x10000>;
+
+ partition@0 {
+ /* This location must not be altered */
+ /* 1MB for u-boot Bootloader Image */
+ reg = <0x0 0x00100000>;
+ label = "NAND U-Boot Image";
+ read-only;
+ };
+ };
+
+ cpld@3,0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "fsl,p1010rdb-cpld";
+ reg = <0x3 0x0 0x000001f>;
+ };
+ };
+ };
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to yaml schema
2021-02-05 23:47 ` [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to yaml schema Li Yang
@ 2021-02-06 11:37 ` Krzysztof Kozlowski
2021-02-08 16:55 ` Rob Herring
1 sibling, 0 replies; 25+ messages in thread
From: Krzysztof Kozlowski @ 2021-02-06 11:37 UTC (permalink / raw)
To: Li Yang
Cc: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
linux-arm-kernel, linux-kernel
On Fri, Feb 05, 2021 at 05:47:22PM -0600, Li Yang wrote:
> Convert the txt binding to yaml format and add description. Also
> updated the recommended node name to ifc-bus to align with the
> simple-bus node name requirements.
>
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> ---
> .../bindings/memory-controllers/fsl/ifc.txt | 82 ----------
> .../bindings/memory-controllers/fsl/ifc.yaml | 140 ++++++++++++++++++
> 2 files changed, 140 insertions(+), 82 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
> create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml
>
> diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
> deleted file mode 100644
> index 89427b018ba7..000000000000
> --- a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
> +++ /dev/null
> @@ -1,82 +0,0 @@
> -Integrated Flash Controller
> -
> -Properties:
> -- name : Should be ifc
> -- compatible : should contain "fsl,ifc". The version of the integrated
> - flash controller can be found in the IFC_REV register at
> - offset zero.
> -
> -- #address-cells : Should be either two or three. The first cell is the
> - chipselect number, and the remaining cells are the
> - offset into the chipselect.
> -- #size-cells : Either one or two, depending on how large each chipselect
> - can be.
> -- reg : Offset and length of the register set for the device
> -- interrupts: IFC may have one or two interrupts. If two interrupt
> - specifiers are present, the first is the "common"
> - interrupt (CM_EVTER_STAT), and the second is the NAND
> - interrupt (NAND_EVTER_STAT). If there is only one,
> - that interrupt reports both types of event.
> -
> -- little-endian : If this property is absent, the big-endian mode will
> - be in use as default for registers.
> -
> -- ranges : Each range corresponds to a single chipselect, and covers
> - the entire access window as configured.
> -
> -Child device nodes describe the devices connected to IFC such as NOR (e.g.
> -cfi-flash) and NAND (fsl,ifc-nand). There might be board specific devices
> -like FPGAs, CPLDs, etc.
> -
> -Example:
> -
> - ifc@ffe1e000 {
> - compatible = "fsl,ifc", "simple-bus";
> - #address-cells = <2>;
> - #size-cells = <1>;
> - reg = <0x0 0xffe1e000 0 0x2000>;
> - interrupts = <16 2 19 2>;
> - little-endian;
> -
> - /* NOR, NAND Flashes and CPLD on board */
> - ranges = <0x0 0x0 0x0 0xee000000 0x02000000
> - 0x1 0x0 0x0 0xffa00000 0x00010000
> - 0x3 0x0 0x0 0xffb00000 0x00020000>;
> -
> - flash@0,0 {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - compatible = "cfi-flash";
> - reg = <0x0 0x0 0x2000000>;
> - bank-width = <2>;
> - device-width = <1>;
> -
> - partition@0 {
> - /* 32MB for user data */
> - reg = <0x0 0x02000000>;
> - label = "NOR Data";
> - };
> - };
> -
> - flash@1,0 {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - compatible = "fsl,ifc-nand";
> - reg = <0x1 0x0 0x10000>;
> -
> - partition@0 {
> - /* This location must not be altered */
> - /* 1MB for u-boot Bootloader Image */
> - reg = <0x0 0x00100000>;
> - label = "NAND U-Boot Image";
> - read-only;
> - };
> - };
> -
> - cpld@3,0 {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - compatible = "fsl,p1010rdb-cpld";
> - reg = <0x3 0x0 0x000001f>;
> - };
> - };
> diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml
> new file mode 100644
> index 000000000000..d37cae66b027
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml
> @@ -0,0 +1,140 @@
> +# SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/memory-controllers/fsl/ifc.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: FSL/NXP Integrated Flash Controller
> +
> +maintainers:
> + - Li Yang <leoyang.li@nxp.com>
> +
> +description: |
> + NXP's integrated flash controller (IFC) is an advanced version of the
> + enhanced local bus controller which includes similar programming and signal
> + interfaces with an extended feature set. The IFC provides access to multiple
> + external memory types, such as NAND flash (SLC and MLC), NOR flash, EPROM,
> + SRAM and other memories where address and data are shared on a bus.
> +
> +allOf:
> + - $ref: /schemas/simple-bus.yaml#
> +
> +properties:
> + $nodename:
> + pattern: "^ifc-bus@[0-9a-f]+$"
Just "bus". The node name should be generic, represent generic class of
a device. The class is a bus.
> +
> + compatible:
> + contains:
> + const: fsl,ifc
I think you should list all compatibles, to be specific. "contains"
allow adding any arbitrary compatible.
> +
> + "#address-cells":
> + enum: [2, 3]
> + description: |
> + Should be either two or three. The first cell is the chipselect
> + number, and the remaining cells are the offset into the chipselect.
> +
> + "#size-cells":
> + enum: [1, 2]
> + description: |
> + Either one or two, depending on how large each chipselect can be.
> +
> + reg:
> + maxItems: 1
> + description: |
> + Offset and length of the register set for the device.
Wrong indentation.
> +
> + interrupts:
> + minItems: 1
> + maxItems: 2
> + description: |
> + IFC may have one or two interrupts. If two interrupt specifiers are
> + present, the first is the "common" interrupt (CM_EVTER_STAT), and the
> + second is the NAND interrupt (NAND_EVTER_STAT). If there is only one,
> + that interrupt reports both types of event.
> +
> + little-endian:
> + description: |
> + If this property is absent, the big-endian mode will be in use as default
> + for registers.
type: boolean
> +
> + ranges:
> + description: |
> + Each range corresponds to a single chipselect, and covers the entire
> + access window as configured.
> +
> +patternProperties:
Wrong indentation.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to yaml schema
2021-02-05 23:47 ` [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to yaml schema Li Yang
2021-02-06 11:37 ` Krzysztof Kozlowski
@ 2021-02-08 16:55 ` Rob Herring
2021-02-08 17:07 ` Leo Li
1 sibling, 1 reply; 25+ messages in thread
From: Rob Herring @ 2021-02-08 16:55 UTC (permalink / raw)
To: Li Yang
Cc: linux-arm-kernel, Oleksij Rempel, Rob Herring,
Krzysztof Kozlowski, devicetree, linux-kernel, Shawn Guo
On Fri, 05 Feb 2021 17:47:22 -0600, Li Yang wrote:
> Convert the txt binding to yaml format and add description. Also
> updated the recommended node name to ifc-bus to align with the
> simple-bus node name requirements.
>
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> ---
> .../bindings/memory-controllers/fsl/ifc.txt | 82 ----------
> .../bindings/memory-controllers/fsl/ifc.yaml | 140 ++++++++++++++++++
> 2 files changed, 140 insertions(+), 82 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
> create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml
>
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:
Documentation/devicetree/bindings/memory-controllers/fsl/ifc.example.dts:36.27-49.19: Warning (simple_bus_reg): /example-0/soc/ifc-bus@ffe1e000/flash@0,0: simple-bus unit address format error, expected "0"
Documentation/devicetree/bindings/memory-controllers/fsl/ifc.example.dts:51.27-64.19: Warning (simple_bus_reg): /example-0/soc/ifc-bus@ffe1e000/flash@1,0: simple-bus unit address format error, expected "100000000"
Documentation/devicetree/bindings/memory-controllers/fsl/ifc.example.dts:66.26-71.19: Warning (simple_bus_reg): /example-0/soc/ifc-bus@ffe1e000/cpld@3,0: simple-bus unit address format error, expected "300000000"
See https://patchwork.ozlabs.org/patch/1436960
This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit.
^ permalink raw reply [flat|nested] 25+ messages in thread
* RE: [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to yaml schema
2021-02-08 16:55 ` Rob Herring
@ 2021-02-08 17:07 ` Leo Li
2021-02-08 18:21 ` Rob Herring
0 siblings, 1 reply; 25+ messages in thread
From: Leo Li @ 2021-02-08 17:07 UTC (permalink / raw)
To: Rob Herring
Cc: linux-arm-kernel, Oleksij Rempel, Rob Herring,
Krzysztof Kozlowski, devicetree, linux-kernel, Shawn Guo
> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: Monday, February 8, 2021 10:55 AM
> To: Leo Li <leoyang.li@nxp.com>
> Cc: linux-arm-kernel@lists.infradead.org; Oleksij Rempel <linux@rempel-
> privat.de>; Rob Herring <robh+dt@kernel.org>; Krzysztof Kozlowski
> <krzk@kernel.org>; devicetree@vger.kernel.org; linux-
> kernel@vger.kernel.org; Shawn Guo <shawnguo@kernel.org>
> Subject: Re: [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to
> yaml schema
>
> On Fri, 05 Feb 2021 17:47:22 -0600, Li Yang wrote:
> > Convert the txt binding to yaml format and add description. Also
> > updated the recommended node name to ifc-bus to align with the
> > simple-bus node name requirements.
> >
> > Signed-off-by: Li Yang <leoyang.li@nxp.com>
> > ---
> > .../bindings/memory-controllers/fsl/ifc.txt | 82 ----------
> > .../bindings/memory-controllers/fsl/ifc.yaml | 140
> > ++++++++++++++++++
> > 2 files changed, 140 insertions(+), 82 deletions(-) delete mode
> > 100644
> > Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
> > create mode 100644
> > Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml
> >
>
> My bot found errors running 'make dt_binding_check' on your patch:
>
> yamllint warnings/errors:
>
> dtschema/dtc warnings/errors:
> Documentation/devicetree/bindings/memory-
> controllers/fsl/ifc.example.dts:36.27-49.19: Warning (simple_bus_reg):
> /example-0/soc/ifc-bus@ffe1e000/flash@0,0: simple-bus unit address
> format error, expected "0"
> Documentation/devicetree/bindings/memory-
> controllers/fsl/ifc.example.dts:51.27-64.19: Warning (simple_bus_reg):
> /example-0/soc/ifc-bus@ffe1e000/flash@1,0: simple-bus unit address
> format error, expected "100000000"
> Documentation/devicetree/bindings/memory-
> controllers/fsl/ifc.example.dts:66.26-71.19: Warning (simple_bus_reg):
> /example-0/soc/ifc-bus@ffe1e000/cpld@3,0: simple-bus unit address format
> error, expected "300000000"
Hi Rob,
I saw these warnings, but cannot find a good solution to it. The first cell in the address is the Chip select, while the second cell in the address is the address offset within the chip select. It would confusing to combine the two cells of different purposes into a single address as suggested by the warning. Can we allow the multi-cell address in the node name?
Regards,
Leo
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to yaml schema
2021-02-08 17:07 ` Leo Li
@ 2021-02-08 18:21 ` Rob Herring
2021-02-08 23:25 ` Leo Li
0 siblings, 1 reply; 25+ messages in thread
From: Rob Herring @ 2021-02-08 18:21 UTC (permalink / raw)
To: Leo Li
Cc: linux-arm-kernel, Oleksij Rempel, Krzysztof Kozlowski,
devicetree, linux-kernel, Shawn Guo
On Mon, Feb 08, 2021 at 05:07:14PM +0000, Leo Li wrote:
>
>
> > -----Original Message-----
> > From: Rob Herring <robh@kernel.org>
> > Sent: Monday, February 8, 2021 10:55 AM
> > To: Leo Li <leoyang.li@nxp.com>
> > Cc: linux-arm-kernel@lists.infradead.org; Oleksij Rempel <linux@rempel-
> > privat.de>; Rob Herring <robh+dt@kernel.org>; Krzysztof Kozlowski
> > <krzk@kernel.org>; devicetree@vger.kernel.org; linux-
> > kernel@vger.kernel.org; Shawn Guo <shawnguo@kernel.org>
> > Subject: Re: [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to
> > yaml schema
> >
> > On Fri, 05 Feb 2021 17:47:22 -0600, Li Yang wrote:
> > > Convert the txt binding to yaml format and add description. Also
> > > updated the recommended node name to ifc-bus to align with the
> > > simple-bus node name requirements.
> > >
> > > Signed-off-by: Li Yang <leoyang.li@nxp.com>
> > > ---
> > > .../bindings/memory-controllers/fsl/ifc.txt | 82 ----------
> > > .../bindings/memory-controllers/fsl/ifc.yaml | 140
> > > ++++++++++++++++++
> > > 2 files changed, 140 insertions(+), 82 deletions(-) delete mode
> > > 100644
> > > Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
> > > create mode 100644
> > > Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml
> > >
> >
> > My bot found errors running 'make dt_binding_check' on your patch:
> >
> > yamllint warnings/errors:
> >
> > dtschema/dtc warnings/errors:
> > Documentation/devicetree/bindings/memory-
> > controllers/fsl/ifc.example.dts:36.27-49.19: Warning (simple_bus_reg):
> > /example-0/soc/ifc-bus@ffe1e000/flash@0,0: simple-bus unit address
> > format error, expected "0"
> > Documentation/devicetree/bindings/memory-
> > controllers/fsl/ifc.example.dts:51.27-64.19: Warning (simple_bus_reg):
> > /example-0/soc/ifc-bus@ffe1e000/flash@1,0: simple-bus unit address
> > format error, expected "100000000"
> > Documentation/devicetree/bindings/memory-
> > controllers/fsl/ifc.example.dts:66.26-71.19: Warning (simple_bus_reg):
> > /example-0/soc/ifc-bus@ffe1e000/cpld@3,0: simple-bus unit address format
> > error, expected "300000000"
>
> Hi Rob,
>
> I saw these warnings, but cannot find a good solution to it. The
> first cell in the address is the Chip select, while the second cell
> in the address is the address offset within the chip select. It
> would confusing to combine the two cells of different purposes into
> a single address as suggested by the warning. Can we allow the
> multi-cell address in the node name?
Drop 'simple-bus'. It's not a simple bus. You have registers that
presumably have some configuration needed.
Rob
^ permalink raw reply [flat|nested] 25+ messages in thread
* RE: [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to yaml schema
2021-02-08 18:21 ` Rob Herring
@ 2021-02-08 23:25 ` Leo Li
0 siblings, 0 replies; 25+ messages in thread
From: Leo Li @ 2021-02-08 23:25 UTC (permalink / raw)
To: Rob Herring
Cc: linux-arm-kernel, Oleksij Rempel, Krzysztof Kozlowski,
devicetree, linux-kernel, Shawn Guo
> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: Monday, February 8, 2021 12:21 PM
> To: Leo Li <leoyang.li@nxp.com>
> Cc: linux-arm-kernel@lists.infradead.org; Oleksij Rempel <linux@rempel-
> privat.de>; Krzysztof Kozlowski <krzk@kernel.org>;
> devicetree@vger.kernel.org; linux-kernel@vger.kernel.org; Shawn Guo
> <shawnguo@kernel.org>
> Subject: Re: [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to
> yaml schema
>
> On Mon, Feb 08, 2021 at 05:07:14PM +0000, Leo Li wrote:
> >
> >
> > > -----Original Message-----
> > > From: Rob Herring <robh@kernel.org>
> > > Sent: Monday, February 8, 2021 10:55 AM
> > > To: Leo Li <leoyang.li@nxp.com>
> > > Cc: linux-arm-kernel@lists.infradead.org; Oleksij Rempel
> > > <linux@rempel- privat.de>; Rob Herring <robh+dt@kernel.org>;
> > > Krzysztof Kozlowski <krzk@kernel.org>; devicetree@vger.kernel.org;
> > > linux- kernel@vger.kernel.org; Shawn Guo <shawnguo@kernel.org>
> > > Subject: Re: [PATCH 03/15] dt-bindings: memory: fsl: convert ifc
> > > binding to yaml schema
> > >
> > > On Fri, 05 Feb 2021 17:47:22 -0600, Li Yang wrote:
> > > > Convert the txt binding to yaml format and add description. Also
> > > > updated the recommended node name to ifc-bus to align with the
> > > > simple-bus node name requirements.
> > > >
> > > > Signed-off-by: Li Yang <leoyang.li@nxp.com>
> > > > ---
> > > > .../bindings/memory-controllers/fsl/ifc.txt | 82 ----------
> > > > .../bindings/memory-controllers/fsl/ifc.yaml | 140
> > > > ++++++++++++++++++
> > > > 2 files changed, 140 insertions(+), 82 deletions(-) delete mode
> > > > 100644
> > > > Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt
> > > > create mode 100644
> > > > Documentation/devicetree/bindings/memory-controllers/fsl/ifc.yaml
> > > >
> > >
> > > My bot found errors running 'make dt_binding_check' on your patch:
> > >
> > > yamllint warnings/errors:
> > >
> > > dtschema/dtc warnings/errors:
> > > Documentation/devicetree/bindings/memory-
> > > controllers/fsl/ifc.example.dts:36.27-49.19: Warning (simple_bus_reg):
> > > /example-0/soc/ifc-bus@ffe1e000/flash@0,0: simple-bus unit address
> > > format error, expected "0"
> > > Documentation/devicetree/bindings/memory-
> > > controllers/fsl/ifc.example.dts:51.27-64.19: Warning (simple_bus_reg):
> > > /example-0/soc/ifc-bus@ffe1e000/flash@1,0: simple-bus unit address
> > > format error, expected "100000000"
> > > Documentation/devicetree/bindings/memory-
> > > controllers/fsl/ifc.example.dts:66.26-71.19: Warning (simple_bus_reg):
> > > /example-0/soc/ifc-bus@ffe1e000/cpld@3,0: simple-bus unit address
> > > format error, expected "300000000"
> >
> > Hi Rob,
> >
> > I saw these warnings, but cannot find a good solution to it. The
> > first cell in the address is the Chip select, while the second cell in
> > the address is the address offset within the chip select. It would
> > confusing to combine the two cells of different purposes into a single
> > address as suggested by the warning. Can we allow the multi-cell
> > address in the node name?
>
> Drop 'simple-bus'. It's not a simple bus. You have registers that presumably
> have some configuration needed.
That's probably true for just using "simple-bus" as compatible along. But I see many of the current bindings are defining a more specific compatible string in addition to the "simple-bus" compatible and have their own drivers. I think this probably meet the statement in the device tree spec? "Bindings may be defined as extensions of other each. For example a new bus type could be defined as an extension of the
simple-bus binding."
Regards,
Leo
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 04/15] ARM: dts: ls1021a: change to use SPDX identifiers
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (2 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 03/15] dt-bindings: memory: fsl: convert ifc binding to yaml schema Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-06 11:42 ` Krzysztof Kozlowski
2021-02-05 23:47 ` [PATCH 05/15] ARM: dts: ls1021a-qds: Add node for QSPI flash Li Yang
` (10 subsequent siblings)
14 siblings, 1 reply; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Replace the license text with SPDX identifiers. In the mean while
updated copyright years for previous changes.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a-qds.dts | 46 ++-----------------------------
arch/arm/boot/dts/ls1021a-twr.dts | 46 ++-----------------------------
arch/arm/boot/dts/ls1021a.dtsi | 45 ++----------------------------
3 files changed, 6 insertions(+), 131 deletions(-)
diff --git a/arch/arm/boot/dts/ls1021a-qds.dts b/arch/arm/boot/dts/ls1021a-qds.dts
index 74a67604876c..71bab93bc4cc 100644
--- a/arch/arm/boot/dts/ls1021a-qds.dts
+++ b/arch/arm/boot/dts/ls1021a-qds.dts
@@ -1,49 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright 2013-2014 Freescale Semiconductor, Inc.
- * Copyright 2018 NXP
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- * a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *
- * Or, alternatively,
- *
- * b) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright 2018-2021 NXP
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/ls1021a-twr.dts b/arch/arm/boot/dts/ls1021a-twr.dts
index 5edf001f6138..01bf316bcc99 100644
--- a/arch/arm/boot/dts/ls1021a-twr.dts
+++ b/arch/arm/boot/dts/ls1021a-twr.dts
@@ -1,49 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright 2013-2014 Freescale Semiconductor, Inc.
- * Copyright 2018 NXP
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- * a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *
- * Or, alternatively,
- *
- * b) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright 2018-2020 NXP
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 007dd2bd0595..4bf6320c85d9 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -1,48 +1,7 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright 2013-2014 Freescale Semiconductor, Inc.
- *
- * This file is dual-licensed: you can use it either under the terms
- * of the GPL or the X11 license, at your option. Note that this dual
- * licensing only applies to this file, and not this project as a
- * whole.
- *
- * a) This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this file; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
- *
- * Or, alternatively,
- *
- * b) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright 2015-2021 NXP
*/
#include <dt-bindings/interrupt-controller/arm-gic.h>
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH 04/15] ARM: dts: ls1021a: change to use SPDX identifiers
2021-02-05 23:47 ` [PATCH 04/15] ARM: dts: ls1021a: change to use SPDX identifiers Li Yang
@ 2021-02-06 11:42 ` Krzysztof Kozlowski
0 siblings, 0 replies; 25+ messages in thread
From: Krzysztof Kozlowski @ 2021-02-06 11:42 UTC (permalink / raw)
To: Li Yang
Cc: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
linux-arm-kernel, linux-kernel
On Fri, Feb 05, 2021 at 05:47:23PM -0600, Li Yang wrote:
> Replace the license text with SPDX identifiers. In the mean while
> updated copyright years for previous changes.
>
> Signed-off-by: Li Yang <leoyang.li@nxp.com>
> ---
> arch/arm/boot/dts/ls1021a-qds.dts | 46 ++-----------------------------
> arch/arm/boot/dts/ls1021a-twr.dts | 46 ++-----------------------------
> arch/arm/boot/dts/ls1021a.dtsi | 45 ++----------------------------
> 3 files changed, 6 insertions(+), 131 deletions(-)
>
> diff --git a/arch/arm/boot/dts/ls1021a-qds.dts b/arch/arm/boot/dts/ls1021a-qds.dts
> index 74a67604876c..71bab93bc4cc 100644
> --- a/arch/arm/boot/dts/ls1021a-qds.dts
> +++ b/arch/arm/boot/dts/ls1021a-qds.dts
> @@ -1,49 +1,7 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> /*
> * Copyright 2013-2014 Freescale Semiconductor, Inc.
> - * Copyright 2018 NXP
Please split the copyright update. Adding a SPDX is not big enough to
justify adding new copyrights. On the other hand, if NXP contributed
over time and you want to reflect it in the copyrights, it's a different
path.
> - *
> - * This file is dual-licensed: you can use it either under the terms
> - * of the GPL or the X11 license, at your option. Note that this dual
> - * licensing only applies to this file, and not this project as a
> - * whole.
> - *
> - * a) This file is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This file is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public
> - * License along with this file; if not, write to the Free
> - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> - * MA 02110-1301 USA
> - *
> - * Or, alternatively,
> - *
> - * b) Permission is hereby granted, free of charge, to any person
> - * obtaining a copy of this software and associated documentation
> - * files (the "Software"), to deal in the Software without
> - * restriction, including without limitation the rights to use,
> - * copy, modify, merge, publish, distribute, sublicense, and/or
> - * sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following
> - * conditions:
> - *
> - * The above copyright notice and this permission notice shall be
> - * included in all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> - * OTHER DEALINGS IN THE SOFTWARE.
> + * Copyright 2018-2021 NXP
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/ls1021a-twr.dts b/arch/arm/boot/dts/ls1021a-twr.dts
> index 5edf001f6138..01bf316bcc99 100644
> --- a/arch/arm/boot/dts/ls1021a-twr.dts
> +++ b/arch/arm/boot/dts/ls1021a-twr.dts
> @@ -1,49 +1,7 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> /*
> * Copyright 2013-2014 Freescale Semiconductor, Inc.
> - * Copyright 2018 NXP
> - *
> - * This file is dual-licensed: you can use it either under the terms
> - * of the GPL or the X11 license, at your option. Note that this dual
> - * licensing only applies to this file, and not this project as a
> - * whole.
> - *
> - * a) This file is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This file is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public
> - * License along with this file; if not, write to the Free
> - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> - * MA 02110-1301 USA
> - *
> - * Or, alternatively,
> - *
> - * b) Permission is hereby granted, free of charge, to any person
> - * obtaining a copy of this software and associated documentation
> - * files (the "Software"), to deal in the Software without
> - * restriction, including without limitation the rights to use,
> - * copy, modify, merge, publish, distribute, sublicense, and/or
> - * sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following
> - * conditions:
> - *
> - * The above copyright notice and this permission notice shall be
> - * included in all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> - * OTHER DEALINGS IN THE SOFTWARE.
> + * Copyright 2018-2020 NXP
> */
>
> /dts-v1/;
> diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
> index 007dd2bd0595..4bf6320c85d9 100644
> --- a/arch/arm/boot/dts/ls1021a.dtsi
> +++ b/arch/arm/boot/dts/ls1021a.dtsi
> @@ -1,48 +1,7 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> /*
> * Copyright 2013-2014 Freescale Semiconductor, Inc.
> - *
> - * This file is dual-licensed: you can use it either under the terms
> - * of the GPL or the X11 license, at your option. Note that this dual
> - * licensing only applies to this file, and not this project as a
> - * whole.
> - *
> - * a) This file is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU General Public License as
> - * published by the Free Software Foundation; either version 2 of
> - * the License, or (at your option) any later version.
> - *
> - * This file is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - * You should have received a copy of the GNU General Public
> - * License along with this file; if not, write to the Free
> - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> - * MA 02110-1301 USA
> - *
> - * Or, alternatively,
> - *
> - * b) Permission is hereby granted, free of charge, to any person
> - * obtaining a copy of this software and associated documentation
> - * files (the "Software"), to deal in the Software without
> - * restriction, including without limitation the rights to use,
> - * copy, modify, merge, publish, distribute, sublicense, and/or
> - * sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following
> - * conditions:
> - *
> - * The above copyright notice and this permission notice shall be
> - * included in all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> - * OTHER DEALINGS IN THE SOFTWARE.
> + * Copyright 2015-2021 NXP
Srsly, you even add here entirely new copyrights hidden under a SPDX
change.
No, it's not the way to do it.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 05/15] ARM: dts: ls1021a-qds: Add node for QSPI flash
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (3 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 04/15] ARM: dts: ls1021a: change to use SPDX identifiers Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-05 23:47 ` [PATCH 06/15] ARM: dts: ls1021a: update pcie nodes for dt-schema check Li Yang
` (9 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Add the missing node for qspi flash.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a-qds.dts | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm/boot/dts/ls1021a-qds.dts b/arch/arm/boot/dts/ls1021a-qds.dts
index 71bab93bc4cc..86d969d0ef68 100644
--- a/arch/arm/boot/dts/ls1021a-qds.dts
+++ b/arch/arm/boot/dts/ls1021a-qds.dts
@@ -286,6 +286,21 @@
};
};
+&qspi {
+ num-cs = <2>;
+ status = "okay";
+
+ qflash0: flash@0 {
+ compatible = "jedec,spi-nor";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ spi-max-frequency = <20000000>;
+ reg = <0>;
+ spi-rx-bus-width = <4>;
+ spi-tx-bus-width = <4>;
+ };
+};
+
&sai2 {
status = "okay";
};
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 06/15] ARM: dts: ls1021a: update pcie nodes for dt-schema check
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (4 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 05/15] ARM: dts: ls1021a-qds: Add node for QSPI flash Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-05 23:47 ` [PATCH 07/15] ARM: dts: ls1021a: fix board compatible to follow binding schema Li Yang
` (8 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Break up long values to pass dt-schema checks.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a.dtsi | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 4bf6320c85d9..959a3c85b83e 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -842,8 +842,8 @@
pcie@3400000 {
compatible = "fsl,ls1021a-pcie";
- reg = <0x00 0x03400000 0x0 0x00010000 /* controller registers */
- 0x40 0x00000000 0x0 0x00002000>; /* configuration space */
+ reg = <0x00 0x03400000 0x0 0x00010000>, /* controller registers */
+ <0x40 0x00000000 0x0 0x00002000>; /* configuration space */
reg-names = "regs", "config";
interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
fsl,pcie-scfg = <&scfg 0>;
@@ -852,8 +852,8 @@
device_type = "pci";
num-viewport = <6>;
bus-range = <0x0 0xff>;
- ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */
- 0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
+ ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000>, /* downstream I/O */
+ <0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
msi-parent = <&msi1>, <&msi2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
@@ -866,8 +866,8 @@
pcie@3500000 {
compatible = "fsl,ls1021a-pcie";
- reg = <0x00 0x03500000 0x0 0x00010000 /* controller registers */
- 0x48 0x00000000 0x0 0x00002000>; /* configuration space */
+ reg = <0x00 0x03500000 0x0 0x00010000>, /* controller registers */
+ <0x48 0x00000000 0x0 0x00002000>; /* configuration space */
reg-names = "regs", "config";
interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
fsl,pcie-scfg = <&scfg 1>;
@@ -876,8 +876,8 @@
device_type = "pci";
num-viewport = <6>;
bus-range = <0x0 0xff>;
- ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */
- 0x82000000 0x0 0x40000000 0x48 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
+ ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000>, /* downstream I/O */
+ <0x82000000 0x0 0x40000000 0x48 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
msi-parent = <&msi1>, <&msi2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 07/15] ARM: dts: ls1021a: fix board compatible to follow binding schema
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (5 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 06/15] ARM: dts: ls1021a: update pcie nodes for dt-schema check Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-05 23:47 ` [PATCH 08/15] ARM: dts: ls1021a: breakup long values in thermal node Li Yang
` (7 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Align the compatible strings with the board binding defined in schema
file.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a-tsn.dts | 1 +
arch/arm/boot/dts/ls1021a.dtsi | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/ls1021a-tsn.dts b/arch/arm/boot/dts/ls1021a-tsn.dts
index 9d8f0c2a8aba..ce470ebfb2c0 100644
--- a/arch/arm/boot/dts/ls1021a-tsn.dts
+++ b/arch/arm/boot/dts/ls1021a-tsn.dts
@@ -8,6 +8,7 @@
/ {
model = "NXP LS1021A-TSN Board";
+ compatible = "fsl,ls1021a-tsn", "fsl,ls1021a";
sys_mclk: clock-mclk {
compatible = "fixed-clock";
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 959a3c85b83e..215a3d928ec9 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -10,7 +10,6 @@
/ {
#address-cells = <2>;
#size-cells = <2>;
- compatible = "fsl,ls1021a";
interrupt-parent = <&gic>;
aliases {
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 08/15] ARM: dts: ls1021a: breakup long values in thermal node
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (6 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 07/15] ARM: dts: ls1021a: fix board compatible to follow binding schema Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-05 23:47 ` [PATCH 09/15] ARM: dts: ls1021a: fix ifc node to follow binding schema Li Yang
` (6 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Breakup long values to pass the schema check.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a.dtsi | 72 +++++++++++++++++-----------------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 215a3d928ec9..88e7248fc5f0 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -247,42 +247,42 @@
reg = <0x0 0x1f00000 0x0 0x10000>;
interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
fsl,tmu-range = <0xb0000 0x9002c 0x6004e 0x30066>;
- fsl,tmu-calibration = <0x00000000 0x00000020
- 0x00000001 0x00000024
- 0x00000002 0x0000002a
- 0x00000003 0x00000032
- 0x00000004 0x00000038
- 0x00000005 0x0000003e
- 0x00000006 0x00000043
- 0x00000007 0x0000004a
- 0x00000008 0x00000050
- 0x00000009 0x00000059
- 0x0000000a 0x0000005f
- 0x0000000b 0x00000066
-
- 0x00010000 0x00000023
- 0x00010001 0x0000002b
- 0x00010002 0x00000033
- 0x00010003 0x0000003a
- 0x00010004 0x00000042
- 0x00010005 0x0000004a
- 0x00010006 0x00000054
- 0x00010007 0x0000005c
- 0x00010008 0x00000065
- 0x00010009 0x0000006f
-
- 0x00020000 0x00000029
- 0x00020001 0x00000033
- 0x00020002 0x0000003d
- 0x00020003 0x00000048
- 0x00020004 0x00000054
- 0x00020005 0x00000060
- 0x00020006 0x0000006c
-
- 0x00030000 0x00000025
- 0x00030001 0x00000033
- 0x00030002 0x00000043
- 0x00030003 0x00000055>;
+ fsl,tmu-calibration = <0x00000000 0x00000020>,
+ <0x00000001 0x00000024>,
+ <0x00000002 0x0000002a>,
+ <0x00000003 0x00000032>,
+ <0x00000004 0x00000038>,
+ <0x00000005 0x0000003e>,
+ <0x00000006 0x00000043>,
+ <0x00000007 0x0000004a>,
+ <0x00000008 0x00000050>,
+ <0x00000009 0x00000059>,
+ <0x0000000a 0x0000005f>,
+ <0x0000000b 0x00000066>,
+
+ <0x00010000 0x00000023>,
+ <0x00010001 0x0000002b>,
+ <0x00010002 0x00000033>,
+ <0x00010003 0x0000003a>,
+ <0x00010004 0x00000042>,
+ <0x00010005 0x0000004a>,
+ <0x00010006 0x00000054>,
+ <0x00010007 0x0000005c>,
+ <0x00010008 0x00000065>,
+ <0x00010009 0x0000006f>,
+
+ <0x00020000 0x00000029>,
+ <0x00020001 0x00000033>,
+ <0x00020002 0x0000003d>,
+ <0x00020003 0x00000048>,
+ <0x00020004 0x00000054>,
+ <0x00020005 0x00000060>,
+ <0x00020006 0x0000006c>,
+
+ <0x00030000 0x00000025>,
+ <0x00030001 0x00000033>,
+ <0x00030002 0x00000043>,
+ <0x00030003 0x00000055>;
#thermal-sensor-cells = <1>;
};
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 09/15] ARM: dts: ls1021a: fix ifc node to follow binding schema
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (7 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 08/15] ARM: dts: ls1021a: breakup long values in thermal node Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-05 23:47 ` [PATCH 10/15] ARM: dts: ls1021a: remove regulators simple-bus Li Yang
` (5 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Breakup long values in the ifc node. Change the node name to ifc-bus to
follow the schema of simple-bus and disable the bus in the SoC dtsi file
to be enabled only in board dts files.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a-qds.dts | 6 +++---
arch/arm/boot/dts/ls1021a.dtsi | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/ls1021a-qds.dts b/arch/arm/boot/dts/ls1021a-qds.dts
index 86d969d0ef68..9b0f9212e777 100644
--- a/arch/arm/boot/dts/ls1021a-qds.dts
+++ b/arch/arm/boot/dts/ls1021a-qds.dts
@@ -189,9 +189,9 @@
#address-cells = <2>;
#size-cells = <1>;
/* NOR, NAND Flashes and FPGA on board */
- ranges = <0x0 0x0 0x0 0x60000000 0x08000000
- 0x2 0x0 0x0 0x7e800000 0x00010000
- 0x3 0x0 0x0 0x7fb00000 0x00000100>;
+ ranges = <0x0 0x0 0x0 0x60000000 0x08000000>,
+ <0x2 0x0 0x0 0x7e800000 0x00010000>,
+ <0x3 0x0 0x0 0x7fb00000 0x00000100>;
status = "okay";
nor@0,0 {
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 88e7248fc5f0..875202f26450 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -123,10 +123,11 @@
interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
};
- ifc: ifc@1530000 {
+ ifc: ifc-bus@1530000 {
compatible = "fsl,ifc", "simple-bus";
reg = <0x0 0x1530000 0x0 0x10000>;
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
+ status = "disabled";
};
dcfg: dcfg@1ee0000 {
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 10/15] ARM: dts: ls1021a: remove regulators simple-bus
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (8 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 09/15] ARM: dts: ls1021a: fix ifc node to follow binding schema Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-05 23:47 ` [PATCH 11/15] ARM: dts: ls1021a: fix memory node for schema check Li Yang
` (4 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
There is no regulator bus in hardware. So move the regulator nodes out
and remove the regulators simple-bus. This also make the dts align with
the simple-bus schema.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a-qds.dts | 19 ++++++-------------
arch/arm/boot/dts/ls1021a-twr.dts | 19 ++++++-------------
2 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/arch/arm/boot/dts/ls1021a-qds.dts b/arch/arm/boot/dts/ls1021a-qds.dts
index 9b0f9212e777..01fe0e7665f4 100644
--- a/arch/arm/boot/dts/ls1021a-qds.dts
+++ b/arch/arm/boot/dts/ls1021a-qds.dts
@@ -25,19 +25,12 @@
clock-frequency = <24576000>;
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- reg_3p3v: regulator@0 {
- compatible = "regulator-fixed";
- reg = <0>;
- regulator-name = "3P3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
+ reg_3p3v: regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
};
sound {
diff --git a/arch/arm/boot/dts/ls1021a-twr.dts b/arch/arm/boot/dts/ls1021a-twr.dts
index 01bf316bcc99..2f63a9cb755c 100644
--- a/arch/arm/boot/dts/ls1021a-twr.dts
+++ b/arch/arm/boot/dts/ls1021a-twr.dts
@@ -23,19 +23,12 @@
clock-frequency = <24576000>;
};
- regulators {
- compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <0>;
-
- reg_3p3v: regulator@0 {
- compatible = "regulator-fixed";
- reg = <0>;
- regulator-name = "3P3V";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
+ reg_3p3v: regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
};
sound {
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 11/15] ARM: dts: ls1021a: fix memory node for schema check
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (9 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 10/15] ARM: dts: ls1021a: remove regulators simple-bus Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-05 23:47 ` [PATCH 12/15] ARM: dts: ls1021a: add #dma-cells to qdma node Li Yang
` (3 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Fix the following error from "make dtbs_check"
memory: False schema does not allow ...
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 875202f26450..715932b1df58 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -48,7 +48,7 @@
};
};
- memory {
+ memory@0 {
device_type = "memory";
reg = <0x0 0x0 0x0 0x0>;
};
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 12/15] ARM: dts: ls1021a: add #dma-cells to qdma node
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (10 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 11/15] ARM: dts: ls1021a: fix memory node for schema check Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-05 23:47 ` [PATCH 13/15] ARM: dts: ls1021a: add #power-domain-cells for power-controller node Li Yang
` (2 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Add the #dma-cells to align with the dma schema.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 715932b1df58..a6342d69b4ea 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -950,6 +950,7 @@
<GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "qdma-error",
"qdma-queue0", "qdma-queue1";
+ #dma-cells = <2>;
dma-channels = <8>;
block-number = <1>;
block-offset = <0x1000>;
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 13/15] ARM: dts: ls1021a: add #power-domain-cells for power-controller node
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (11 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 12/15] ARM: dts: ls1021a: add #dma-cells to qdma node Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-05 23:47 ` [PATCH 14/15] ARM: dts: ls1021a-qds: change fpga to simple-mfd device Li Yang
2021-02-05 23:47 ` [PATCH 15/15] ARM: dts: ls1021a-tsn: remove undocumented property "position" from mma8452 node Li Yang
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Add the #power-domain-cells for power-controller node as required by the
schema.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index a6342d69b4ea..cf2b5ad42a65 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -964,6 +964,7 @@
compatible = "fsl,ls1021a-rcpm", "fsl,qoriq-rcpm-2.1+";
reg = <0x0 0x1ee2140 0x0 0x8>;
#fsl,rcpm-wakeup-cells = <2>;
+ #power-domain-cells = <0>;
};
ftm_alarm0: timer0@29d0000 {
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 14/15] ARM: dts: ls1021a-qds: change fpga to simple-mfd device
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (12 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 13/15] ARM: dts: ls1021a: add #power-domain-cells for power-controller node Li Yang
@ 2021-02-05 23:47 ` Li Yang
2021-02-05 23:47 ` [PATCH 15/15] ARM: dts: ls1021a-tsn: remove undocumented property "position" from mma8452 node Li Yang
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
The FPGA is not really a bus but more like an MFD device. Change the
compatible string from "simple-bus" to "simple-mfd". This also fix a
node name issue with simple-bus schema.
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a-qds.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/ls1021a-qds.dts b/arch/arm/boot/dts/ls1021a-qds.dts
index 01fe0e7665f4..d311f60170ce 100644
--- a/arch/arm/boot/dts/ls1021a-qds.dts
+++ b/arch/arm/boot/dts/ls1021a-qds.dts
@@ -205,7 +205,7 @@
fpga: board-control@3,0 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "simple-bus";
+ compatible = "simple-mfd";
reg = <0x3 0x0 0x0000100>;
bank-width = <1>;
device-width = <1>;
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [PATCH 15/15] ARM: dts: ls1021a-tsn: remove undocumented property "position" from mma8452 node
2021-02-05 23:47 [PATCH 00/15] Cleanup of LS1021a device trees Li Yang
` (13 preceding siblings ...)
2021-02-05 23:47 ` [PATCH 14/15] ARM: dts: ls1021a-qds: change fpga to simple-mfd device Li Yang
@ 2021-02-05 23:47 ` Li Yang
14 siblings, 0 replies; 25+ messages in thread
From: Li Yang @ 2021-02-05 23:47 UTC (permalink / raw)
To: Shawn Guo, Rob Herring, devicetree, Oleksij Rempel,
Krzysztof Kozlowski, linux-arm-kernel, linux-kernel
Cc: Li Yang
Property "postion" is not documented in the mma8452 binding. Remove it
to resolve the error in "make dtbs_check"
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
arch/arm/boot/dts/ls1021a-tsn.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/ls1021a-tsn.dts b/arch/arm/boot/dts/ls1021a-tsn.dts
index ce470ebfb2c0..8005efc5c812 100644
--- a/arch/arm/boot/dts/ls1021a-tsn.dts
+++ b/arch/arm/boot/dts/ls1021a-tsn.dts
@@ -137,7 +137,6 @@
/* 3 axis accelerometer */
accelerometer@1e {
compatible = "fsl,fxls8471";
- position = <0>;
reg = <0x1e>;
};
--
2.17.1
^ permalink raw reply related [flat|nested] 25+ messages in thread