Commit 4f0c2be3 authored by Arnd Bergmann's avatar Arnd Bergmann

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

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

- Rafal updates the BCM4908 DTS files to produce fewer warnings by
fixing the UART clock name, moving the reboot syscon node out of the bus
node, and finally updating the NAND controller node names.

* tag 'arm-soc/for-5.16/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: bcm4908: Fix UART clock name
  arm64: dts: broadcom: bcm4908: Move reboot syscon out of bus
  arm64: dts: broadcom: bcm4908: Fix NAND node name

Link: https://lore.kernel.org/r/20211013174016.831348-2-f.fainelli@gmail.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 4d3e49a3 6c38c39a
......@@ -292,11 +292,11 @@ uart0: serial@640 {
reg = <0x640 0x18>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&periph_clk>;
clock-names = "periph";
clock-names = "refclk";
status = "okay";
};
nand@1800 {
nand-controller@1800 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.1", "brcm,brcmnand";
......@@ -326,12 +326,12 @@ reset-controller@2644 {
#reset-cells = <1>;
};
};
};
reboot {
compatible = "syscon-reboot";
regmap = <&timer>;
offset = <0x34>;
mask = <1>;
};
reboot {
compatible = "syscon-reboot";
regmap = <&timer>;
offset = <0x34>;
mask = <1>;
};
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment