shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

board-*: 移除部分编译警告，其中names是指针的数组，不能直接赋为字符串，会引起内核oops

Browse Source
This commit is contained in:
黄涛
2010-09-08 14:21:03 +08:00
parent eb2f4ea81d
commit 18ea0d585c
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-rk2818/board-infosdk.c
View File

@@ -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,

1
arch/arm/mach-rk2818/board-midsdk.c
View File

@@ -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

1
arch/arm/mach-rk2818/board-phonesdk.c
View File

@@ -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

7
arch/arm/mach-rk2818/board-raho.c
View File

@@ -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 = {