mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-08 03:40:35 +09:00
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>
This commit is contained in:
@@ -294,7 +294,7 @@
|
||||
clock-names = "apb_pclk";
|
||||
};
|
||||
|
||||
smmu: mmu@64000000 {
|
||||
smmu: iommu@64000000 {
|
||||
compatible = "arm,mmu-500";
|
||||
reg = <0x64000000 0x40000>;
|
||||
#global-interrupts = <2>;
|
||||
|
||||
@@ -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>;
|
||||
|
||||
Reference in New Issue
Block a user