diff options
| author | Joerg Roedel <jroedel@suse.de> | 2022-05-20 12:26:49 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2022-05-20 12:26:49 +0200 |
| commit | b11deb2f250fbf841e578e0f3bea3993fdedd0f7 (patch) | |
| tree | da72b24f9948f4d5630529819b546e514a87aa61 /arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | |
| parent | e3b9bf145cb6a0c0ffa106d5a78029c7c3e94ef7 (diff) | |
| parent | 42226c989789d8da4af1de0c31070c96726d990c (diff) | |
Merge tag 'v5.18-rc7' into arm/smmu
Linux 5.18-rc7
Diffstat (limited to 'arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi index 710cb72bda5a..fd1086f52b40 100644 --- a/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi +++ b/arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi @@ -49,7 +49,7 @@ cs-gpios = <&pioC 3 0>, <0>, <0>, <0>; status = "okay"; - m25p80@0 { + flash@0 { compatible = "atmel,at25df321a"; spi-max-frequency = <50000000>; reg = <0>; |