Skip to content

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

arm64: 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 device nodes should
be grouped.

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-8-geert+renesas@glider.beReviewed-by: default avatarUlrich Hecht <uli+renesas@fpond.eu>
parent 0aab5b91
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 56 deletions
arch/arm64/boot/dts/renesas/r8a774a1.dtsi
View file @ 9504a9f2
...@@ -2323,10 +2323,10 @@ pciec0: pcie@fe000000 { ...@@ -2323,10 +2323,10 @@ pciec0: 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>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
...@@ -2350,10 +2350,10 @@ pciec1: pcie@ee800000 { ...@@ -2350,10 +2350,10 @@ pciec1: pcie@ee800000 {
#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 0xee900000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000>,
0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000 <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000 <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>; <0x42000000 0 0xc8000000 0 0xc8000000 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>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a774b1.dtsi
View file @ 9504a9f2
...@@ -2192,10 +2192,10 @@ pciec0: pcie@fe000000 { ...@@ -2192,10 +2192,10 @@ pciec0: 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>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
...@@ -2219,10 +2219,10 @@ pciec1: pcie@ee800000 { ...@@ -2219,10 +2219,10 @@ pciec1: pcie@ee800000 {
#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 0xee900000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000>,
0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000 <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000 <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>; <0x42000000 0 0xc8000000 0 0xc8000000 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>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a774c0.dtsi
View file @ 9504a9f2
...@@ -1679,10 +1679,10 @@ pciec0: pcie@fe000000 { ...@@ -1679,10 +1679,10 @@ pciec0: 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 0x40000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a7795.dtsi
View file @ 9504a9f2
...@@ -2679,10 +2679,10 @@ pciec0: pcie@fe000000 { ...@@ -2679,10 +2679,10 @@ pciec0: 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 0x40000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
...@@ -2706,10 +2706,10 @@ pciec1: pcie@ee800000 { ...@@ -2706,10 +2706,10 @@ pciec1: pcie@ee800000 {
#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 0xee900000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000>,
0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000 <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000 <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>; <0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>;
/* Map all possible DDR as inbound ranges */ /* Map all possible DDR as inbound ranges */
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a77960.dtsi
View file @ 9504a9f2
...@@ -2462,10 +2462,10 @@ pciec0: pcie@fe000000 { ...@@ -2462,10 +2462,10 @@ pciec0: 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>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
...@@ -2489,10 +2489,10 @@ pciec1: pcie@ee800000 { ...@@ -2489,10 +2489,10 @@ pciec1: pcie@ee800000 {
#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 0xee900000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000>,
0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000 <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000 <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>; <0x42000000 0 0xc8000000 0 0xc8000000 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>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a77965.dtsi
View file @ 9504a9f2
...@@ -2184,10 +2184,10 @@ pciec0: pcie@fe000000 { ...@@ -2184,10 +2184,10 @@ pciec0: 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>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
...@@ -2211,10 +2211,10 @@ pciec1: pcie@ee800000 { ...@@ -2211,10 +2211,10 @@ pciec1: pcie@ee800000 {
#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 0xee900000 0 0x00100000 ranges = <0x01000000 0 0x00000000 0 0xee900000 0 0x00100000>,
0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000 <0x02000000 0 0xeea00000 0 0xeea00000 0 0x00200000>,
0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000 <0x02000000 0 0xc0000000 0 0xc0000000 0 0x08000000>,
0x42000000 0 0xc8000000 0 0xc8000000 0 0x08000000>; <0x42000000 0 0xc8000000 0 0xc8000000 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>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
......
arch/arm64/boot/dts/renesas/r8a77980.dtsi
View file @ 9504a9f2
...@@ -1367,14 +1367,11 @@ pciec: pcie@fe000000 { ...@@ -1367,14 +1367,11 @@ pciec: pcie@fe000000 {
#size-cells = <2>; #size-cells = <2>;
bus-range = <0x00 0xff>; bus-range = <0x00 0xff>;
device_type = "pci"; device_type = "pci";
ranges = < ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x0100000>,
0x01000000 0 0x00000000 0 0xfe100000 0 0x0100000 <0x02000000 0 0xfe200000 0 0xfe200000 0 0x0200000>,
0x02000000 0 0xfe200000 0 0xfe200000 0 0x0200000 <0x02000000 0 0x30000000 0 0x30000000 0 0x8000000>,
0x02000000 0 0x30000000 0 0x30000000 0 0x8000000 <0x42000000 0 0x38000000 0 0x38000000 0 0x8000000>;
0x42000000 0 0x38000000 0 0x38000000 0 0x8000000 dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000>;
>;
dma-ranges = <0x42000000 0 0x40000000 0 0x40000000
0 0x80000000>;
interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 149 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm64/boot/dts/renesas/r8a77990.dtsi
View file @ 9504a9f2
...@@ -1635,10 +1635,10 @@ pciec0: pcie@fe000000 { ...@@ -1635,10 +1635,10 @@ pciec0: 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 0x40000000>; dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x40000000>;
interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 116 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