diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-08-21 22:06:34 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-08-21 22:07:57 -0400 |
| commit | 924832b8677f74895678ac589e9fff9add48e5a8 (patch) | |
| tree | fa5a032bfa5b33c32eb47caf6d4d3ae6aae34f8a /arch/arm64/boot/dts | |
| parent | 44762a0c82fd33fbbcead6430e857b01bf1773a8 (diff) | |
| parent | a3660e59a9e49c4c1b8042185e7d39ec4a70f287 (diff) | |
Merge tag 'arm-soc/for-6.6/devicetree-arm64' of https://github.com/Broadcom/stblinux into soc/dt
This pull request contains Broadcom ARM64-based Device Tree changes for
6.6, please pull the following:
- Krzysztof adds missing spaces between node names/labels
* tag 'arm-soc/for-6.6/devicetree-arm64' of https://github.com/Broadcom/stblinux:
arm64: dts: broadcom: add missing space before {
Link: https://lore.kernel.org/r/20230818164539.2871539-2-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts')
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi index f549bda8c48c..2f124b027bbf 100644 --- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi +++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi @@ -577,7 +577,7 @@ #size-cells = <0>; }; - hsspi: spi@1000{ + hsspi: spi@1000 { #address-cells = <1>; #size-cells = <0>; compatible = "brcm,bcm4908-hsspi", "brcm,bcmbca-hsspi-v1.0"; diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts b/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts index 699f7742ce7f..1d314f17bbdd 100644 --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts @@ -114,7 +114,7 @@ reg = <0x04000000 0x06400000>; /* 100MB */ }; - partition@a400000{ + partition@a400000 { label = "ncustfs"; reg = <0x0a400000 0x35c00000>; /* 860MB */ }; diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi index 7aece79bf882..f049687d6b96 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi @@ -565,7 +565,7 @@ iommus = <&smmu 0x6000 0x0000>; }; - enet: ethernet@340000{ + enet: ethernet@340000 { compatible = "brcm,amac"; reg = <0x00340000 0x1000>; reg-names = "amac_base"; |