superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmPVeP4ACgkQh9CWnEQH
 BwR3nhAAt6qOVqHTkCTXVvazDxYk8R9RshQTS5gftmPioV6NgP/EUmR9RJo/Mmx1
 CIjAgzS/1JDe/3qoSbxnUsZL+AkKz7GU/Fa91siweRQ2GHFsTHBA1wmzPpNvV6Ll
 zr571FynfUbx/wD5sjDKUXH2Ryw2mKt6pja7dAyEW/wv20PnWP67stiiZI4NwMXL
 ZlH18v8IdMeX7U3Gz5XKqRbimXRDHuWPIpUD8Jrv5iROb0Imu1B4OE8fLQCn9ZtE
 a4yfZQps4y+WJPm9r0N15j51Dky0xq8F6EuUn7aSECkimSURntIvMZ8TFc8Rrjim
 snnHMYur3sbziwI4I3onFiaWAnjTb/TDIdShlTd0DMOB0SYfWh6GZeZF/847NmNA
 T0eJ7j6qS0kv8zUSpBGWM2r2VypBoDwis4iqlEp9J/m8guO8/2hdEgtnIO7tmass
 KWUmMdlNsi5kc7Y5eZk3e9eTCx95VCNutZpIuccX4tWZw4ivh0hc08eWsxs5SIRr
 eEJFrKb/OgHtMnu5hpYzDuf5EUJf9i9DGv28XoXxpRk/HUmaaA/aiRiUL+TEmD8G
 pgg95Hnif6XFvvrC1c8gDZExEyh9WNY3shq/SvkY5ffHYnqMqMYMoWm19UvICsAa
 EUBDDXfcWVX8saTHV0l3JVEq5hxegGaZczGJEddJuOFRfGLNSAQ=
 =COzW
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmPYPPAACgkQmmx57+YA
 GNm0oBAAmOfmHUEtro9bnMdrl2nD8VlCujbmTcuAXWaaocLxMdKtZUlewE8QaMt6
 M6PlD/txWEedwyxd3y1Pk7YIKg3HdGebd00GpqiU8a478J/GgtY0vQ/BSMk1lsLu
 bZbzR75F4wpWceZo/0MK826JAkfcXoPEH07GzJY2tMpDE3A+L1+0tL6+FtnYE9mU
 sZ4xfahKgh1ofnxpBXrpDNTBcy0BC/NS7FLNkoOJuFrjedeMrKdY7ydbH8oWijff
 OXVN9kVVLbbiHyTEGKlvBvSo7H/PzlXoS/1llalOz3RfVAKAF7qNuTntxNnlwz+u
 BcKnvJVOiIjE5pkHGn3aRK6vGRL5lEtVjj3O2xs7vxgjqlYNDyIB3zl1HO1+Ichs
 QEWNqh3jeOk3kn/4kVdPak6EFNq/SgVtOgaewBrtZx5H82vVjJbB90Q4oWICdQz6
 Gi9Qcr9S2Uv7+b+mYWA6e+i3B3ieMDqBEGa1+LzUmm5pIhWX5qmOMb2Skqz4eJu6
 xm8ykS8dg/0qy0QptFio89AeKXUopyxrm3uBTrtnPRpgA9iRiiwqg8acLZEDeEtm
 AzSPH6072qOSz3w5K2WMi4o794v/H27ECAuvaDMG/v2RwrAg7R+KnvBcDza4mqFy
 ZDQth2lGi3khk8zC61XivcmfFkDxKXyUH/69ENJEvH3oQouP3gI=
 =v3PD
 -----END PGP SIGNATURE-----

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>
pull/938/head
Arnd Bergmann 2023-01-30 22:55:59 +01:00
parent 0c826ec36d 3a7b283821
commit d18eff504d
2 changed files with 2 additions and 6 deletions
Show Stats 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 @@
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 @@
};
};
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>;