Skip to content

L
linux
Commit f54e670d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files
Options

ARM: dts: renesas: Group tuples in pci ranges and dma-ranges properties 

To improve human readability and enable automatic validation, the tuples
in the "ranges" and "dma-ranges" properties of PCI devices nodes should
be grouped.  Not doing so causes "make dtbs_check" to emit warnings
like:

    pcie@fe000000: dma-ranges: [[1107296256, 0, 1073741824, 0, 1073741824, 0, 2147483648, 1124073472, 2, 0, 2, 0, 1, 0]] is not valid under any of the given schemas (Possible causes of the failure):
    pcie@fe000000: dma-ranges: [[1107296256, 0, 1073741824, 0, 1073741824, 0, 2147483648, 1124073472, 2, 0, 2, 0, 1, 0]] is not of type 'boolean'
    pcie@fe000000: dma-ranges:0: [1107296256, 0, 1073741824, 0, 1073741824, 0, 2147483648, 1124073472, 2, 0, 2, 0, 1, 0] is too long

Fix this by grouping the tuples of the "ranges" and "dma-ranges"
properties using angle brackets.
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20191213164115.3697-5-geert+renesas@glider.beReviewed-by: default avatarUlrich Hecht <uli+renesas@fpond.eu>
parent c2e952ef
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
arch/arm/boot/dts/r8a7743.dtsi
View file @ f54e670d
...@@ -1611,13 +1611,13 @@ pciec: pcie@fe000000 { ...@@ -1611,13 +1611,13 @@ pciec: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000 dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>,
0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>; <0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/r8a7744.dtsi
View file @ f54e670d
...@@ -1597,13 +1597,13 @@ pciec: pcie@fe000000 { ...@@ -1597,13 +1597,13 @@ pciec: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000 dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>,
0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>; <0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/r8a7790.dtsi
View file @ f54e670d
...@@ -1614,13 +1614,13 @@ pciec: pcie@fe000000 { ...@@ -1614,13 +1614,13 @@ pciec: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000 dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>,
0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>; <0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/r8a7791.dtsi
View file @ f54e670d
...@@ -1598,13 +1598,13 @@ pciec: pcie@fe000000 { ...@@ -1598,13 +1598,13 @@ pciec: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x08000000 <0x02000000 0 0x30000000 0 0x30000000 0 0x08000000>,
0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>; <0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000 dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>,
0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>; <0x43000000 2 0x00000000 2 0x00000000 1 0x00000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7