From: luowei <lw@rock-chips.com>
Date: Mon, 6 Sep 2010 10:33:19 +0000 (+0800)
Subject: add LCD_RESET and FPGA_RESET again,deal with a bug in rk2818_batter.cdrivers/fpga... 
X-Git-Tag: firefly_0821_release~11179
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8eb0724be184ab7109972c0ba13db056840c4194;p=firefly-linux-kernel-4.4.55.git

add LCD_RESET and FPGA_RESET again,deal with a bug in rk2818_batter.cdrivers/fpga/spi_fpga_init.c
---

diff --git a/drivers/fpga/spi_gpio.c b/drivers/fpga/spi_gpio.c
index cd5879757f21..34067f97544e 100755
--- a/drivers/fpga/spi_gpio.c
+++ b/drivers/fpga/spi_gpio.c
@@ -659,9 +659,9 @@ int spi_gpio_init_first(void)
 	spi_gpio_set_pindirection(SPI_GPIO_P2_10, SPI_GPIO_IN);		//X-XL input
 	spi_gpio_set_pindirection(SPI_GPIO_P2_11, SPI_GPIO_IN);		//X+XR input
 	
-	spi_gpio_set_pinlevel(SPI_GPIO_P2_12, SPI_GPIO_HIGH);		//LCD_RESET output//
+	spi_gpio_set_pinlevel(SPI_GPIO_P2_12, SPI_GPIO_LOW);		//LCD_RESET output//
 	spi_gpio_set_pindirection(SPI_GPIO_P2_12, SPI_GPIO_OUT);
-	//spi_gpio_set_pinlevel(SPI_GPIO_P2_12, SPI_GPIO_HIGH);
+	spi_gpio_set_pinlevel(SPI_GPIO_P2_12, SPI_GPIO_HIGH);
 	spi_gpio_set_pinlevel(SPI_GPIO_P2_13, SPI_GPIO_HIGH);		//USB_PWR_EN output
 	spi_gpio_set_pindirection(SPI_GPIO_P2_13, SPI_GPIO_OUT);
 	spi_gpio_set_pinlevel(SPI_GPIO_P2_14, SPI_GPIO_LOW);		//WL_HOST_WAKE_B output
@@ -1177,4 +1177,4 @@ int spi_gpio_init(void)
 
 MODULE_DESCRIPTION("Driver for spi2gpio.");
 MODULE_AUTHOR("luowei <lw@rock-chips.com>");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL");
diff --git a/drivers/power/rk2818_battery.c b/drivers/power/rk2818_battery.c
old mode 100644
new mode 100755
index f8af0c0450c8..fd0709dff035
--- a/drivers/power/rk2818_battery.c
+++ b/drivers/power/rk2818_battery.c
@@ -84,7 +84,7 @@ int gBatVoltage =  BATT_NOMAL_VOL_VALUE;
 int gBatLastCapacity = 0;
 int gBatCapacity = ((BATT_NOMAL_VOL_VALUE-BATT_ZERO_VOL_VALUE)*100/(BATT_MAX_VOL_VALUE-BATT_ZERO_VOL_VALUE));
 
-int gBatVoltageSamples[NUM_VOLTAGE_SAMPLE];
+int gBatVoltageSamples[NUM_VOLTAGE_SAMPLE+2]; //add 2 to handle one bug
 int gBatSlopeValue = 0;
 int gBatVoltageValue[2]={0,0};
 int *pSamples = &gBatVoltageSamples[0];		//²ÉÑùµãÖ¸Õë