diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 20:05:14 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 20:05:14 +1100 |
| commit | a1b5344620a3e6291afaf7542714ba9c391ef1c7 (patch) | |
| tree | b79b51bc4019ea50efbbac4a7f7717b6e6d749c0 /arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts | |
| parent | d8c0282f4da6d5335fee56141ca92284026f4818 (diff) | |
| parent | fba4e9f9898ab181703723b9890ba29345edfe08 (diff) | |
| download | linux-stable-a1b5344620a3e6291afaf7542714ba9c391ef1c7.tar.gz | |
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/p1020rdb-pd.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts b/arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts index 740553c090a3..f2dc6c09be52 100644 --- a/arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts +++ b/arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts @@ -155,7 +155,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spansion,s25sl12801"; + compatible = "spansion,s25sl12801", "jedec,spi-nor"; reg = <0>; /* input clock */ spi-max-frequency = <40000000>; |