aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/r8a7778-bockw-reference.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-05-15 17:21:10 +0200
committerArnd Bergmann <arnd@arndb.de>2015-05-15 17:21:10 +0200
commitbc2ad8ffd834eb9ba71e965907257998b8fea339 (patch)
tree4685ad6b5d2713554950bd22e2f43f602c7c3b15 /arch/arm/boot/dts/r8a7778-bockw-reference.dts
parent144ed9708e67d28b116f4cd9e3106c08341a8959 (diff)
parent7706993e2deb75022dbcfc3043890aa1a0020189 (diff)
downloadlinux-stericsson-bc2ad8ffd834eb9ba71e965907257998b8fea339.tar.gz
Merge tag 'renesas-dt-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Renesas ARM Based SoC DT Updates for v4.2" from Simon Horman: * Enable DMA for HSUSB on r8a7790 and r8a7791 SoCs * Configure the HOME key as wake-up source on kzm9g board * Use generic names for device nodes on SH Mobile SoCs and boards * Add "nor-jedec" compatible value to SH Mobile boards * Add IRQC clock to r8a73a4, r8a779* SoCs * Remove MSIOF address from r8a7790 and r8a7791 SoCs * tag 'renesas-dt-for-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (31 commits) ARM: shmobile: r8a7791: Enable DMA for HSUSB ARM: shmobile: r8a7791: add USB-DMAC device nodes ARM: shmobile: r8a7790: Enable DMA for HSUSB ARM: shmobile: r8a7790: add USB-DMAC device nodes ARM: shmobile: kzm9g dts: Configure the HOME key as wake-up source ARM: shmobile: koelsch dts: Use generic names for device nodes ARM: shmobile: lager dts: Use generic names for device nodes ARM: shmobile: bockw dts: Use generic names for device nodes ARM: shmobile: koelsch dts: Add "nor-jedec" compatible value ARM: shmobile: bockw dts: Add "nor-jedec" compatible value ARM: shmobile: lager dts: Add "nor-jedec" compatible value ARM: shmobile: bockw-reference dts: Add "nor-jedec" compatible value ARM: shmobile: henninger dts: Add "nor-jedec" compatible value ARM: shmobile: armadillo800eva dts: Use generic names for device nodes ARM: shmobile: marzen dts: Use generic names for device nodes ARM: shmobile: kzm9d dts: Use generic names for device nodes ARM: shmobile: ape6evm dts: Use generic names for device nodes ARM: shmobile: sh73a0 dtsi: Use generic names for device nodes ARM: shmobile: r8a7791 dtsi: Use generic names for device nodes ARM: shmobile: r8a7790 dtsi: Use generic names for device nodes ...
Diffstat (limited to 'arch/arm/boot/dts/r8a7778-bockw-reference.dts')
-rw-r--r--arch/arm/boot/dts/r8a7778-bockw-reference.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index 04c0c37bb784..f9422d887b44 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -119,7 +119,7 @@
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
- compatible = "spansion,s25fl008k";
+ compatible = "spansion,s25fl008k", "nor-jedec";
reg = <0>;
spi-max-frequency = <104000000>;
m25p,fast-read;