From: lhh <lhh@rock-chips.com>
Date: Wed, 8 Sep 2010 11:46:00 +0000 (+0800)
Subject: update info it50 config
X-Git-Tag: firefly_0821_release~11174
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b1d7d04c4997de79ab9a1d60d1829a34ce75657a;p=firefly-linux-kernel-4.4.55.git

update info it50 config
---

diff --git a/arch/arm/configs/rk2818_info_it50_defconfig b/arch/arm/configs/rk2818_info_it50_defconfig
index d2bb00d95b6b..d3c84c1d9fce 100644
--- a/arch/arm/configs/rk2818_info_it50_defconfig
+++ b/arch/arm/configs/rk2818_info_it50_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.9
-# Wed Sep  8 16:46:21 2010
+# Wed Sep  8 19:42:09 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -863,6 +863,7 @@ CONFIG_GPIOLIB=y
 CONFIG_IOEXTEND_TCA6424=y
 CONFIG_EXPANDED_GPIO_NUM=24
 CONFIG_EXPANDED_GPIO_IRQ_NUM=24
+CONFIG_SOFT_INTERRUPT=y
 CONFIG_SPI_FPGA_GPIO_NUM=0
 CONFIG_SPI_FPGA_GPIO_IRQ_NUM=0
 # CONFIG_W1 is not set
diff --git a/arch/arm/mach-rk2818/board-infoit50.c b/arch/arm/mach-rk2818/board-infoit50.c
index f7b9226db894..20761408772a 100644
--- a/arch/arm/mach-rk2818/board-infoit50.c
+++ b/arch/arm/mach-rk2818/board-infoit50.c
@@ -348,7 +348,6 @@ struct pca9554_platform_data rk2818_pca9554_data={
 	.pca9954_irq_pin=RK2818_PIN_PE2,
 	.settinginfo=extern_gpio_settinginfo,
 	.settinginfolen=ARRAY_SIZE(extern_gpio_settinginfo),
-	.names="pca9554",
 };
 #endif
 
@@ -449,9 +448,12 @@ struct tca6424_platform_data rk2818_tca6424_data={
 	.gpio_irq_start=NR_AIC_IRQS + 2*NUM_GROUP + CONFIG_SPI_FPGA_GPIO_IRQ_NUM,
 	.irq_pin_num=CONFIG_EXPANDED_GPIO_IRQ_NUM,
 	.tca6424_irq_pin=RK2818_PIN_PA1,
+	.expand_port_group = 3,
+	.expand_port_pinnum = 8,
+	.rk_irq_mode = IRQF_TRIGGER_LOW,
+	.rk_irq_gpio_pull_up_down = GPIOPullUp,
 	.settinginfo=extgpio_tca6424_settinginfo,
 	.settinginfolen=ARRAY_SIZE(extgpio_tca6424_settinginfo),
-	.names="extend_gpio_tca6424",
 	.reseti2cpin = tca6424_reset_itr,
 };
 #endif
@@ -487,14 +489,16 @@ static struct wm8994_platform_data wm8994_data = {
  * i2c devices
  * author: kfx@rock-chips.com
 *****************************************************************************************/
-static void rk2818_i2c0_io_init(void)
+static int rk2818_i2c0_io_init(void)
 {
 	rk2818_mux_api_set(GPIOE_I2C0_SEL_NAME, IOMUXA_I2C0);
+	return 0;
 }
 
-static void rk2818_i2c1_io_init(void)
+static int rk2818_i2c1_io_init(void)
 {
 	rk2818_mux_api_set(GPIOE_U1IR_I2C1_NAME, IOMUXA_I2C1);
+	return 0;
 }
 struct rk2818_i2c_platform_data default_i2c0_data = { 
 	.bus_num    = 0,
@@ -843,6 +847,7 @@ static int serial_io_init2(void)
 {
 	rk2818_mux_api_set(GPIOF01_UART2_SEL_NAME, IOMUXB_UART2_IN_OUT);
 	rk2818_mux_api_set(GPIOA23_UART2_SEL_NAME, IOMUXB_UART2_CTS_RTS);
+	return 0;
 }
 
 struct rk2818_serial_platform_data rk2818_serial2_platdata = {
@@ -1156,7 +1161,7 @@ struct rk2818fb_info rk2818_fb_info = {
 #define BL_EN_MUX_MODE    IOMUXB_GPIO1_B34
 
 #define BL_EN_PIN         RK2818_PIN_PF3
-#define BL_EN_VALUE       GPIO_HIGH
+#define BL_EN_VALUE       GPIO_LOW   ///GPIO_HIGH