diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-05-03 15:29:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-05-03 15:29:14 +0200 |
| commit | 87f5bc6deac444c67ecdbf91b8094e874ae67d90 (patch) | |
| tree | d4843910187f5094071ae02d9637a12dc9454581 /arch | |
| parent | 8b86fc3343f35b095ade9031bbc7130517749649 (diff) | |
| parent | e8662d0832431a069f0138da72c638cb6a377bdd (diff) | |
| download | linux-87f5bc6deac444c67ecdbf91b8094e874ae67d90.tar.bz2 | |
Merge tag 'amlogic-arm-dt-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt
Amlogic ARM DT changes for v5.19:
- align SPI NOR node name with dtschema
* tag 'amlogic-arm-dt-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
ARM: dts: meson: align SPI NOR node name with dtschema
Link: https://lore.kernel.org/r/fbd7cbe7-1fe9-7009-37d6-c01b15c93032@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/meson8-minix-neo-x8.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/meson8-minix-neo-x8.dts b/arch/arm/boot/dts/meson8-minix-neo-x8.dts index 61ec929ab86e..56ea875c418c 100644 --- a/arch/arm/boot/dts/meson8-minix-neo-x8.dts +++ b/arch/arm/boot/dts/meson8-minix-neo-x8.dts @@ -65,7 +65,7 @@ pinctrl-0 = <&spi_nor_pins>; pinctrl-names = "default"; - spi-flash@0 { + flash@0 { compatible = "mxicy,mx25l1606e"; #address-cells = <1>; #size-cells = <1>; |