From 38b8f1687f732e0d54340429acd5751b8c679690 Mon Sep 17 00:00:00 2001 From: Kumar Gala <galak@kernel.crashing.org> Date: Wed, 19 Oct 2011 23:16:01 -0500 Subject: powerpc/85xx: Update SPI binding to match binding spec for P1020RDB The SPI node is out of date with regards to the binding for fsl-espi and driver support. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- arch/powerpc/boot/dts/p1020rdb.dts | 30 +++++++++++++----------------- arch/powerpc/boot/dts/p1020si.dtsi | 5 ++--- 2 files changed, 15 insertions(+), 20 deletions(-) (limited to 'arch/powerpc/boot') diff --git a/arch/powerpc/boot/dts/p1020rdb.dts b/arch/powerpc/boot/dts/p1020rdb.dts index 8b1a7ee5ed7..b31e7ecf24f 100644 --- a/arch/powerpc/boot/dts/p1020rdb.dts +++ b/arch/powerpc/boot/dts/p1020rdb.dts @@ -149,49 +149,45 @@ }; spi@7000 { - - fsl_m25p80@0 { + flash@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "fsl,espi-flash"; + compatible = "spansion,s25sl12801"; reg = <0>; - linux,modalias = "fsl_m25p80"; - modal = "s25sl128b"; - spi-max-frequency = <50000000>; - mode = <0>; + spi-max-frequency = <40000000>; /* input clock */ - partition@0 { + partition@u-boot { /* 512KB for u-boot Bootloader Image */ reg = <0x0 0x00080000>; - label = "SPI (RO) U-Boot Image"; + label = "u-boot"; read-only; }; - partition@80000 { + partition@dtb { /* 512KB for DTB Image */ reg = <0x00080000 0x00080000>; - label = "SPI (RO) DTB Image"; + label = "dtb"; read-only; }; - partition@100000 { + partition@kernel { /* 4MB for Linux Kernel Image */ reg = <0x00100000 0x00400000>; - label = "SPI (RO) Linux Kernel Image"; + label = "kernel"; read-only; }; - partition@500000 { + partition@fs { /* 4MB for Compressed RFS Image */ reg = <0x00500000 0x00400000>; - label = "SPI (RO) Compressed RFS Image"; + label = "file system"; read-only; }; - partition@900000 { + partition@jffs-fs { /* 7MB for JFFS2 based RFS */ reg = <0x00900000 0x00700000>; - label = "SPI (RW) JFFS2 RFS"; + label = "file system jffs2"; }; }; }; diff --git a/arch/powerpc/boot/dts/p1020si.dtsi b/arch/powerpc/boot/dts/p1020si.dtsi index 58f6b30e029..25e10cf5a6b 100644 --- a/arch/powerpc/boot/dts/p1020si.dtsi +++ b/arch/powerpc/boot/dts/p1020si.dtsi @@ -112,14 +112,13 @@ }; spi@7000 { - cell-index = <0>; #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,espi"; + compatible = "fsl,p1020-espi", "fsl,mpc8536-espi"; reg = <0x7000 0x1000>; interrupts = <59 0x2>; interrupt-parent = <&mpic>; - mode = "cpu"; + fsl,espi-num-chipselects = <4>; }; gpio: gpio-controller@f000 { -- cgit v1.2.3-70-g09d2