diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 13:59:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 13:59:55 +0200 |
| commit | ff28ea63425d13e4d889bc644dcc76c6f3418a38 (patch) | |
| tree | 81cba1c7c0944c4acc52c33d5157dd971189f999 /arch/arm/boot/dts/r8a7791-koelsch.dts | |
| parent | 047d378a0075cc1559614270a1c9a5ce56b2a882 (diff) | |
| parent | acea43fcb02746e907725c6dbd2eb95b32d79ea5 (diff) | |
| download | talos-obmc-linux-ff28ea63425d13e4d889bc644dcc76c6f3418a38.tar.gz talos-obmc-linux-ff28ea63425d13e4d889bc644dcc76c6f3418a38.zip | |
Merge tag 'renesas-dt2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Second Round of Renesas ARM Based SoC DT Updates for v4.2" from Simon Horman:
* Describe DMA for the serial ports of R-Car Gen2 SoCs
* Add MMCIF max-frequency to R-Car Gen2 SoCs
* Use "nor-jedec" instead of "jedec,spi-nor"
* tag 'renesas-dt2-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7790 dtsi: Describe DMA for the serial ports
ARM: shmobile: r8a7791 dtsi: Describe DMA for the serial ports
ARM: shmobile: r8a7794 dtsi: Describe DMA for the serial ports
ARM: shmobile: r8a7791: add MMCIF max-frequency
ARM: shmobile: r8a7790: add MMCIF max-frequency
ARM: shmobile: bockw dts: Replace "nor-jedec" by "jedec,spi-nor"
ARM: shmobile: henninger dts: Replace "nor-jedec" by "jedec,spi-nor"
ARM: shmobile: bockw-reference dts: Replace "nor-jedec" by "jedec,spi-nor"
ARM: shmobile: koelsch dts: Replace "nor-jedec" by "jedec,spi-nor"
ARM: shmobile: lager dts: Replace "nor-jedec" by "jedec,spi-nor"
Diffstat (limited to 'arch/arm/boot/dts/r8a7791-koelsch.dts')
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index e9c24036f000..cffe33ff4d16 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -474,7 +474,7 @@ flash: flash@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spansion,s25fl512s", "nor-jedec"; + compatible = "spansion,s25fl512s", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <30000000>; spi-tx-bus-width = <4>; |
