diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 10:05:14 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-14 10:05:14 +0100 |
| commit | a1b5344620a3e6291afaf7542714ba9c391ef1c7 (patch) | |
| tree | b79b51bc4019ea50efbbac4a7f7717b6e6d749c0 /arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi | |
| parent | Merge branch 'topic/mprofile-kernel' into next (diff) | |
| parent | powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible (diff) | |
| download | linux-a1b5344620a3e6291afaf7542714ba9c391ef1c7.tar.xz linux-a1b5344620a3e6291afaf7542714ba9c391ef1c7.zip | |
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/bsc9131rdb.dtsi')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi b/arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi index f4d96d277ed5..53f8b956340f 100644 --- a/arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi +++ b/arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi @@ -53,7 +53,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spansion,s25sl12801"; + compatible = "spansion,s25sl12801", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; |