Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8a78bdb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "A handful of fixes, nothing really concerning and most touching
  devicetree files for various platforms.

  I also regenerated the shared multiplatform defconfigs; they have
  drifted quite a bit due to Kconfig changes and reordering, and several
  platform maintainers tried doing the same which resulted in a lot of
  conflict pain -- this way we get everybody onto the same base for next
  merge window"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
  arm64: dts: uniphier: fix widget name of headphone for LD11/LD20 boards
  ARM: dts: Fix SPI node for Arria10
  arm64: dts: stratix10: Fix SPI nodes for Stratix10
  qcom: cmd-db: enforce CONFIG_OF_RESERVED_MEM dependency
  ARM: Always build secure_cntvoff.S on ARM V7 to fix shmobile !SMP build
  ARM: multi_v7_defconfig: renormalize based on recent additions
  arm64: defconfig: renormalize based on recent additions
  arm64: dts: msm8916: fix Coresight ETF graph connections
  arm64: dts: apq8096-db820c: disable uart0 by default
  ARM: dts: imx6sx: fix irq for pcie bridge
  arm64: dts: Stingray: Fix I2C controller interrupt type
  arm64: dts: ns2: Fix PCIe controller interrupt type
  arm64: dts: ns2: Fix I2C controller interrupt type
  arm64: dts: specify 1.8V EMMC capabilities for bcm958742t
  arm64: dts: specify 1.8V EMMC capabilities for bcm958742k
  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
  ...
parents 22c3b152 86676c46

MAINTAINERS

+5 −1
Original line number Diff line number Diff line
@@ -2971,9 +2971,13 @@ N: bcm585* 
N:	bcm586*

N:	bcm88312

N:	hr2

F:	arch/arm64/boot/dts/broadcom/ns2*

N:	stingray

F:	arch/arm64/boot/dts/broadcom/northstar2/*

F:	arch/arm64/boot/dts/broadcom/stingray/*

F:	drivers/clk/bcm/clk-ns*

F:	drivers/clk/bcm/clk-sr*

F:	drivers/pinctrl/bcm/pinctrl-ns*

F:	include/dt-bindings/clock/bcm-sr*



BROADCOM KONA GPIO DRIVER

M:	Ray Jui <rjui@broadcom.com>

arch/arm/boot/dts/armada-385-synology-ds116.dts

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ 
					      3700 5

					      3900 6

					      4000 7>;

			cooling-cells = <2>;

			#cooling-cells = <2>;

		};



		gpio-leds {

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;

		};

	};