github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

change wm831x irq base

Browse Source
This commit is contained in:
root 2011-05-20 17:02:56 +08:00
parent 5e76a9aea8
commit 7cbdae9c3f
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-rk29/board-rk29-a22.c
View File

@ -1208,7 +1208,7 @@ struct wm831x_pdata wm831x_platdata = {
.settinginfo=wm831x_gpio_settinginfo,
.settinginfolen=ARRAY_SIZE(wm831x_gpio_settinginfo),
.pin_type_init = wm831x_init_pin_type,
.irq_base= NR_AIC_IRQS + 2*NUM_GROUP + TCA6424_TOTOL_GPIO_IRQ_NUM + CONFIG_SPI_FPGA_GPIO_IRQ_NUM,
.irq_base= NR_AIC_IRQS + 7*NUM_GROUP,
#endif
.backlight = &wm831x_backlight_platdata,
@ -1420,7 +1420,7 @@ struct wm8994_pdata wm8994_platdata = {
//#endif
#ifdef CONFIG_RK_HEADSET_DET
#define HEADSET_GPIO RK29_PIN4_PD2
#define HEADSET_GPIO RK29_PIN3_PA6
struct rk2818_headset_data rk2818_headset_info = {
.gpio = HEADSET_GPIO,
.irq_type = IRQF_TRIGGER_RISING,//IRQF_TRIGGER_RISING -- ÉÏÉýÑØ IRQF_TRIGGER_FALLING -- ϽµÑØ
@ -2660,6 +2660,9 @@ static void __init rk29_board_iomux_init(void)
#ifdef CONFIG_RK29_PWM_REGULATOR
rk29_mux_api_set(REGULATOR_PWM_MUX_NAME,REGULATOR_PWM_MUX_MODE);
#endif
#ifdef CONFIG_RK_HEADSET_DET
rk29_mux_api_set(GPIO3A6_SMCADDR14_HOSTDATA14_NAME,GPIO3L_GPIO3A6);
#endif
}
static struct platform_device *devices[] __initdata = {

2
arch/arm/mach-rk29/board-rk29-phonesdk.c Normal file → Executable file
View File

@ -1225,7 +1225,7 @@ struct wm831x_pdata wm831x_platdata = {
.settinginfo=wm831x_gpio_settinginfo,
.settinginfolen=ARRAY_SIZE(wm831x_gpio_settinginfo),
.pin_type_init = wm831x_init_pin_type,
.irq_base= NR_AIC_IRQS + 2*NUM_GROUP + TCA6424_TOTOL_GPIO_IRQ_NUM + CONFIG_SPI_FPGA_GPIO_IRQ_NUM,
.irq_base= NR_AIC_IRQS + 7*NUM_GROUP,
#endif
.backlight = &wm831x_backlight_platdata,

2
drivers/headset_observe/rk_headset.c
View File

@ -206,7 +206,7 @@ static int rockchip_headsetobserve_probe(struct platform_device *pdev)
DBG("headsetobserve: request gpio_request failed\n");
return ret;
}
gpio_pull_updown(prk2818_headset_info->gpio, GPIONormal);
gpio_pull_updown(prk2818_headset_info->gpio, PullDisable);
gpio_direction_input(prk2818_headset_info->gpio);
prk2818_headset_info->irq = gpio_to_irq(prk2818_headset_info->gpio);