From 18ea0d585cfb48432aad23fefb1198a08a263b1e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Wed, 8 Sep 2010 14:21:03 +0800 Subject: [PATCH] =?utf8?q?board-*:=20=E7=A7=BB=E9=99=A4=E9=83=A8=E5=88=86?= =?utf8?q?=E7=BC=96=E8=AF=91=E8=AD=A6=E5=91=8A=EF=BC=8C=E5=85=B6=E4=B8=ADn?= =?utf8?q?ames=E6=98=AF=E6=8C=87=E9=92=88=E7=9A=84=E6=95=B0=E7=BB=84?= =?utf8?q?=EF=BC=8C=E4=B8=8D=E8=83=BD=E7=9B=B4=E6=8E=A5=E8=B5=8B=E4=B8=BA?= =?utf8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=EF=BC=8C=E4=BC=9A=E5=BC=95=E8=B5=B7?= =?utf8?q?=E5=86=85=E6=A0=B8oops?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- arch/arm/mach-rk2818/board-infosdk.c | 8 ++++---- arch/arm/mach-rk2818/board-midsdk.c | 1 - arch/arm/mach-rk2818/board-phonesdk.c | 1 - arch/arm/mach-rk2818/board-raho.c | 7 ++++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-rk2818/board-infosdk.c b/arch/arm/mach-rk2818/board-infosdk.c index 609707151bfd..0d1fdc8ccd14 100755 --- a/arch/arm/mach-rk2818/board-infosdk.c +++ b/arch/arm/mach-rk2818/board-infosdk.c @@ -351,7 +351,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 @@ -458,7 +457,6 @@ struct tca6424_platform_data rk2818_tca6424_data={ .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 @@ -494,14 +492,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, diff --git a/arch/arm/mach-rk2818/board-midsdk.c b/arch/arm/mach-rk2818/board-midsdk.c index c42f1c6b96fd..f18556ebbc55 100755 --- a/arch/arm/mach-rk2818/board-midsdk.c +++ b/arch/arm/mach-rk2818/board-midsdk.c @@ -250,7 +250,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 diff --git a/arch/arm/mach-rk2818/board-phonesdk.c b/arch/arm/mach-rk2818/board-phonesdk.c index ec63df34107e..46da4192de9a 100755 --- a/arch/arm/mach-rk2818/board-phonesdk.c +++ b/arch/arm/mach-rk2818/board-phonesdk.c @@ -250,7 +250,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 diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c index b03a9a82a052..3c5eeb0128f5 100644 --- a/arch/arm/mach-rk2818/board-raho.c +++ b/arch/arm/mach-rk2818/board-raho.c @@ -358,7 +358,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 @@ -674,14 +673,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 = { -- 2.34.1