diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 22:09:35 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 22:09:35 +1000 |
| commit | d0a31acc34dc2921ad32a67a7534704114e64f82 (patch) | |
| tree | 2b77d8d61170c5f9633c49eaddd67dca5bb9c38f /arch/arm/boot/dts/da850-evm.dts | |
| parent | f06351f8c0c85e2d53e73c53a33b4ef55b4ad6de (diff) | |
| parent | af2d861d4cd2a4da5137f795ee3509e6f944a25b (diff) | |
Merge tag 'v5.18-rc4' into next
Merge master into next, to bring in commit 5f24d5a579d1 ("mm, hugetlb:
allow for "high" userspace addresses"), which is needed as a
prerequisite for the series converting powerpc to the generic mmap
logic.
Diffstat (limited to 'arch/arm/boot/dts/da850-evm.dts')
| -rw-r--r-- | arch/arm/boot/dts/da850-evm.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts index 87c517d65f62..e9aecac4f5b5 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts @@ -278,7 +278,7 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&spi1_pins &spi1_cs0_pin>; - flash: m25p80@0 { + flash: flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "jedec,spi-nor"; |