From: cwz <cwz@rockchips.com>
Date: Wed, 30 Mar 2011 06:31:49 +0000 (-0700)
Subject: update the fih board
X-Git-Tag: firefly_0821_release~10598
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f358d364f4e2c3a17e35c4638ef2d96d9c1365f;p=firefly-linux-kernel-4.4.55.git

update the fih board
---

diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c
index 6fd3e1e83fd5..756df27cecf2 100755
--- a/arch/arm/mach-rk29/board-rk29-fih.c
+++ b/arch/arm/mach-rk29/board-rk29-fih.c
@@ -541,7 +541,7 @@ static struct regulator_init_data rk29_regulator_vio = {
 /* VAUX1 */
 static struct regulator_consumer_supply rk29_vaux1_supplies[] = {
 	{
-		.supply = "vuax1",
+		.supply = "vaux1",
 	},
 };
 
@@ -561,7 +561,7 @@ static struct regulator_init_data rk29_regulator_vaux1 = {
 /* VAUX2 */
 static struct regulator_consumer_supply rk29_vaux2_supplies[] = {
 	{
-		.supply = "vuax2",
+		.supply = "vaux2",
 	},
 };
 
@@ -2088,7 +2088,8 @@ static struct spi_cs_gpio rk29xx_spi0_cs_gpios[SPI_CHIPSELECT_NUM] = {
     {
 		.name = "spi0 cs0",
 		.cs_gpio = RK29_PIN2_PC1,
-		.cs_iomux_name = NULL,
+		.cs_iomux_name = GPIO2C1_SPI0CSN0_NAME,
+		.cs_iomux_mode = GPIO2H_SPI0_CSN0,
 	},
 	{
 		.name = "spi0 cs1",
@@ -2102,7 +2103,8 @@ static struct spi_cs_gpio rk29xx_spi1_cs_gpios[SPI_CHIPSELECT_NUM] = {
     {
 		.name = "spi1 cs0",
 		.cs_gpio = RK29_PIN2_PC5,
-		.cs_iomux_name = NULL,
+		.cs_iomux_name = GPIO2C5_SPI1CSN0_NAME,
+		.cs_iomux_mode = GPIO2H_SPI1_CSN0,
 	},
 	{
 		.name = "spi1 cs1",
@@ -2115,40 +2117,20 @@ static struct spi_cs_gpio rk29xx_spi1_cs_gpios[SPI_CHIPSELECT_NUM] = {
 static int spi_io_init(struct spi_cs_gpio *cs_gpios, int cs_num)
 {
 #if 1
-	int i,j,ret;
-
-	//cs
+	int i;
 	if (cs_gpios) {
 		for (i=0; i<cs_num; i++) {
 			rk29_mux_api_set(cs_gpios[i].cs_iomux_name, cs_gpios[i].cs_iomux_mode);
-			ret = gpio_request(cs_gpios[i].cs_gpio, cs_gpios[i].name);
-			if (ret) {
-				for (j=0;j<i;j++) {
-					gpio_free(cs_gpios[j].cs_gpio);
-					//rk29_mux_api_mode_resume(cs_gpios[j].cs_iomux_name);
-				}
-				printk("[fun:%s, line:%d], gpio request err\n", __func__, __LINE__);
-				return -1;
-			}
-			gpio_direction_output(cs_gpios[i].cs_gpio, GPIO_HIGH);
 		}
 	}
 #endif
+
 	return 0;
 }
 
 static int spi_io_deinit(struct spi_cs_gpio *cs_gpios, int cs_num)
 {
-#if 1
-	int i;
 
-	if (cs_gpios) {
-		for (i=0; i<cs_num; i++) {
-			gpio_free(cs_gpios[i].cs_gpio);
-			//rk29_mux_api_mode_resume(cs_gpios[i].cs_iomux_name);
-		}
-	}
-#endif
 	return 0;
 }
 
@@ -2301,11 +2283,9 @@ static void __init machine_rk29_board_init(void)
 	gpio_direction_output(POWER_ON_PIN, GPIO_HIGH);
 	pm_power_off = rk29_pm_power_off;
 
-#ifdef CONFIG_WIFI_CONTROL_FUNC
-                rk29sdk_wifi_bt_gpio_control_init();
-#endif
 
-		platform_add_devices(devices, ARRAY_SIZE(devices));
+
+	platform_add_devices(devices, ARRAY_SIZE(devices));
 #ifdef CONFIG_I2C0_RK29
 	i2c_register_board_info(default_i2c0_data.bus_num, board_i2c0_devices,
 			ARRAY_SIZE(board_i2c0_devices));
@@ -2324,8 +2304,11 @@ static void __init machine_rk29_board_init(void)
 #endif
 
 	spi_register_board_info(board_spi_devices, ARRAY_SIZE(board_spi_devices));
-        
-    rk29sdk_init_wifi_mem();
+
+#ifdef CONFIG_WIFI_CONTROL_FUNC
+    rk29sdk_wifi_bt_gpio_control_init();
+	rk29sdk_init_wifi_mem();
+#endif        
 }
 
 static void __init machine_rk29_fixup(struct machine_desc *desc, struct tag *tags,