diff options
| author | Tom Rini <[email protected]> | 2024-05-13 09:15:51 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-13 09:15:51 -0600 |
| commit | c8ffd1356d42223cbb8c86280a083cc3c93e6426 (patch) | |
| tree | 35be4e1f46e5b386c124483872c58611cd97fe6c /arch/mips | |
| parent | 2ee6f3a5f7550de3599faef9704e166e5dcace35 (diff) | |
| parent | 577373239a35afa865098741cf805f6176de8b16 (diff) | |
Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
Roger Quadros <[email protected]> says:
Sync AM62 device tree files with Linux v6.9 and
add in the missing bits in -u-boot.dtsi to get CPSW
Ethernet working.
CI testing: https://github.com/u-boot/u-boot/pull/534
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/include/asm/global_data.h | 1 | ||||
| -rw-r--r-- | arch/mips/lib/traps.c | 1 | ||||
| -rw-r--r-- | arch/mips/mach-mtmips/Kconfig | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index 34b7e0bed94..147a95ecea8 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -9,6 +9,7 @@ #include <linux/types.h> #include <asm/regdef.h> +#include <asm/u-boot.h> struct octeon_eeprom_mac_addr { u8 mac_addr_base[6]; diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c index 40469d1be09..89846c9723c 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -20,7 +20,6 @@ #include <asm/mipsregs.h> #include <asm/addrspace.h> #include <asm/system.h> -#include <asm/u-boot.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/mips/mach-mtmips/Kconfig b/arch/mips/mach-mtmips/Kconfig index 15b2792e619..3fcd0b8465b 100644 --- a/arch/mips/mach-mtmips/Kconfig +++ b/arch/mips/mach-mtmips/Kconfig @@ -80,6 +80,7 @@ config SOC_MT7621 bool "MT7621" select MIPS_CM select MIPS_L2_CACHE + select MMC_SUPPORTS_TUNING select SYS_CACHE_SHIFT_5 select SYS_MIPS_CACHE_INIT_RAM_LOAD select PINCTRL_MT7621 |