[PATCH] fsl_spi devices should use mode "cpu" or "qe"

According to booting-without-of.txt, fsl_spi mode should be either
"cpu" or "qe", not "cpu-qe".

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 arch/powerpc/boot/dts/mpc832x_rdb.dts |    2 +-
 arch/powerpc/sysdev/fsl_soc.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 388c8a7..a5158d5 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts

@@ -175,7 +175,7 @@
 			reg = <4c0 40>;
 			interrupts = <2>;
 			interrupt-parent = <&qeic>;
-			mode = "cpu-qe";
+			mode = "qe";
 		};
 
 		spi@500 {

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index c765d7a..a57fe56 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c

@@ -1253,7 +1253,7 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
 		pdata.bus_num = *(u32 *)prop;
 
 		prop = of_get_property(np, "mode", NULL);
-		if (prop && !strcmp(prop, "cpu-qe"))
+		if (prop && !strcmp(prop, "qe"))
 			pdata.qe_mode = 1;
 
 		for (j = 0; j < num_board_infos; j++) {

-- 
1.5.3.2


-- 
Bye, Peter Korsgaard

On Oct 3, 2007, at 10:43 AM, Peter Korsgaard wrote:

According to booting-without-of.txt, fsl_spi mode should be either
"cpu" or "qe", not "cpu-qe".

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

I think we should update the doc instead of the code here. Thoughts?

- k

quoted

quoted

quoted

quoted

"Kumar" == Kumar Gala [off-list ref] writes:

 Kumar> On Oct 3, 2007, at 10:43 AM, Peter Korsgaard wrote:

 >> According to booting-without-of.txt, fsl_spi mode should be either
 >> "cpu" or "qe", not "cpu-qe".
 >> 
 >> Signed-off-by: Peter Korsgaard [off-list ref]

 Kumar> I think we should update the doc instead of the code here. Thoughts?

Same for me, but qe is shorter..

-- 
Bye, Peter Korsgaard

On 10/3/07, Kumar Gala [off-list ref] wrote:

On Oct 3, 2007, at 10:43 AM, Peter Korsgaard wrote:

quoted

According to booting-without-of.txt, fsl_spi mode should be either
"cpu" or "qe", not "cpu-qe".

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

I think we should update the doc instead of the code here. Thoughts?

Updating the doc is more backward compatible.  :-)

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195

On Oct 3, 2007, at 10:57 AM, Grant Likely wrote:

On 10/3/07, Kumar Gala [off-list ref] wrote:

quoted

On Oct 3, 2007, at 10:43 AM, Peter Korsgaard wrote:

quoted

According to booting-without-of.txt, fsl_spi mode should be either
"cpu" or "qe", not "cpu-qe".

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

I think we should update the doc instead of the code here. Thoughts?

Updating the doc is more backward compatible.  :-)

Peter, can you respin this as an update to booting-without-of.txt

thanks

- k

On Wed, 2007-10-03 at 10:51 -0500, Kumar Gala wrote:

On Oct 3, 2007, at 10:43 AM, Peter Korsgaard wrote:
=20

quoted

According to booting-without-of.txt, fsl_spi mode should be either
"cpu" or "qe", not "cpu-qe".

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

=20
I think we should update the doc instead of the code here. Thoughts?

Yes, "cpu-qe" means QE in CPU mode. There is a native QE mode too that
isn't impl. in the driver yet. "qe" should be reserved for native QE
mode.

 Jocke=20

quoted

quoted

quoted

quoted

"Grant" == Grant Likely [off-list ref] writes:

 >> I think we should update the doc instead of the code here. Thoughts?

 Grant> Updating the doc is more backward compatible.  :-)

Ok.
---

Mode should be "cpu-qe" for QE in CPU mode. "qe" should be reserved
for native QE mode.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 Documentation/powerpc/booting-without-of.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index ce5d67f..7a6c5f2 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt

@@ -1551,7 +1551,7 @@ platforms are moved over to use the flattened-device-tree model.
    Required properties:
    - device_type : should be "spi".
    - compatible : should be "fsl_spi".
-   - mode : the SPI operation mode, it can be "cpu" or "qe".
+   - mode : the SPI operation mode, it can be "cpu" or "cpu-qe".
    - reg : Offset and length of the register set for the device
    - interrupts : <a b> where a is the interrupt number and b is a
      field that represents an encoding of the sense and level

-- 
1.5.3.2

-- 
Bye, Peter Korsgaard