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

[Peter Korsgaard]

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

Signed-off-by: Peter Korsgaard <jacmet at 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 at 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