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

Commit 0fa974b8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.11/devicetree-arm64-fixes' of... 

Merge tag 'arm-soc/for-4.11/devicetree-arm64-fixes' of http://github.com/Broadcom/stblinux into fixes

Pull "Broadcom arm64 Device Tree fixes for 4.11" from Florian Fainelli:

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

- Jon adds missing "dma-coherent" property to the Northstar 2 DTS include file
  in order to fix both performance and cache problems for: PCIe, Ethernet,
  PDC/mailbox, SATA3 and SDHCI

* tag 'arm-soc/for-4.11/devicetree-arm64-fixes' of http://github.com/Broadcom/stblinux:
  arm64: dts: NS2: Add dma-coherent to relevant DT entries
parents bf3f5308 f0c0cb99

arch/arm64/boot/dts/broadcom/ns2.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ 
	pcie0: pcie@20020000 {

		compatible = "brcm,iproc-pcie";

		reg = <0 0x20020000 0 0x1000>;

		dma-coherent;



		#interrupt-cells = <1>;

		interrupt-map-mask = <0 0 0 0>;
@@ -144,6 +145,7 @@ 
	pcie4: pcie@50020000 {

		compatible = "brcm,iproc-pcie";

		reg = <0 0x50020000 0 0x1000>;

		dma-coherent;



		#interrupt-cells = <1>;

		interrupt-map-mask = <0 0 0 0>;
@@ -174,6 +176,7 @@ 
	pcie8: pcie@60c00000 {

		compatible = "brcm,iproc-pcie-paxc";

		reg = <0 0x60c00000 0 0x1000>;

		dma-coherent;

		linux,pci-domain = <8>;



		bus-range = <0x0 0x1>;
@@ -203,6 +206,7 @@ 
			      <0x61030000 0x100>;

			reg-names = "amac_base", "idm_base", "nicpm_base";

			interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>;

			dma-coherent;

			phy-handle = <&gphy0>;

			phy-mode = "rgmii";

			status = "disabled";
@@ -213,6 +217,7 @@ 
			reg = <0x612c0000 0x445>;  /* PDC FS0 regs */

			interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;

			#mbox-cells = <1>;

			dma-coherent;

			brcm,rx-status-len = <32>;

			brcm,use-bcm-hdr;

		};
@@ -222,6 +227,7 @@ 
			reg = <0x612e0000 0x445>;  /* PDC FS1 regs */

			interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;

			#mbox-cells = <1>;

			dma-coherent;

			brcm,rx-status-len = <32>;

			brcm,use-bcm-hdr;

		};
@@ -231,6 +237,7 @@ 
			reg = <0x61300000 0x445>;  /* PDC FS2 regs */

			interrupts = <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;

			#mbox-cells = <1>;

			dma-coherent;

			brcm,rx-status-len = <32>;

			brcm,use-bcm-hdr;

		};
@@ -240,6 +247,7 @@ 
			reg = <0x61320000 0x445>;  /* PDC FS3 regs */

			interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;

			#mbox-cells = <1>;

			dma-coherent;

			brcm,rx-status-len = <32>;

			brcm,use-bcm-hdr;

		};
@@ -644,6 +652,7 @@ 
		sata: ahci@663f2000 {

			compatible = "brcm,iproc-ahci", "generic-ahci";

			reg = <0x663f2000 0x1000>;

			dma-coherent;

			reg-names = "ahci";

			interrupts = <GIC_SPI 438 IRQ_TYPE_LEVEL_HIGH>;

			#address-cells = <1>;
@@ -667,6 +676,7 @@ 
			compatible = "brcm,sdhci-iproc-cygnus";

			reg = <0x66420000 0x100>;

			interrupts = <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>;

			dma-coherent;

			bus-width = <8>;

			clocks = <&genpll_sw BCM_NS2_GENPLL_SW_SDIO_CLK>;

			status = "disabled";
@@ -676,6 +686,7 @@ 
			compatible = "brcm,sdhci-iproc-cygnus";

			reg = <0x66430000 0x100>;

			interrupts = <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;

			dma-coherent;

			bus-width = <8>;

			clocks = <&genpll_sw BCM_NS2_GENPLL_SW_SDIO_CLK>;

			status = "disabled";