Commit 0988e8e2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-4.18/devicetree-fixes' of https://github.com/Broadcom/stblinux into fixes 

This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
4.18, please pull the following:

- Ray fixes the I2C and PCIe interrupt types for the Cygnus SoC

- Florian fixes the I2C and PCIe interrupts for the Northstar
  (BCM5301x), Northstar Plus and Hurricane 2 SoCs

* tag 'arm-soc/for-4.18/devicetree-fixes' of https://github.com/Broadcom/stblinux

:
  ARM: dts: Cygnus: Fix PCIe controller interrupt type
  ARM: dts: Cygnus: Fix I2C controller interrupt type
  ARM: dts: BCM5301x: Fix i2c controller interrupt type
  ARM: dts: HR2: Fix interrupt types for i2c and PCIe
  ARM: dts: NSP: Fix PCIe controllers interrupt types
  ARM: dts: NSP: Fix i2c controller interrupt type

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 652caf4a 6cb1628a

arch/arm/boot/dts/bcm-cygnus.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ 
			reg = <0x18008000 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <100000>;

			status = "disabled";

		};
@@ -245,7 +245,7 @@ 
			reg = <0x1800b000 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <100000>;

			status = "disabled";

		};
@@ -256,7 +256,7 @@ 


			#interrupt-cells = <1>;

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

			interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>;

			interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;



			linux,pci-domain = <0>;
@@ -278,10 +278,10 @@ 
				compatible = "brcm,iproc-msi";

				msi-controller;

				interrupt-parent = <&gic>;

				interrupts = <GIC_SPI 96 IRQ_TYPE_NONE>,

					     <GIC_SPI 97 IRQ_TYPE_NONE>,

					     <GIC_SPI 98 IRQ_TYPE_NONE>,

					     <GIC_SPI 99 IRQ_TYPE_NONE>;

				interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;

			};

		};
@@ -291,7 +291,7 @@ 


			#interrupt-cells = <1>;

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

			interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>;

			interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;



			linux,pci-domain = <1>;
@@ -313,10 +313,10 @@ 
				compatible = "brcm,iproc-msi";

				msi-controller;

				interrupt-parent = <&gic>;

				interrupts = <GIC_SPI 102 IRQ_TYPE_NONE>,

					     <GIC_SPI 103 IRQ_TYPE_NONE>,

					     <GIC_SPI 104 IRQ_TYPE_NONE>,

					     <GIC_SPI 105 IRQ_TYPE_NONE>;

				interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;

			};

		};

arch/arm/boot/dts/bcm-hr2.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ 
			reg = <0x38000 0x50>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 95 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <100000>;

		};
@@ -279,7 +279,7 @@ 
			reg = <0x3b000 0x50>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 96 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <100000>;

		};

	};
@@ -300,7 +300,7 @@ 


		#interrupt-cells = <1>;

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

		interrupt-map = <0 0 0 0 &gic GIC_SPI 186 IRQ_TYPE_NONE>;

		interrupt-map = <0 0 0 0 &gic GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;



		linux,pci-domain = <0>;
@@ -322,10 +322,10 @@ 
			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;

			interrupts = <GIC_SPI 182 IRQ_TYPE_NONE>,

				     <GIC_SPI 183 IRQ_TYPE_NONE>,

				     <GIC_SPI 184 IRQ_TYPE_NONE>,

				     <GIC_SPI 185 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>;

			brcm,pcie-msi-inten;

		};

	};
@@ -336,7 +336,7 @@ 


		#interrupt-cells = <1>;

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

		interrupt-map = <0 0 0 0 &gic GIC_SPI 192 IRQ_TYPE_NONE>;

		interrupt-map = <0 0 0 0 &gic GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>;



		linux,pci-domain = <1>;
@@ -358,10 +358,10 @@ 
			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;

			interrupts = <GIC_SPI 188 IRQ_TYPE_NONE>,

				     <GIC_SPI 189 IRQ_TYPE_NONE>,

				     <GIC_SPI 190 IRQ_TYPE_NONE>,

				     <GIC_SPI 191 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;

			brcm,pcie-msi-inten;

		};

	};

arch/arm/boot/dts/bcm-nsp.dtsi

+16 −16
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ 
			reg = <0x38000 0x50>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;

			clock-frequency = <100000>;

			dma-coherent;

			status = "disabled";
@@ -496,7 +496,7 @@ 


		#interrupt-cells = <1>;

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

		interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_NONE>;

		interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;



		linux,pci-domain = <0>;
@@ -519,10 +519,10 @@ 
			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;

			interrupts = <GIC_SPI 127 IRQ_TYPE_NONE>,

				     <GIC_SPI 128 IRQ_TYPE_NONE>,

				     <GIC_SPI 129 IRQ_TYPE_NONE>,

				     <GIC_SPI 130 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;

			brcm,pcie-msi-inten;

		};

	};
@@ -533,7 +533,7 @@ 


		#interrupt-cells = <1>;

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

		interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_NONE>;

		interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;



		linux,pci-domain = <1>;
@@ -556,10 +556,10 @@ 
			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;

			interrupts = <GIC_SPI 133 IRQ_TYPE_NONE>,

				     <GIC_SPI 134 IRQ_TYPE_NONE>,

				     <GIC_SPI 135 IRQ_TYPE_NONE>,

				     <GIC_SPI 136 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;

			brcm,pcie-msi-inten;

		};

	};
@@ -570,7 +570,7 @@ 


		#interrupt-cells = <1>;

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

		interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_NONE>;

		interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;



		linux,pci-domain = <2>;
@@ -593,10 +593,10 @@ 
			compatible = "brcm,iproc-msi";

			msi-controller;

			interrupt-parent = <&gic>;

			interrupts = <GIC_SPI 139 IRQ_TYPE_NONE>,

				     <GIC_SPI 140 IRQ_TYPE_NONE>,

				     <GIC_SPI 141 IRQ_TYPE_NONE>,

				     <GIC_SPI 142 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;

			brcm,pcie-msi-inten;

		};

	};

arch/arm/boot/dts/bcm5301x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ 
	i2c0: i2c@18009000 {

		compatible = "brcm,iproc-i2c";

		reg = <0x18009000 0x50>;

		interrupts = <GIC_SPI 121 IRQ_TYPE_NONE>;

		interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;

		#address-cells = <1>;

		#size-cells = <0>;

		clock-frequency = <100000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE