Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 23:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

This pull request contains Broadcom ARM64-based SoCs changes for 6.9,

Browse Source 
please pull the following:
 
 - Rafal defines a proper NVMEM layout for the Asus GT-AC5300 router and
   removes some invalid Device Tree properties pertaining to the
   Ethernet switch on bcm4908
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmXoxeUACgkQh9CWnEQH
 BwQPCg//a7hqzeMpeZEjev6ZDi3h3lgcRjFs6RnCuHwmF195RGu9J52RuDkoKWjX
 foI8bSePF79n7EbB5CCi5G5WczrDZ0x0Ygda9FApHiKitzyfhQ0v5f+MFcJmpYNf
 cRTd6KBjBVyCsi8fyxEArVFT5CGDxyMQq9rMkVkX1I/L5oFNEsR18Cw9mYWARJOV
 zoIXrN5QW6QSmJJpNyrKPet6HA2nt7jyxSFSopbiSd7ADW1euaUh0h8ggXZKJq/p
 IdW6lFiJzgg+1KkooL8cxxPi1P/hz3uMKXzmdHoeQR0NJ6MNu2CIKsxGMK5RPicG
 D/S0Yh3LWsgu3UgcJwwhIrPeszo8qK1i7HgKQ1wNFzFZzyi7nL0QgCJn1WxdRBa/
 ripIcOcKJTgf5PvZYQ03kGJx/hHhTXEif55SENZD9FSVC6oV4wQPEBj0sghTknSw
 oYgroZeuiBM4tmX2rQDAy1X3jVGMZSiPwuhgB4Q0phN8Exo72aUL0PrwWpPU9zRt
 xppc5l4jpsM9MP/1snDbB50+GiFlofb4ISAxXwi7GMjiir7zpnsyvrK31/EOUTxt
 euZ9xJCezeMOkL8NBwpOFKvmVZGhxtqSE+JONdEG8BI072iFdVYqVuululTZZ5WM
 lRftEkO6A6pr1t0lWfCeNbYVlZRmVfYnUQbXMob5YVyOXuD71t8=
 =KB40
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmXuqBQACgkQYKtH/8kJ
 UicyGw/+LVRltptZyljR2dJL9cI2WeXh6SLDuNuHXf1fNUP/TZ/FmDaUxWjcCRUd
 +szjMumBbfhj7G1wQaPDNm+FuCLgpbUJr3bfdgTRzW7ufxumWLuf1BnD7KEl284G
 RCuZvlPZDemfbgSpgHCtZdGsQY3RQrXP9yoJDhBwBa1W/f40+z+QyCn2JuYeflCg
 qkfQ/kd07YAAV23UcZiljPsM0MDKZNL7RQuYg5+nbaXVd0KX/n10qkOx4w47k4RL
 fEZCAc8McEBjgdlf0sSOyLTU7STXa8MSf7z1u70VEzkG8vBooMxiQN1RYgbS9/pG
 2Cb7HbjPh9o6FcE4609eZUKmTLAzqAc1tlCc2w6aopaIDbUhWEpzKi/LVsP09orG
 QgPXs3DKPs1yZ4weMKnbimWvw09ATTslH8FrAzAgAJKZrCP2g7heyQQwpxg5Lu70
 2Xp90wRIiHB+AHVWDR7iA4gleLN5TFHK/fe5qOafqujFJQM7e2U0HLue0xqJwh/K
 bYCAL3wPImkDBRN2WwMzcTQFl6gQ2nu7kkwU6sRItS9/TFi8v/blw1g3vwTVBPfN
 TLW2tRtuN4GN4X7dMjUuY052/JEVLfDHpsFdmN9o/vJuwgMEwmtgielOeMIupWwb
 n/YgCNC+cMz9QwJ0j884qNXh0NTxx8NkueUWCcx2kuBXY1iZOLg=
 =UDMX
 -----END PGP SIGNATURE-----

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

This pull request contains Broadcom ARM64-based SoCs changes for 6.9,
please pull the following:

- Rafal defines a proper NVMEM layout for the Asus GT-AC5300 router and
  removes some invalid Device Tree properties pertaining to the
  Ethernet switch on bcm4908

* tag 'arm-soc/for-6.9/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: bcmbca: bcm4908: drop invalid switch cells
  arm64: dts: broadcom: bcmbca: bcm4908: use NVMEM layout for Asus GT-AC5300

Link: https://lore.kernel.org/r/20240307200441.2151734-1-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-03-11 07:43:25 +01:00
commit de79649bf9
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
View File

@ -181,16 +181,17 @@
#size-cells = <1>;
partition@0 {
compatible = "nvmem-cells";
label = "cferom";
reg = <0x0 0x100000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x0 0x100000>;
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
base_mac_addr: mac@106a0 {
reg = <0x106a0 0x6>;
base_mac_addr: mac@106a0 {
reg = <0x106a0 0x6>;
};
};
};

3
arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
View File

@ -227,9 +227,6 @@
brcm,num-gphy = <5>;
brcm,num-rgmii-ports = <2>;
#address-cells = <1>;
#size-cells = <0>;
ports: ports {
#address-cells = <1>;
#size-cells = <0>;