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

Commit 1864f527 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

- Stefan provides a fix for the BCM2835 (Raspberry Pi) to fix warnings about
  missing "#phy-cells" properties

- Florian provides two fixes for Nortsthar Plus, one that uses the correct
  interrupt specifiers for the timer/watchdog and one that disables SATA
  on BCM9582**HR boards since that leads to unidentified hangs right now

* tag 'arm-soc/for-4.15/devicetree-fixes-1' of http://github.com/Broadcom/stblinux

:
  ARM: dts: NSP: Fix PPI interrupt types
  ARM: dts: NSP: Disable AHCI controller for HR NSP boards
  ARM: dts: bcm283x: Fix DTC warnings about missing phy-cells

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 615af08e babd8a3e

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

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
		timer@20200 {

			compatible = "arm,cortex-a9-global-timer";

			reg = <0x20200 0x100>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;

			clocks = <&periph_clk>;

		};
@@ -93,7 +93,7 @@ 
			compatible = "arm,cortex-a9-twd-timer";

			reg = <0x20600 0x20>;

			interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |

						  IRQ_TYPE_LEVEL_HIGH)>;

						  IRQ_TYPE_EDGE_RISING)>;

			clocks = <&periph_clk>;

		};

arch/arm/boot/dts/bcm283x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -639,5 +639,6 @@ 


	usbphy: phy {

		compatible = "usb-nop-xceiv";

		#phy-cells = <0>;

	};

};

arch/arm/boot/dts/bcm958623hr.dts

+0 −4
Original line number Diff line number Diff line
@@ -141,10 +141,6 @@ 
	status = "okay";

};



&sata {

	status = "okay";

};



&qspi {

	bspi-sel = <0>;

	flash: m25p80@0 {

arch/arm/boot/dts/bcm958625hr.dts

+0 −4
Original line number Diff line number Diff line
@@ -177,10 +177,6 @@ 
	status = "okay";

};



&sata {

	status = "okay";

};



&srab {

	compatible = "brcm,bcm58625-srab", "brcm,nsp-srab";

	status = "okay";