diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 12:05:14 +0300 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 12:05:14 +0300 |
commit | a1b5344620a3e6291afaf7542714ba9c391ef1c7 (patch) | |
tree | b79b51bc4019ea50efbbac4a7f7717b6e6d749c0 /arch/powerpc/boot/dts/fsl/mvme2500.dts | |
parent | d8c0282f4da6d5335fee56141ca92284026f4818 (diff) | |
parent | fba4e9f9898ab181703723b9890ba29345edfe08 (diff) | |
download | linux-a1b5344620a3e6291afaf7542714ba9c391ef1c7.tar.xz |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx optimizations, 32-bit checksum optimizations,
86xx consolidation, e5500/e6500 cpu hotplug, more fman and other dt
bits, and minor fixes/cleanup."
Diffstat (limited to 'arch/powerpc/boot/dts/fsl/mvme2500.dts')
-rw-r--r-- | arch/powerpc/boot/dts/fsl/mvme2500.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/fsl/mvme2500.dts b/arch/powerpc/boot/dts/fsl/mvme2500.dts index c7bc1a0c7194..69559e970e99 100644 --- a/arch/powerpc/boot/dts/fsl/mvme2500.dts +++ b/arch/powerpc/boot/dts/fsl/mvme2500.dts @@ -70,12 +70,12 @@ fsl,espi-num-chipselects = <2>; flash@0 { - compatible = "atmel,at25df641"; + compatible = "atmel,at25df641", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <10000000>; }; flash@1 { - compatible = "atmel,at25df641"; + compatible = "atmel,at25df641", "jedec,spi-nor"; reg = <1>; spi-max-frequency = <10000000>; }; |