From: cmc <cmc@rock-chips.com>
Date: Mon, 29 Nov 2010 08:28:09 +0000 (+0800)
Subject: remove gpio setup for spi
X-Git-Tag: firefly_0821_release~11018
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d73979924e512472a8c19f0e814be5eda3565126;p=firefly-linux-kernel-4.4.55.git

remove gpio setup for spi
---

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
old mode 100644
new mode 100755
index 925c0e44d01f..ff3b11f039a5
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -942,6 +942,7 @@ 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 0
 	int i,j,ret;
 	
 	//cs
@@ -960,11 +961,13 @@ static int spi_io_init(struct spi_cs_gpio *cs_gpios, int cs_num)
 			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 0
 	int i;
 	
 	if (cs_gpios) {
@@ -973,19 +976,23 @@ static int spi_io_deinit(struct spi_cs_gpio *cs_gpios, int cs_num)
 			//rk29_mux_api_mode_resume(cs_gpios[i].cs_iomux_name);
 		}
 	}
-	
+#endif
 	return 0;
 }
 
 static int spi_io_fix_leakage_bug(void)
 {
+#if 0
 	gpio_direction_output(RK29_PIN2_PC1, GPIO_LOW); 
+#endif
 	return 0;
 }
 
 static int spi_io_resume_leakage_bug(void)
 {
+#if 0
 	gpio_direction_output(RK29_PIN2_PC1, GPIO_HIGH);
+#endif
 	return 0;
 }
 
diff --git a/drivers/spi/rk29xx_spim.c b/drivers/spi/rk29xx_spim.c
index 17654f349b6a..9d15abc10d59 100755
--- a/drivers/spi/rk29xx_spim.c
+++ b/drivers/spi/rk29xx_spim.c
@@ -220,6 +220,7 @@ static void flush(struct rk29xx_spi *dws)
 	wait_till_not_busy(dws);
 }
 
+#if 0
 static void spi_cs_control(struct rk29xx_spi *dws, u32 cs, u8 flag)
 {
 	struct rk29xx_spi_platform_data *pdata = dws->master->dev.platform_data;
@@ -230,6 +231,7 @@ static void spi_cs_control(struct rk29xx_spi *dws, u32 cs, u8 flag)
 	else
 		gpio_direction_output(cs_gpios[cs].cs_gpio, GPIO_LOW);
 }
+#endif
 
 static int null_writer(struct rk29xx_spi *dws)
 {
@@ -1509,7 +1511,7 @@ static int rk29xx_spi_setup(struct spi_device *spi)
 		if (!chip)
 			return -ENOMEM;
 
-		chip->cs_control = spi_cs_control;
+		chip->cs_control = NULL;
 		chip->enable_dma = 1;  //0;
 	}