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

diff --git a/drivers/fpga/spi_gpio.c b/drivers/fpga/spi_gpio.c
index cd5879757f210829612f85a4c053ab9ee2a07e0f..34067f97544e3f31821c395a8be5230a2426d16a 100755 (executable)
--- 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\r
        spi_gpio_set_pindirection(SPI_GPIO_P2_11, SPI_GPIO_IN);         //X+XR input\r
        \r
-       spi_gpio_set_pinlevel(SPI_GPIO_P2_12, SPI_GPIO_HIGH);           //LCD_RESET output//\r
+       spi_gpio_set_pinlevel(SPI_GPIO_P2_12, SPI_GPIO_LOW);            //LCD_RESET output//\r
        spi_gpio_set_pindirection(SPI_GPIO_P2_12, SPI_GPIO_OUT);\r
-       //spi_gpio_set_pinlevel(SPI_GPIO_P2_12, SPI_GPIO_HIGH);\r
+       spi_gpio_set_pinlevel(SPI_GPIO_P2_12, SPI_GPIO_HIGH);\r
        spi_gpio_set_pinlevel(SPI_GPIO_P2_13, SPI_GPIO_HIGH);           //USB_PWR_EN output\r
        spi_gpio_set_pindirection(SPI_GPIO_P2_13, SPI_GPIO_OUT);\r
        spi_gpio_set_pinlevel(SPI_GPIO_P2_14, SPI_GPIO_LOW);            //WL_HOST_WAKE_B output\r
@@ -1177,4 +1177,4 @@ int spi_gpio_init(void)
 \r
 MODULE_DESCRIPTION("Driver for spi2gpio.");\r
 MODULE_AUTHOR("luowei <lw@rock-chips.com>");\r
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL");\r

diff --git a/drivers/power/rk2818_battery.c b/drivers/power/rk2818_battery.c
old mode 100644 (file)
new mode 100755 (executable)
index f8af0c0..fd0709d
--- 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];                //²ÉÑùµãÖ¸Õë