github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amlogic DT Fixes for v7.1:

Browse Source 
- Fix ethernet PHY interrupt number for P230 reference board
 - Add missing cache information to cpu0 for Amlogic AXG
 - Fix Khadas VIM4 board model name
 - Fix GIC register ranges for Amlogic T7
 - Fix Khadas VIM4 memory layout for 8GB RAM
 - Drop CPU masks from GICv3 PPI interrupts for Amlogic S6
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmnngG4ACgkQd9zb2sjI
 SdESPhAAzhl+g0yjHFs0pl3mHwUx2TSC8JCT2eEICBStncGtqm5mFqFVOjAcJ78q
 ycdvriA6wBu8gGYFm5T/0WUmglXM4I38dS4lyTWbQlpJwWRtxBFAkWxU8irf3kAk
 Vj1dWa1EH/BMZC9S+0R+wRxuRZND+isFBBqisBu2x9OWK0j+uD0ATQnoeRH26V6s
 Zpt5jNs3XiMaGC5kQq2rZMYj4Dc1ZEcYM3N9JMkSUepO4eXIVfg4Ae5GgEXnw6xe
 0RIqB+vH1xscB0EuJ8Og/CObGJgi2fyjg4MiDrgqXMuAbR8MM3y4P2HO00fizDzZ
 y06VnR1BrTv/AT0AavR/M9rVoJzJewe0KT+5jfaRGYm412Kr09mbvhiqORkshZ7G
 ILrdK4jococp0rSAghyqL0W6vmgLSQM9WHdCUltezI8jsKN7iPAYc4WBRNGyEUym
 uBT7g3sPN2oLY/2ccnrd10mByI7Bm9mVPYG0+z6N0XbjxeAolDR0eykdKRR+JTmp
 2WeMcAIB2fc+JHqJCRQQBYn2nrifDvyADkP19qUoyNAEOzj+ge/J55iNUvbgdGmz
 twKoeVfkcl4DBsyVcFDbAgoTvQrA6S9DK5pUoEs2LeRGHiEOcWaX5QsG6ogBVu+Z
 Ri8/OQm8v4YqU5+b9TR6nohSa370C5UxxlQ1VKXBy2hgnrc+oig=
 =SJwD
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmnp0hUACgkQmmx57+YA
 GNn0oRAAhvj0GcTCP6/2gClqN7cXN1F/rIFgTo+Ce6BZMbBCwis3xeeFCw7dy1dT
 s56UHyzlQ0R3Ey+cSwGQWiLIbTWOwAdOfDqcCm/sO3008hZCwmkloQqND9Zw17tR
 ALCNr/vezrYqqxwNpi40UU9NpX2lmcuHr3iJYXGR5rbjxTyXlSPsj9ZxB1Fu8VAL
 Winis5P8bWwvwfH3nfDDNWosLQJz4xC6IApBJr4dXCQeh9+r+Ft0RVLDqqQyPkkt
 kP0NCScExN0A1l0QYAXh8ijVTdm2l638R/lgBpS3RP/FqvTXsE361gEhlxxbCWXr
 Fimp0MdUbdj8S8lXttyxJgXNc2l96q8VEby/HVQbCUpElhKH3IDLj9yGHPs++uMs
 Rr0r33gtsfKxSGEv5t6j+9Er3KjtS2W9ruA3wYUGdzLqM77H5gKVAgutjrS5sgAC
 TU8BitvWmTC8r7vT6NjezLdsPxZdQWLjR73qlSFKYkdpWnUmAD2vHtMC0FGJCi28
 zHRfiCViiFugEmcTgWFKKOnaXAns5RThzKPdhTpigIMwkaRHlxOv4lulIm+f+0Ra
 C2q4yBYXWvICAV1mMLtoqFcK3ncRrwx3eAiXxUdGw2+RxBpxjVgXjINSriXYeojz
 T6xnIYffwYLzLmWoZ58a9eitf1QJFuwIkjsMOIZk5cvVoVI1oEc=
 =RXUX
 -----END PGP SIGNATURE-----

Merge tag 'amlogic-fixes-v7.1-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/late2

Amlogic DT Fixes for v7.1:
- Fix ethernet PHY interrupt number for P230 reference board
- Add missing cache information to cpu0 for Amlogic AXG
- Fix Khadas VIM4 board model name
- Fix GIC register ranges for Amlogic T7
- Fix Khadas VIM4 memory layout for 8GB RAM
- Drop CPU masks from GICv3 PPI interrupts for Amlogic S6

* tag 'amlogic-fixes-v7.1-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson-gxl-p230: fix ethernet PHY interrupt number
  arm64: dts: amlogic: meson-axg: Add missing cache information to cpu0
  arm64: dts: amlogic: t7: khadas-vim4: fix board model name
  arm64: dts: amlogic: Fix GIC register ranges for Amlogic T7
  arm64: dts: amlogic: t7: khadas-vim4: fix memory layout for 8GB RAM
  arm64: dts: amlogic: s6: Drop CPU masks from GICv3 PPI interrupts

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-04-23 10:02:23 +02:00
commit dd5dc19174
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi
View File

@ -53,10 +53,10 @@ pwrc: power-controller {
timer {
compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
<GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
<GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
<GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
};
psci {
@ -84,7 +84,7 @@ gic: interrupt-controller@ff200000 {
interrupt-controller;
reg = <0x0 0xff200000 0 0x10000>,
<0x0 0xff240000 0 0x80000>;
interrupts = <GIC_PPI 9 0xf04>;
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
};
apb: bus@fe000000 {

6
arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts
View File

@ -8,7 +8,7 @@
#include "amlogic-t7.dtsi"
/ {
model = "Khadas vim4";
model = "Khadas VIM4";
compatible = "khadas,vim4", "amlogic,a311d2", "amlogic,t7";
aliases {
@ -17,7 +17,9 @@ aliases {
memory@0 {
device_type = "memory";
reg = <0x0 0x0 0x2 0x0>; /* 8 GB */
reg = <0x0 0x0 0x0 0xE0000000
0x1 0x0 0x0 0xE0000000
0x2 0x0 0x0 0x40000000>; /* 8 GB */
};
reserved-memory {

4
arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi
View File

@ -213,7 +213,9 @@ gic: interrupt-controller@fff01000 {
#address-cells = <0>;
interrupt-controller;
reg = <0x0 0xfff01000 0 0x1000>,
<0x0 0xfff02000 0 0x0100>;
<0x0 0xfff02000 0 0x2000>,
<0x0 0xfff04000 0 0x2000>,
<0x0 0xfff06000 0 0x2000>;
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_HIGH)>;
};

6
arch/arm64/boot/dts/amlogic/meson-axg.dtsi
View File

@ -72,6 +72,12 @@ cpu0: cpu@0 {
compatible = "arm,cortex-a53";
reg = <0x0 0x0>;
enable-method = "psci";
d-cache-line-size = <32>;
d-cache-size = <0x8000>;
d-cache-sets = <32>;
i-cache-line-size = <32>;
i-cache-size = <0x8000>;
i-cache-sets = <32>;
next-level-cache = <&l2>;
clocks = <&scpi_dvfs 0>;
dynamic-power-coefficient = <140>;

3
arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts
View File

@ -84,7 +84,8 @@ external_phy: ethernet-phy@0 {
reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
interrupt-parent = <&gpio_intc>;
interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
/* MAC_INTR on GPIOZ_15 */
interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
eee-broken-1000t;
};
};