diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2022-05-11 16:27:06 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-05-11 16:27:06 +0200 |
| commit | 47319846a9e2ab1c4d22108e891818d003615bd8 (patch) | |
| tree | 919dbed5c01d3ad4db009bd38bb12cfd3d038246 /arch/arm/boot/dts/at91-sama5d4ek.dts | |
| parent | perf/amd/ibs: Use interrupt regs ip for stack unwinding (diff) | |
| parent | Linux 5.18-rc5 (diff) | |
| download | linux-dev-47319846a9e2ab1c4d22108e891818d003615bd8.tar.xz linux-dev-47319846a9e2ab1c4d22108e891818d003615bd8.zip | |
Merge branch 'v5.18-rc5'
Obtain the new INTEL_FAM6 stuff required.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'arch/arm/boot/dts/at91-sama5d4ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d4ek.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts index fe432b6b7e95..7017f626f362 100644 --- a/arch/arm/boot/dts/at91-sama5d4ek.dts +++ b/arch/arm/boot/dts/at91-sama5d4ek.dts @@ -65,7 +65,7 @@ spi0: spi@f8010000 { cs-gpios = <&pioC 3 0>, <0>, <0>, <0>; status = "okay"; - m25p80@0 { + flash@0 { compatible = "atmel,at25df321a"; spi-max-frequency = <50000000>; reg = <0>; |