Re: [PATCH v4 4/5] powerpc/of: add eSPI controller dts bindings and DTS modification

2010-10-12 Thread Grant Likely 
On Tue, Oct 12, 2010 at 06:18:33PM +0800, Mingkai Hu wrote:
> Also modifiy the document of cell-index in SPI controller. Add the
> SPI flash(s25fl128p01) support on p4080ds and mpc8536ds board.
> 
> Signed-off-by: Mingkai Hu 

Applied, thanks.

g.

> ---
> v4:
>  - Updated to latest kernel base(Linux 2.6.36-rc7).
> 
>  Documentation/powerpc/dts-bindings/fsl/spi.txt |   24 ++-
>  arch/powerpc/boot/dts/mpc8536ds.dts|   52 
> 
>  arch/powerpc/boot/dts/p4080ds.dts  |   11 ++---
>  3 files changed, 79 insertions(+), 8 deletions(-)
> 
> diff --git a/Documentation/powerpc/dts-bindings/fsl/spi.txt 
> b/Documentation/powerpc/dts-bindings/fsl/spi.txt
> index 80510c0..777abd7 100644
> --- a/Documentation/powerpc/dts-bindings/fsl/spi.txt
> +++ b/Documentation/powerpc/dts-bindings/fsl/spi.txt
> @@ -1,7 +1,9 @@
>  * SPI (Serial Peripheral Interface)
>  
>  Required properties:
> -- cell-index : SPI controller index.
> +- cell-index : QE SPI subblock index.
> + 0: QE subblock SPI1
> + 1: QE subblock SPI2
>  - compatible : should be "fsl,spi".
>  - mode : the SPI operation mode, it can be "cpu" or "cpu-qe".
>  - reg : Offset and length of the register set for the device
> @@ -29,3 +31,23 @@ Example:
>   gpios = <&gpio 18 1 // device reg=<0>
>&gpio 19 1>;   // device reg=<1>
>   };
> +
> +
> +* eSPI (Enhanced Serial Peripheral Interface)
> +
> +Required properties:
> +- compatible : should be "fsl,mpc8536-espi".
> +- reg : Offset and length of the register set for the device.
> +- interrupts : should contain eSPI interrupt, the device has one interrupt.
> +- fsl,espi-num-chipselects : the number of the chipselect signals.
> +
> +Example:
> + s...@11 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "fsl,mpc8536-espi";
> + reg = <0x11 0x1000>;
> + interrupts = <53 0x2>;
> + interrupt-parent = <&mpic>;
> + fsl,espi-num-chipselects = <4>;
> + };
> diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts 
> b/arch/powerpc/boot/dts/mpc8536ds.dts
> index 815cebb..a75c10e 100644
> --- a/arch/powerpc/boot/dts/mpc8536ds.dts
> +++ b/arch/powerpc/boot/dts/mpc8536ds.dts
> @@ -108,6 +108,58 @@
>   };
>   };
>  
> + s...@7000 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + compatible = "fsl,mpc8536-espi";
> + reg = <0x7000 0x1000>;
> + interrupts = <59 0x2>;
> + interrupt-parent = <&mpic>;
> + fsl,espi-num-chipselects = <4>;
> +
> + fl...@0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "spansion,s25sl12801";
> + reg = <0>;
> + spi-max-frequency = <4000>;
> + partit...@u-boot {
> + label = "u-boot";
> + reg = <0x 0x0010>;
> + read-only;
> + };
> + partit...@kernel {
> + label = "kernel";
> + reg = <0x0010 0x0050>;
> + read-only;
> + };
> + partit...@dtb {
> + label = "dtb";
> + reg = <0x0060 0x0010>;
> + read-only;
> + };
> + partit...@fs {
> + label = "file system";
> + reg = <0x0070 0x0090>;
> + };
> + };
> + fl...@1 {
> + compatible = "spansion,s25sl12801";
> + reg = <1>;
> + spi-max-frequency = <4000>;
> + };
> + fl...@2 {
> + compatible = "spansion,s25sl12801";
> + reg = <2>;
> + spi-max-frequency = <4000>;
> + };
> + fl...@3 {
> + compatible = "spansion,s25sl12801";
> + reg = <3>;
> + spi-max-frequency = <4000>;
> + };
> + };
> +
>   d...@21300 {
>   #address-cells = <1>;
>   #size-cells = <1>;
> diff --git a/arch/powerpc/boot/dts

[PATCH v4 4/5] powerpc/of: add eSPI controller dts bindings and DTS modification

2010-10-12 Thread Mingkai Hu 
Also modifiy the document of cell-index in SPI controller. Add the
SPI flash(s25fl128p01) support on p4080ds and mpc8536ds board.

Signed-off-by: Mingkai Hu 
---
v4:
 - Updated to latest kernel base(Linux 2.6.36-rc7).

 Documentation/powerpc/dts-bindings/fsl/spi.txt |   24 ++-
 arch/powerpc/boot/dts/mpc8536ds.dts|   52 
 arch/powerpc/boot/dts/p4080ds.dts  |   11 ++---
 3 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/Documentation/powerpc/dts-bindings/fsl/spi.txt 
b/Documentation/powerpc/dts-bindings/fsl/spi.txt
index 80510c0..777abd7 100644
--- a/Documentation/powerpc/dts-bindings/fsl/spi.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/spi.txt
@@ -1,7 +1,9 @@
 * SPI (Serial Peripheral Interface)
 
 Required properties:
-- cell-index : SPI controller index.
+- cell-index : QE SPI subblock index.
+   0: QE subblock SPI1
+   1: QE subblock SPI2
 - compatible : should be "fsl,spi".
 - mode : the SPI operation mode, it can be "cpu" or "cpu-qe".
 - reg : Offset and length of the register set for the device
@@ -29,3 +31,23 @@ Example:
gpios = <&gpio 18 1 // device reg=<0>
 &gpio 19 1>;   // device reg=<1>
};
+
+
+* eSPI (Enhanced Serial Peripheral Interface)
+
+Required properties:
+- compatible : should be "fsl,mpc8536-espi".
+- reg : Offset and length of the register set for the device.
+- interrupts : should contain eSPI interrupt, the device has one interrupt.
+- fsl,espi-num-chipselects : the number of the chipselect signals.
+
+Example:
+   s...@11 {
+   #address-cells = <1>;
+   #size-cells = <0>;
+   compatible = "fsl,mpc8536-espi";
+   reg = <0x11 0x1000>;
+   interrupts = <53 0x2>;
+   interrupt-parent = <&mpic>;
+   fsl,espi-num-chipselects = <4>;
+   };
diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts 
b/arch/powerpc/boot/dts/mpc8536ds.dts
index 815cebb..a75c10e 100644
--- a/arch/powerpc/boot/dts/mpc8536ds.dts
+++ b/arch/powerpc/boot/dts/mpc8536ds.dts
@@ -108,6 +108,58 @@
};
};
 
+   s...@7000 {
+   #address-cells = <1>;
+   #size-cells = <0>;
+   compatible = "fsl,mpc8536-espi";
+   reg = <0x7000 0x1000>;
+   interrupts = <59 0x2>;
+   interrupt-parent = <&mpic>;
+   fsl,espi-num-chipselects = <4>;
+
+   fl...@0 {
+   #address-cells = <1>;
+   #size-cells = <1>;
+   compatible = "spansion,s25sl12801";
+   reg = <0>;
+   spi-max-frequency = <4000>;
+   partit...@u-boot {
+   label = "u-boot";
+   reg = <0x 0x0010>;
+   read-only;
+   };
+   partit...@kernel {
+   label = "kernel";
+   reg = <0x0010 0x0050>;
+   read-only;
+   };
+   partit...@dtb {
+   label = "dtb";
+   reg = <0x0060 0x0010>;
+   read-only;
+   };
+   partit...@fs {
+   label = "file system";
+   reg = <0x0070 0x0090>;
+   };
+   };
+   fl...@1 {
+   compatible = "spansion,s25sl12801";
+   reg = <1>;
+   spi-max-frequency = <4000>;
+   };
+   fl...@2 {
+   compatible = "spansion,s25sl12801";
+   reg = <2>;
+   spi-max-frequency = <4000>;
+   };
+   fl...@3 {
+   compatible = "spansion,s25sl12801";
+   reg = <3>;
+   spi-max-frequency = <4000>;
+   };
+   };
+
d...@21300 {
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/p4080ds.dts 
b/arch/powerpc/boot/dts/p4080ds.dts
index 2f0de24..5b7fc29 100644
--- a/arch/powerpc/boot/dts/p4080ds.dts
+++ b/arch/powerpc/boot/dts/p4080ds.dts
@@ -236,22 +236,19 @@