AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

extcon: intel: Split out some definitions to a common header

Browse Source 
We are going to use some definitions in the other Intel extcon drivers,
thus, split out them to a common header file.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
Andy Shevchenko 2019-03-19 16:30:41 +02:00 committed by Chanwoo Choi
parent db8b4aefd1
commit 098b7ae8ec
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/extcon/extcon-intel-cht-wc.c
View File

@ -17,6 +17,8 @@
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "extcon-intel.h"
#define CHT_WC_PHYCTRL 0x5e07 #define CHT_WC_PHYCTRL 0x5e07
#define CHT_WC_CHGRCTRL0 0x5e16 #define CHT_WC_CHGRCTRL0 0x5e16
@ -80,15 +82,6 @@
#define CHT_WC_VBUS_GPIO_CTLO_DRV_OD BIT(4) #define CHT_WC_VBUS_GPIO_CTLO_DRV_OD BIT(4)
#define CHT_WC_VBUS_GPIO_CTLO_DIR_OUT BIT(5) #define CHT_WC_VBUS_GPIO_CTLO_DIR_OUT BIT(5)
enum cht_wc_usb_id {
USB_ID_OTG,
USB_ID_GND,
USB_ID_FLOAT,
USB_RID_A,
USB_RID_B,
USB_RID_C,
};
enum cht_wc_mux_select { enum cht_wc_mux_select {
MUX_SEL_PMIC = 0, MUX_SEL_PMIC = 0,
MUX_SEL_SOC, MUX_SEL_SOC,
@ -116,9 +109,9 @@ static int cht_wc_extcon_get_id(struct cht_wc_extcon_data *ext, int pwrsrc_sts)
{ {
switch ((pwrsrc_sts & CHT_WC_PWRSRC_USBID_MASK) >> CHT_WC_PWRSRC_USBID_SHIFT) { switch ((pwrsrc_sts & CHT_WC_PWRSRC_USBID_MASK) >> CHT_WC_PWRSRC_USBID_SHIFT) {
case CHT_WC_PWRSRC_RID_GND: case CHT_WC_PWRSRC_RID_GND:
return USB_ID_GND; return INTEL_USB_ID_GND;
case CHT_WC_PWRSRC_RID_FLOAT: case CHT_WC_PWRSRC_RID_FLOAT:
return USB_ID_FLOAT; return INTEL_USB_ID_FLOAT;
case CHT_WC_PWRSRC_RID_ACA: case CHT_WC_PWRSRC_RID_ACA:
default: default:
/* /*
@ -126,7 +119,7 @@ static int cht_wc_extcon_get_id(struct cht_wc_extcon_data *ext, int pwrsrc_sts)
* the USBID GPADC channel here and determine ACA role * the USBID GPADC channel here and determine ACA role
* based on that. * based on that.
*/ */
return USB_ID_FLOAT; return INTEL_USB_ID_FLOAT;
} }
} }
@ -260,7 +253,7 @@ static void cht_wc_extcon_pwrsrc_event(struct cht_wc_extcon_data *ext)
} }
id = cht_wc_extcon_get_id(ext, pwrsrc_sts); id = cht_wc_extcon_get_id(ext, pwrsrc_sts);
if (id == USB_ID_GND) { if (id == INTEL_USB_ID_GND) {
cht_wc_extcon_enable_charging(ext, false); cht_wc_extcon_enable_charging(ext, false);
cht_wc_extcon_set_otgmode(ext, true); cht_wc_extcon_set_otgmode(ext, true);
@ -293,7 +286,7 @@ static void cht_wc_extcon_pwrsrc_event(struct cht_wc_extcon_data *ext)
ext->previous_cable = cable; ext->previous_cable = cable;
} }
ext->usb_host = ((id == USB_ID_GND) || (id == USB_RID_A)); ext->usb_host = ((id == INTEL_USB_ID_GND) || (id == INTEL_USB_RID_A));
extcon_set_state_sync(ext->edev, EXTCON_USB_HOST, ext->usb_host); extcon_set_state_sync(ext->edev, EXTCON_USB_HOST, ext->usb_host);
} }

20
drivers/extcon/extcon-intel.h Normal file
View File

@ -0,0 +1,20 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Header file for Intel extcon hardware
*
* Copyright (C) 2019 Intel Corporation. All rights reserved.
*/
#ifndef __EXTCON_INTEL_H__
#define __EXTCON_INTEL_H__
enum extcon_intel_usb_id {
INTEL_USB_ID_OTG,
INTEL_USB_ID_GND,
INTEL_USB_ID_FLOAT,
INTEL_USB_RID_A,
INTEL_USB_RID_B,
INTEL_USB_RID_C,
};
#endif /* __EXTCON_INTEL_H__ */