Commit 50512886 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

ARM: dts: rcar-gen2: Fix PCI high address in interrupt-map-mask 



"make dtbs_check" emits warnings like:

    pci@ee090000: interrupt-map-mask:0:0: 65280 is greater than the maximum of 63488
    pci@ee0b0000: interrupt-map-mask:0:0: 65280 is greater than the maximum of 63488
    pci@ee0d0000: interrupt-map-mask:0:0: 65280 is greater than the maximum of 63488

According to dt-schemas/schemas/pci/pci-bus.yaml, the PCI high address
cell value in the "interrupt-map-mask" property must lie in the range
0..0xf800.

Fix this by correcting the values from 0xff00 to 0xf800 in all affected
R-Car Gen2 and RZ/G1 DTS files.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20191213162459.1731-1-geert+renesas@glider.be
parent f54e670d

arch/arm/boot/dts/r8a7743.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1461,7 +1461,7 @@ pci0: pci@ee090000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
@@ -1496,7 +1496,7 @@ pci1: pci@ee0d0000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/r8a7744.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1461,7 +1461,7 @@ pci0: pci@ee090000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
@@ -1496,7 +1496,7 @@ pci1: pci@ee0d0000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/r8a7745.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1337,7 +1337,7 @@ pci0: pci@ee090000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
@@ -1372,7 +1372,7 @@ pci1: pci@ee0d0000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/r8a7790.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ pci0: pci@ee090000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
@@ -1423,7 +1423,7 @@ pci1: pci@ee0b0000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee0a0000 0 0xee0a0000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;
@@ -1446,7 +1446,7 @@ pci2: pci@ee0d0000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/r8a7791.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ pci0: pci@ee090000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee080000 0 0xee080000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
@@ -1461,7 +1461,7 @@ pci1: pci@ee0d0000 { 
			#size-cells = <2>;

			#interrupt-cells = <1>;

			ranges = <0x02000000 0 0xee0c0000 0 0xee0c0000 0 0x00010000>;

			interrupt-map-mask = <0xff00 0 0 0x7>;

			interrupt-map-mask = <0xf800 0 0 0x7>;

			interrupt-map = <0x0000 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

					<0x0800 0 0 1 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

					<0x1000 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;