Commit 5f37a0d9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-5.10/devicetree-arm64' of https://github.com/Broadcom/stblinux into arm/dt 

This pull request contains Broadcom ARM64-based SoCs changes for 5.10,
please pull the following:

- Adrian changes the status properties from "ok" to "okay"

- Andre fixes the SP805 watchdog nodes to have the correct clock names
  and binding for the Northstar 2 platform

* tag 'arm-soc/for-5.10/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: Fix SP805 clock-names
  arm64: dts: broadcom: replace status value "ok" by "okay"

Link: https://lore.kernel.org/r/20200912032153.1216354-2-f.fainelli@gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ba601120 6534dfbb

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

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ wdt0: watchdog@66090000 { 
			reg = <0x66090000 0x1000>;

			interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&iprocslow>, <&iprocslow>;

			clock-names = "wdogclk", "apb_pclk";

			clock-names = "wdog_clk", "apb_pclk";

		};



		gpio_g: gpio@660a0000 {

arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ &enet { 
};



&nand {

	status = "ok";

	status = "okay";

	nandcs@0 {

		compatible = "brcm,nandcs";

		reg = <0>;

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

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ wdt0: watchdog@c0000 { 
			reg = <0x000c0000 0x1000>;

			interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&hsls_25m_div2_clk>, <&hsls_div4_clk>;

			clock-names = "wdogclk", "apb_pclk";

			clock-names = "wdog_clk", "apb_pclk";

			timeout-sec = <60>;

		};