From: luowei <lw@rock-chips.com>
Date: Sun, 27 Mar 2011 12:50:43 +0000 (+0800)
Subject: modify some files for wm831x to make sure it's function is ok
X-Git-Tag: firefly_0821_release~10620
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4ce17233d4f12d9d142e6eef4b02d0fee3f98f1;p=firefly-linux-kernel-4.4.55.git

modify some files for wm831x to make sure it's function is ok
---

diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
index f107a0c388dc..e70e9b2e03a8 100755
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -2850,7 +2850,7 @@ static struct spi_board_info board_spi_devices[] = {
 	{
 		.modalias	= "wm8310",
 		.chip_select	= 1,
-		.max_speed_hz	= 12*1000*1000,
+		.max_speed_hz	= 2*1000*1000,
 		.bus_num	= 1,
 		.irq            = RK29_PIN4_PD0,
 		.platform_data = &wm831x_platdata,
diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index 2789b151b0f9..20896e0ca4a1 100755
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -27,14 +27,14 @@ static int wm831x_spi_read_device(struct wm831x *wm831x, unsigned short reg,
 
 	/* Go register at a time */
 	for (r = reg; r < reg + (bytes / 2); r++) {
-		tx_val = r | 0x8000;
+		tx_val = cpu_to_be16(r | 0x8000);
 
 		ret = spi_write_then_read(wm831x->control_data,
 					  (u8 *)&tx_val, 2, (u8 *)d, 2);
 		if (ret != 0)
 			return ret;
 
-		*d = be16_to_cpu(*d);
+		//*d = be16_to_cpu(*d);
 
 		d++;
 	}
@@ -52,7 +52,7 @@ static int wm831x_spi_write_device(struct wm831x *wm831x, unsigned short reg,
 
 	/* Go register at a time */
 	for (r = reg; r < reg + (bytes / 2); r++) {
-		data[0] = r;
+		data[0] = cpu_to_be16(r);
 		data[1] = *s++;
 
 		ret = spi_write(spi, (char *)&data, sizeof(data));
diff --git a/drivers/spi/rk29_spim.c b/drivers/spi/rk29_spim.c
index e940e37550ec..bb8b2ae76ed0 100755
--- a/drivers/spi/rk29_spim.c
+++ b/drivers/spi/rk29_spim.c
@@ -1918,7 +1918,7 @@ static int __init rk29xx_spim_probe(struct platform_device *pdev)
         dev_err(&master->dev, "rk29xx spim failed to init cpufreq support\n");
         goto err_queue_alloc;
     }
-	DBG(KERN_INFO "rk29xx_spim: driver initialized, fifo_len: %d\n", dws->fifo_len);
+	printk(KERN_INFO "rk29xx_spim: driver initialized, fifo_len=%d,bus_num=%d\n", dws->fifo_len,master->bus_num);
 	mrst_spi_debugfs_init(dws);
 	return 0;
 
@@ -2031,7 +2031,7 @@ static void __exit rk29xx_spim_exit(void)
 	platform_driver_unregister(&rk29xx_platform_spim_driver);
 }
 
-subsys_initcall(rk29xx_spim_init);
+arch_initcall_sync(rk29xx_spim_init);
 module_exit(rk29xx_spim_exit);
 
 MODULE_AUTHOR("www.rock-chips.com");