From 751d4067e41867fd13a8a48809cf3757a0b6beda Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=82=B1=E5=BB=BA=E6=96=8C?= Date: Wed, 4 Sep 2013 19:52:26 +0800 Subject: [PATCH] headset board modify,remove gpio info --- arch/arm/mach-rk2928/board-phonepad.c | 12 +++++------- arch/arm/mach-rk2928/board-rk2928-phonepad.c | 10 ++++------ arch/arm/mach-rk30/board-rk30-phone-loquat.c | 7 +++---- arch/arm/mach-rk30/board-rk30-phone.c | 7 +++---- arch/arm/mach-rk30/board-rk30-phonepad-z600t.c | 5 ++--- arch/arm/mach-rk30/board-rk30-phonepad.c | 7 +++---- arch/arm/mach-rk30/board-rk30-sdk.c | 9 ++++----- arch/arm/mach-rk3188/board-rk3188m-f304.c | 5 ++--- 8 files changed, 26 insertions(+), 36 deletions(-) diff --git a/arch/arm/mach-rk2928/board-phonepad.c b/arch/arm/mach-rk2928/board-phonepad.c index 8d955364db5a..fdb04483b8cb 100644 --- a/arch/arm/mach-rk2928/board-phonepad.c +++ b/arch/arm/mach-rk2928/board-phonepad.c @@ -123,28 +123,28 @@ static int __init sc_board_init(void) } #endif #if defined (CONFIG_RK_HEADSET_DET) || defined (CONFIG_RK_HEADSET_IRQ_HOOK_ADC_DET) -static int rk_headset_io_init(int gpio, char *iomux_name, int iomux_mode) +static int rk_headset_io_init(int gpio) { int ret; ret = gpio_request(gpio, "headset_io"); if(ret) return ret; - rk30_mux_api_set(iomux_name, iomux_mode); +// rk30_mux_api_set(iomux_name, iomux_mode); gpio_pull_updown(gpio, PullDisable); gpio_direction_input(gpio); mdelay(50); return 0; }; -static int rk_hook_io_init(int gpio, char *iomux_name, int iomux_mode) +static int rk_hook_io_init(int gpio) { int ret; ret = gpio_request(gpio, "hook_io"); if(ret) return ret; - rk30_mux_api_set(iomux_name, iomux_mode); +// rk30_mux_api_set(iomux_name, iomux_mode); gpio_pull_updown(gpio, PullDisable); gpio_direction_input(gpio); mdelay(50); @@ -152,12 +152,10 @@ static int rk_hook_io_init(int gpio, char *iomux_name, int iomux_mode) }; struct rk_headset_pdata rk_headset_info = { - .Hook_down_type = HOOK_DOWN_HIGH, + .Hook_down_type = HOOK_DOWN_HIGH, .headset_in_type = HEADSET_IN_HIGH, .hook_key_code = KEY_MEDIA, - .headset_gpio_info = {"null", 0}, .headset_io_init = rk_headset_io_init, - .hook_gpio_info = {"null", 0}, .hook_io_init = rk_hook_io_init, }; struct platform_device rk_device_headset = { diff --git a/arch/arm/mach-rk2928/board-rk2928-phonepad.c b/arch/arm/mach-rk2928/board-rk2928-phonepad.c index 4f90e70d9f98..ec543e47fa7c 100755 --- a/arch/arm/mach-rk2928/board-rk2928-phonepad.c +++ b/arch/arm/mach-rk2928/board-rk2928-phonepad.c @@ -746,28 +746,28 @@ struct platform_device rk29_device_sc6610 = { }; #endif #if defined (CONFIG_RK_HEADSET_DET) || defined (CONFIG_RK_HEADSET_IRQ_HOOK_ADC_DET) -static int rk_headset_io_init(int gpio, char *iomux_name, int iomux_mode) +static int rk_headset_io_init(int gpio) { int ret; ret = gpio_request(gpio, "headset_io"); if(ret) return ret; - rk30_mux_api_set(iomux_name, iomux_mode); + rk30_mux_api_set(GPIO1B4_SPI_CSN1_NAME, GPIO1B_GPIO1B4); gpio_pull_updown(gpio, PullDisable); gpio_direction_input(gpio); mdelay(50); return 0; }; -static int rk_hook_io_init(int gpio, char *iomux_name, int iomux_mode) +static int rk_hook_io_init(int gpio) { int ret; ret = gpio_request(gpio, "hook_io"); if(ret) return ret; - rk30_mux_api_set(iomux_name, iomux_mode); + rk30_mux_api_set(GPIO0D1_UART2_CTSN_NAME, GPIO0D_GPIO0D1); gpio_pull_updown(gpio, PullDisable); gpio_direction_input(gpio); mdelay(50); @@ -780,9 +780,7 @@ struct rk_headset_pdata rk_headset_info = { .Hook_down_type = HOOK_DOWN_HIGH, .headset_in_type = HEADSET_IN_HIGH, .hook_key_code = KEY_MEDIA, - .headset_gpio_info = {GPIO1B4_SPI_CSN1_NAME, GPIO1B_GPIO1B4}, .headset_io_init = rk_headset_io_init, - .hook_gpio_info = {GPIO0D1_UART2_CTSN_NAME, GPIO0D_GPIO0D1}, .hook_io_init = rk_hook_io_init, }; struct platform_device rk_device_headset = { diff --git a/arch/arm/mach-rk30/board-rk30-phone-loquat.c b/arch/arm/mach-rk30/board-rk30-phone-loquat.c index a2e08f930e72..c50a506b4165 100755 --- a/arch/arm/mach-rk30/board-rk30-phone-loquat.c +++ b/arch/arm/mach-rk30/board-rk30-phone-loquat.c @@ -917,14 +917,14 @@ static struct gsensor_platform_data lis3dh_info = { #if defined (CONFIG_RK_HEADSET_DET) || defined (CONFIG_RK_HEADSET_IRQ_HOOK_ADC_DET) -static int rk_headset_io_init(int gpio, char *iomux_name, int iomux_mode) +static int rk_headset_io_init(int gpio) { int ret; - ret = gpio_request(gpio, NULL); + ret = gpio_request(gpio, "headset_input"); if(ret) return ret; - rk30_mux_api_set(iomux_name, iomux_mode); + rk30_mux_api_set(GPIO0D3_I2S22CHLRCKTX_SMCADVN_NAME, GPIO0D_GPIO0D3); gpio_pull_updown(gpio, PullDisable); gpio_direction_input(gpio); return 0; @@ -935,7 +935,6 @@ struct rk_headset_pdata rk_headset_info = { .headset_in_type = HEADSET_IN_LOW, .Hook_adc_chn = 2, .hook_key_code = KEY_MEDIA, - .headset_gpio_info = {GPIO0D3_I2S22CHLRCKTX_SMCADVN_NAME, GPIO0D_GPIO0D3}, .headset_io_init = rk_headset_io_init, }; diff --git a/arch/arm/mach-rk30/board-rk30-phone.c b/arch/arm/mach-rk30/board-rk30-phone.c index 0f474cab3cd8..dffe3a65eef4 100755 --- a/arch/arm/mach-rk30/board-rk30-phone.c +++ b/arch/arm/mach-rk30/board-rk30-phone.c @@ -910,14 +910,14 @@ static struct sensor_platform_data kxtik_info = { #if defined (CONFIG_RK_HEADSET_DET) || defined (CONFIG_RK_HEADSET_IRQ_HOOK_ADC_DET) -static int rk_headset_io_init(int gpio, char *iomux_name, int iomux_mode) +static int rk_headset_io_init(int gpio) { int ret; - ret = gpio_request(gpio, NULL); + ret = gpio_request(gpio, "headset_input"); if(ret) return ret; - rk30_mux_api_set(iomux_name, iomux_mode); + rk30_mux_api_set(GPIO0D3_I2S22CHLRCKTX_SMCADVN_NAME, GPIO0D_GPIO0D3); gpio_pull_updown(gpio, PullDisable); gpio_direction_input(gpio); return 0; @@ -928,7 +928,6 @@ struct rk_headset_pdata rk_headset_info = { .headset_in_type = HEADSET_IN_HIGH, .Hook_adc_chn = 2, .hook_key_code = KEY_MEDIA, - .headset_gpio_info = {GPIO0D3_I2S22CHLRCKTX_SMCADVN_NAME, GPIO0D_GPIO0D3}, .headset_io_init = rk_headset_io_init, }; diff --git a/arch/arm/mach-rk30/board-rk30-phonepad-z600t.c b/arch/arm/mach-rk30/board-rk30-phonepad-z600t.c index e85ec2ecd6e6..93542ba11889 100644 --- a/arch/arm/mach-rk30/board-rk30-phonepad-z600t.c +++ b/arch/arm/mach-rk30/board-rk30-phonepad-z600t.c @@ -177,14 +177,14 @@ struct rk29_keys_platform_data rk29_keys_pdata = { #if defined (CONFIG_RK_HEADSET_DET) || defined (CONFIG_RK_HEADSET_IRQ_HOOK_ADC_DET) -static int rk_headset_io_init(int gpio, char *iomux_name, int iomux_mode) +static int rk_headset_io_init(int gpio) { int ret; ret = gpio_request(gpio, NULL); if(ret) return ret; - rk30_mux_api_set(iomux_name, iomux_mode); + rk30_mux_api_set(GPIO0C7_TRACECTL_SMCADDR3_NAME, GPIO0C_GPIO0C7); gpio_pull_updown(gpio, PullDisable); gpio_direction_input(gpio); mdelay(50); @@ -196,7 +196,6 @@ struct rk_headset_pdata rk_headset_info = { .headset_in_type = HEADSET_IN_LOW, .Hook_adc_chn = 2, .hook_key_code = KEY_MEDIA, - .headset_gpio_info = {GPIO0C7_TRACECTL_SMCADDR3_NAME, GPIO0C_GPIO0C7}, .headset_io_init = rk_headset_io_init, }; diff --git a/arch/arm/mach-rk30/board-rk30-phonepad.c b/arch/arm/mach-rk30/board-rk30-phonepad.c index dd47529cfc15..565617501f21 100644 --- a/arch/arm/mach-rk30/board-rk30-phonepad.c +++ b/arch/arm/mach-rk30/board-rk30-phonepad.c @@ -681,14 +681,14 @@ static struct goodix_i2c_rmi_platform_data ts82x_pdata = { #if defined (CONFIG_RK_HEADSET_DET) || defined (CONFIG_RK_HEADSET_IRQ_HOOK_ADC_DET) -static int rk_headset_io_init(int gpio, char *iomux_name, int iomux_mode) +static int rk_headset_io_init(int gpio) { int ret; - ret = gpio_request(gpio, NULL); + ret = gpio_request(gpio, "headset_input"); if(ret) return ret; - rk30_mux_api_set(iomux_name, iomux_mode); + rk30_mux_api_set(GPIO0C7_TRACECTL_SMCADDR3_NAME, GPIO0C_GPIO0C7); gpio_pull_updown(gpio, PullDisable); gpio_direction_input(gpio); mdelay(50); @@ -700,7 +700,6 @@ struct rk_headset_pdata rk_headset_info = { .headset_in_type = HEADSET_IN_LOW, .Hook_adc_chn = 2, .hook_key_code = KEY_MEDIA, - .headset_gpio_info = {GPIO0C7_TRACECTL_SMCADDR3_NAME, GPIO0C_GPIO0C7}, .headset_io_init = rk_headset_io_init, }; diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c index 4b524a08b02a..8911b838dad7 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk.c +++ b/arch/arm/mach-rk30/board-rk30-sdk.c @@ -188,14 +188,14 @@ struct rk29_keys_platform_data rk29_keys_pdata = { #if defined (CONFIG_RK_HEADSET_DET) || defined (CONFIG_RK_HEADSET_IRQ_HOOK_ADC_DET) -static int rk_headset_io_init(int gpio, char *iomux_name, int iomux_mode) +static int rk_headset_io_init(int gpio) { int ret; - ret = gpio_request(gpio, NULL); + ret = gpio_request(gpio, "headset_input"); if(ret) return ret; - rk30_mux_api_set(iomux_name, iomux_mode); + rk30_mux_api_set(GPIO0C7_TRACECTL_SMCADDR3_NAME, GPIO0C_GPIO0C7); gpio_pull_updown(gpio, PullDisable); gpio_direction_input(gpio); mdelay(50); @@ -207,8 +207,7 @@ struct rk_headset_pdata rk_headset_info = { .headset_in_type = HEADSET_IN_LOW, .Hook_adc_chn = 2, .hook_key_code = KEY_MEDIA, - .headset_gpio_info = {GPIO0C7_TRACECTL_SMCADDR3_NAME, GPIO0C_GPIO0C7}, - .headset_io_init = rk_headset_io_init, + .headset_io_init = rk_headset_io_init, }; struct platform_device rk_device_headset = { diff --git a/arch/arm/mach-rk3188/board-rk3188m-f304.c b/arch/arm/mach-rk3188/board-rk3188m-f304.c index 17c4103b9c9e..28856a72fda2 100755 --- a/arch/arm/mach-rk3188/board-rk3188m-f304.c +++ b/arch/arm/mach-rk3188/board-rk3188m-f304.c @@ -773,10 +773,10 @@ static struct rk616_platform_data rk616_pdata = { #if defined (CONFIG_RK_HEADSET_DET) || defined (CONFIG_RK_HEADSET_IRQ_HOOK_ADC_DET) -static int rk_headset_io_init(int gpio, char *iomux_name, int iomux_mode) +static int rk_headset_io_init(int gpio) { int ret; - ret = gpio_request(gpio, NULL); + ret = gpio_request(gpio, "headset_input"); if(ret) return ret; @@ -791,7 +791,6 @@ struct rk_headset_pdata rk_headset_info = { .headset_in_type = HEADSET_IN_LOW, .Hook_adc_chn = 2, .hook_key_code = KEY_MEDIA, - //.headset_gpio_info = {GPIO0D3_I2S22CHLRCKTX_SMCADVN_NAME, GPIO0D_GPIO0D3}, .headset_io_init = rk_headset_io_init, }; -- 2.34.1