diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-14 15:06:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-14 15:06:28 +0100 |
| commit | e53bcb3191edd2199541c54c115b6b9e45732447 (patch) | |
| tree | d4c281b27460c5a6f42c8c47605a9c731663a7ad /arch | |
| parent | 0d9d05e51baccd2ce0924183abd3712f7c906365 (diff) | |
| parent | cfe5a96b888f25e32aba64868c0d038c5ba00a63 (diff) | |
| download | linux-next-e53bcb3191edd2199541c54c115b6b9e45732447.tar.gz linux-next-e53bcb3191edd2199541c54c115b6b9e45732447.zip | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-socfpga/Kconfig | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dtsi | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_emmc.dts | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index eb72c240c248..528c5c1368c3 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -16,7 +16,7 @@ menuconfig ARCH_INTEL_SOCFPGA select ARM_ERRATA_775420 select PL310_ERRATA_588369 select PL310_ERRATA_727915 - select PL310_ERRATA_753970 if PL310 + select PL310_ERRATA_753970 select PL310_ERRATA_769419 select RESET_CONTROLLER diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dtsi index 1d50f7b21160..1d50f7b21160 100755..100644 --- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dtsi +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dtsi diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_emmc.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_emmc.dts index b2a3449638dd..b2a3449638dd 100755..100644 --- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_emmc.dts +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_emmc.dts |