Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

- Rafal describes the timer/watchdog block for the BCM4908 and BCM6858
SoCs

- Krzysztof corrects invalid "reg" properties for the memory nodes that
were off by one digit

- Pierre updates a number of cache Device Tree node properties to be
schema compliant

* tag 'arm-soc/for-6.2/devicetree-arm64' of https://github.com/Broadcom/stblinux:
arm64: dts: Update cache properties for broadcom
arm64: dts: broadcom: trim addresses to 8 digits
arm64: dts: broadcom: bcmbca: bcm6858: add TWD block
arm64: dts: broadcom: bcmbca: bcm4908: add TWD block timer

Link: https://lore.kernel.org/r/20221129191755.542584-2-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+38 -2
+6
arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
··· 63 63 64 64 l2: l2-cache0 { 65 65 compatible = "cache"; 66 + cache-level = <2>; 66 67 }; 67 68 }; 68 69 ··· 283 282 284 283 #address-cells = <1>; 285 284 #size-cells = <1>; 285 + 286 + timer@0 { 287 + compatible = "brcm,bcm63138-timer"; 288 + reg = <0x0 0x28>; 289 + }; 286 290 287 291 watchdog@28 { 288 292 compatible = "brcm,bcm6345-wdt";
+1
arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi
··· 51 51 52 52 L2_0: l2-cache0 { 53 53 compatible = "cache"; 54 + cache-level = <2>; 54 55 }; 55 56 }; 56 57
+1
arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi
··· 35 35 36 36 L2_0: l2-cache0 { 37 37 compatible = "cache"; 38 + cache-level = <2>; 38 39 }; 39 40 }; 40 41
+1
arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi
··· 51 51 52 52 L2_0: l2-cache0 { 53 53 compatible = "cache"; 54 + cache-level = <2>; 54 55 }; 55 56 }; 56 57
+1
arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi
··· 51 51 52 52 L2_0: l2-cache0 { 53 53 compatible = "cache"; 54 + cache-level = <2>; 54 55 }; 55 56 }; 56 57
+1
arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi
··· 35 35 36 36 L2_0: l2-cache0 { 37 37 compatible = "cache"; 38 + cache-level = <2>; 38 39 }; 39 40 }; 40 41
+20
arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi
··· 50 50 }; 51 51 L2_0: l2-cache0 { 52 52 compatible = "cache"; 53 + cache-level = <2>; 53 54 }; 54 55 }; 55 56 ··· 109 108 #address-cells = <1>; 110 109 #size-cells = <1>; 111 110 ranges = <0x0 0x0 0xff800000 0x62000>; 111 + 112 + twd: timer-mfd@400 { 113 + compatible = "brcm,bcm4908-twd", "simple-mfd", "syscon"; 114 + reg = <0x400 0x4c>; 115 + ranges = <0x0 0x400 0x4c>; 116 + 117 + #address-cells = <1>; 118 + #size-cells = <1>; 119 + 120 + timer@0 { 121 + compatible = "brcm,bcm63138-timer"; 122 + reg = <0x0 0x28>; 123 + }; 124 + 125 + watchdog@28 { 126 + compatible = "brcm,bcm6345-wdt"; 127 + reg = <0x28 0x8>; 128 + }; 129 + }; 112 130 113 131 uart0: serial@640 { 114 132 compatible = "brcm,bcm6345-uart";
+1 -1
arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
··· 52 52 53 53 memory { 54 54 device_type = "memory"; 55 - reg = <0x000000000 0x80000000 0x00000000 0x40000000>; 55 + reg = <0x00000000 0x80000000 0x00000000 0x40000000>; 56 56 }; 57 57 }; 58 58
+1 -1
arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
··· 49 49 50 50 memory { 51 51 device_type = "memory"; 52 - reg = <0x000000000 0x80000000 0x00000001 0x00000000>; 52 + reg = <0x00000000 0x80000000 0x00000001 0x00000000>; 53 53 }; 54 54 }; 55 55
+1
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
··· 79 79 80 80 CLUSTER0_L2: l2-cache@0 { 81 81 compatible = "cache"; 82 + cache-level = <2>; 82 83 }; 83 84 }; 84 85
+4
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
··· 108 108 109 109 CLUSTER0_L2: l2-cache@0 { 110 110 compatible = "cache"; 111 + cache-level = <2>; 111 112 }; 112 113 113 114 CLUSTER1_L2: l2-cache@100 { 114 115 compatible = "cache"; 116 + cache-level = <2>; 115 117 }; 116 118 117 119 CLUSTER2_L2: l2-cache@200 { 118 120 compatible = "cache"; 121 + cache-level = <2>; 119 122 }; 120 123 121 124 CLUSTER3_L2: l2-cache@300 { 122 125 compatible = "cache"; 126 + cache-level = <2>; 123 127 }; 124 128 }; 125 129