mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-26 13:22:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2023-01-30 22:55:59 +01:00
parent 0c826ec36d 3a7b283821
commit d18eff504d
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
View File

@@ -294,7 +294,7 @@ dma0: dma-controller@61360000 {
clock-names = "apb_pclk";
};
smmu: mmu@64000000 {
smmu: iommu@64000000 {
compatible = "arm,mmu-500";
reg = <0x64000000 0x40000>;
#global-interrupts = <2>;

6
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
View File

@@ -186,7 +186,7 @@ gic_its: gic-its@63c20000 {
};
};
smmu: mmu@3000000 {
smmu: iommu@3000000 {
compatible = "arm,mmu-500";
reg = <0x03000000 0x80000>;
#global-interrupts = <1>;
@@ -475,7 +475,6 @@ i2c1: i2c@e0000 {
};
uart0: serial@100000 {
device_type = "serial";
compatible = "snps,dw-apb-uart";
reg = <0x00100000 0x1000>;
reg-shift = <2>;
@@ -486,7 +485,6 @@ uart0: serial@100000 {
};
uart1: serial@110000 {
device_type = "serial";
compatible = "snps,dw-apb-uart";
reg = <0x00110000 0x1000>;
reg-shift = <2>;
@@ -497,7 +495,6 @@ uart1: serial@110000 {
};
uart2: serial@120000 {
device_type = "serial";
compatible = "snps,dw-apb-uart";
reg = <0x00120000 0x1000>;
reg-shift = <2>;
@@ -508,7 +505,6 @@ uart2: serial@120000 {
};
uart3: serial@130000 {
device_type = "serial";
compatible = "snps,dw-apb-uart";
reg = <0x00130000 0x1000>;
reg-shift = <2>;