Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / r8a7778-bockw.dts

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 787fa6f9f46ddf4d2bd0d0db9abb82e4223c2413..90543b12d7e26bcbd9eca0e0c113ffaa718a3873 100644 (file)
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -85,7 +85,7 @@
 &i2c0 {
        status = "okay";
 
-       ak4643: sound-codec@12 {
+       ak4643: codec@12 {
                compatible = "asahi-kasei,ak4643";
                #sound-dai-cells = <0>;
                reg = <0x12>;
@@ -186,7 +186,7 @@
        flash: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spansion,s25fl008k";
+               compatible = "spansion,s25fl008k", "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <104000000>;
                m25p,fast-read;