github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-19 17:18:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This pull request contains Broadcom ARM-based SoCs Device Tree fixes for

Browse Source 
7.2, please pull the following:
 
 - Rosen fixes the Linksys EA9200 NVRAM DT size, the 2nd PCIe controller
   interrupt that was duplicated
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmpr3TgACgkQh9CWnEQH
 BwRtjRAAztTIR7AHRhZvEjBtQiwrzjNkxQaPlYeWRBtGeFRRQmiT9qQR+pzqlblr
 9qk0ftuNTrea8bitc9y6MVJ0Q4wainTm4skuK7Z6n0EgXwFSF61iDmlHN9w3k2px
 nQmhLO+9O79VClMDYUcN4Ry6iTRMvqV+0MLYlP4lK9iGOsQ2xEJhRxBJThFHsJeJ
 GLS/bvMRVVvvztH9RXhfGap4+zXwrLPhndiZRxSVI7wfEJhewYGiErxiAM7XXoKL
 KMOO7gofZYo+b+rSUumbiS7vvq4hnX7/9ThE8Semtt0+dHhRREM1STiueNvIQNm4
 HAKypDQvtzvnhqTtjO/i5eTQYJq46haR6Dieh+LW+Rm/LyyUGgh+0E3YGEhbkQMg
 PBCHtnFivm5ImphPqHD1hu7VphDvUQfKiD0TGdV1npqgvvfSH5SEJdIm8wvkGbP+
 UWg465WeZWT5+x1bgFFz8W9yFg88unWOgd+651Ogn5V7lDtLOw4Tgaugqch22pE/
 tUi4zZQ/dgAMmY/C0IL9fIMCMzJ/quD4yDyNg2Q7DyOCpnmMU+PspOMyZrx2/MHu
 9cIWZyo68UhHh87wmLeQxfWuqTGXpOL+1y6KCFCYV4JedS2bASnqwB+88nxltsm+
 /IWCZMKKxaj1Cml0SNmwTru2pDw/yiF5pRvXuXAG6OkrRMnjfMk=
 =oqYh
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmpwhAYACgkQmmx57+YA
 GNlhag/+PrU6ZkGVjgHS7lIP4QSQE72DSEP20jBE9MuvG6V9vEij7NqhEvRM9f6t
 2fxiacYQtd01G0ti8TLE1eKuEjAGiUjPuChOmS5m/RmxSN0zVfTT6OqQbYyjsXIH
 rpWyBFF3MzZVeDN0EG1oKjrfQAOo1aOIZLG0GlmDIex+Ufw/OEvgkKTN+boVeHcu
 l2SptFknjcsNkplSt54xS6gnttwE5dvMFHNdvKxXk2yX0xDeeuC11ym6WVnilBvg
 D8RBklrK3oyqkwTp3lWmaw/tRmcsC1YOCpuJHXqmK2KFGIH/4mggY2uqeP+Q3Ugl
 2jGArDmRU4CqlDQs4XUYHn0DLJFaPBCuFRpVPMvfnz0BVaf7fDKVqiwqqmsaq2qj
 Im5fMUy0gjILmBupxezCWITwZMVQYhJmyvsNe96VhUp6qyeMjU/mV5hj91rZCPEP
 tEwXPTB8BnFLQJSNjgfiAWLEFOhy7zOBEg3CPGNMlJuzfc0xAebo2gdLZk/O4N1H
 oj5EvHXOu1+fcLvZK+oSTahGWCB/bqal/FcAMDj/bCBikiYxSEWFe+Nt3laDTD8B
 49+gDFESSK10cu+bnu5P+VZdjWiXnKs0nqg5boBuA89uWfV9Sk29JGpaLvPyYcuP
 mxWXmzpOWIAWZKOBpXzamieXVb07NQfqikn0LO53J4hvNz/Vbm4=
 =YFCR
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-7.2/devicetree-fixes-v2' of https://github.com/Broadcom/stblinux into arm/fixes

This pull request contains Broadcom ARM-based SoCs Device Tree fixes for
7.2, please pull the following:

- Rosen fixes the Linksys EA9200 NVRAM DT size, the 2nd PCIe controller
  interrupt that was duplicated

* tag 'arm-soc/for-7.2/devicetree-fixes-v2' of https://github.com/Broadcom/stblinux:
  ARM: dts: BCM5301X: EA9200: fix NVRAM size
  ARM: dts: BCM5301X: fix PCIe controller 2 second interrupt

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-08-03 14:05:15 +02:00
commit cf3eb490ff
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/broadcom/bcm-ns.dtsi
View File

@ -141,7 +141,7 @@ axi@18000000 {
/* PCIe Controller 2 */
<0x00014000 0 &gic GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>,
<0x00014000 1 &gic GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>,
<0x00014000 1 &gic GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>,
<0x00014000 2 &gic GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>,
<0x00014000 3 &gic GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
<0x00014000 4 &gic GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,

2
arch/arm/boot/dts/broadcom/bcm4709-linksys-ea9200.dts
View File

@ -26,7 +26,7 @@ memory@0 {
nvram@1c080000 {
compatible = "brcm,nvram";
reg = <0x1c080000 0x180000>;
reg = <0x1c080000 0x100000>;
et2macaddr: et2macaddr {
#nvmem-cell-cells = <1>;