diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-01-30 22:55:59 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-01-30 22:56:00 +0100 |
| commit | d18eff504da5cb3e03fc0a38fce671ee7087be85 (patch) | |
| tree | bcd91679e8b55073146560e0c65b93651e67f2f8 | |
| parent | 0c826ec36dbff5a8a39e5f553c7144ebe2717319 (diff) | |
| parent | 3a7b283821650ed1437ab50a8e5f14381c4436db (diff) | |
Merge tag 'arm-soc/for-6.3/devicetree-arm64' of https://github.com/Broadcom/stblinux into arm/dt
This pull request contains Broadcom ARM64 SoCs Device Tree updates for
6.3, please pull the following:
- Krzysztof aligns the SMMMU Device Tree nodes to use the desired
regular expression matched by the dtschema and he also removes the
deprecated "device_type" property for serial node(s)
* tag 'arm-soc/for-6.3/devicetree-arm64' of https://github.com/Broadcom/stblinux:
arm64: dts: broadcom: drop deprecated serial device_type
arm64: dts: broadcom: align SMMU node names with DT schema
Link: https://lore.kernel.org/r/20230128193834.1628831-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi index 18cdbc20f03f..e1b80e569cdf 100644 --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi @@ -294,7 +294,7 @@ clock-names = "apb_pclk"; }; - smmu: mmu@64000000 { + smmu: iommu@64000000 { compatible = "arm,mmu-500"; reg = <0x64000000 0x40000>; #global-interrupts = <2>; diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi index e05901abe957..a9186166c068 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi @@ -186,7 +186,7 @@ }; }; - smmu: mmu@3000000 { + smmu: iommu@3000000 { compatible = "arm,mmu-500"; reg = <0x03000000 0x80000>; #global-interrupts = <1>; @@ -475,7 +475,6 @@ }; uart0: serial@100000 { - device_type = "serial"; compatible = "snps,dw-apb-uart"; reg = <0x00100000 0x1000>; reg-shift = <2>; @@ -486,7 +485,6 @@ }; uart1: serial@110000 { - device_type = "serial"; compatible = "snps,dw-apb-uart"; reg = <0x00110000 0x1000>; reg-shift = <2>; @@ -497,7 +495,6 @@ }; uart2: serial@120000 { - device_type = "serial"; compatible = "snps,dw-apb-uart"; reg = <0x00120000 0x1000>; reg-shift = <2>; @@ -508,7 +505,6 @@ }; uart3: serial@130000 { - device_type = "serial"; compatible = "snps,dw-apb-uart"; reg = <0x00130000 0x1000>; reg-shift = <2>; |