headset board modify,remove gpio info

diff --git a/arch/arm/mach-rk2928/board-phonepad.c b/arch/arm/mach-rk2928/board-phonepad.c
index 8d955364db5a6419b00d7a65708924982dc7957d..fdb04483b8cb6f887e0e3bb4364e8851f716200a 100644 (file)
--- 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 4f90e70d9f98f8895a45fccd240ac19af1339209..ec543e47fa7c492082d1e866a5f65dbbe53cba19 100755 (executable)
--- 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 a2e08f930e72c259d02184481367d4e925df1866..c50a506b41654f50bcb6e217ca8bc47f9f3fdcfb 100755 (executable)
--- 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 0f474cab3cd89cea077f2d227ac7f1abf093bfeb..dffe3a65eef4c0e0fef71462af8c9d87edc7805a 100755 (executable)
--- 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 e85ec2ecd6e613a8886a49c7ac445a20c73c8b6b..93542ba11889fe8e67c46f1c0fcf91407ff6978b 100644 (file)
--- 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 dd47529cfc1575a96e23285e31e628a6460693fe..565617501f213d6012011dec54186e2614cbc636 100644 (file)
--- 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 4b524a08b02a17a637f03d5ecd4b1dfd73aa822a..8911b838dad70d640dfc3375944c92b8337c9dd5 100755 (executable)
--- 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 17c4103b9c9ebf6fb1ad7405dd33b319df1939be..28856a72fda2efd139a3f41e57f13443e08b252f 100755 (executable)
--- 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,
 };