tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
extcon: cht-wc: Fix definition names according to spec
There is no suffix MASK in the spec and other small spelling fixes.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
authored by
Andy Shevchenko
and committed by
Chanwoo Choi
001d3ecc
962341b5
+8
-8
+8
-8
drivers/extcon/extcon-intel-cht-wc.c
+8
-8
drivers/extcon/extcon-intel-cht-wc.c
···
32
32
#define CHT_WC_CHGRCTRL0_EMRGCHREN BIT(1)
33
33
#define CHT_WC_CHGRCTRL0_EXTCHRDIS BIT(2)
34
34
#define CHT_WC_CHGRCTRL0_SWCONTROL BIT(3)
35
-
#define CHT_WC_CHGRCTRL0_TTLCK_MASK BIT(4)
36
-
#define CHT_WC_CHGRCTRL0_CCSM_OFF_MASK BIT(5)
37
-
#define CHT_WC_CHGRCTRL0_DBPOFF_MASK BIT(6)
38
-
#define CHT_WC_CHGRCTRL0_WDT_NOKICK BIT(7)
35
+
#define CHT_WC_CHGRCTRL0_TTLCK BIT(4)
36
+
#define CHT_WC_CHGRCTRL0_CCSM_OFF BIT(5)
37
+
#define CHT_WC_CHGRCTRL0_DBPOFF BIT(6)
38
+
#define CHT_WC_CHGRCTRL0_CHR_WDT_NOKICK BIT(7)
39
39
40
40
#define CHT_WC_CHGRCTRL1 0x5e17
41
41
···
52
52
#define CHT_WC_USBSRC_TYPE_ACA 4
53
53
#define CHT_WC_USBSRC_TYPE_SE1 5
54
54
#define CHT_WC_USBSRC_TYPE_MHL 6
55
-
#define CHT_WC_USBSRC_TYPE_FLOAT_DP_DN 7
55
+
#define CHT_WC_USBSRC_TYPE_FLOATING 7
56
56
#define CHT_WC_USBSRC_TYPE_OTHER 8
57
57
#define CHT_WC_USBSRC_TYPE_DCP_EXTPHY 9
58
58
···
61
61
#define CHT_WC_PWRSRC_STS 0x6e1e
62
62
#define CHT_WC_PWRSRC_VBUS BIT(0)
63
63
#define CHT_WC_PWRSRC_DC BIT(1)
64
-
#define CHT_WC_PWRSRC_BAT BIT(2)
64
+
#define CHT_WC_PWRSRC_BATT BIT(2)
65
65
#define CHT_WC_PWRSRC_ID_GND BIT(3)
66
66
#define CHT_WC_PWRSRC_ID_FLOAT BIT(4)
67
67
···
158
158
ret);
159
159
return EXTCON_CHG_USB_SDP;
160
160
case CHT_WC_USBSRC_TYPE_SDP:
161
-
case CHT_WC_USBSRC_TYPE_FLOAT_DP_DN:
161
+
case CHT_WC_USBSRC_TYPE_FLOATING:
162
162
case CHT_WC_USBSRC_TYPE_OTHER:
163
163
return EXTCON_CHG_USB_SDP;
164
164
case CHT_WC_USBSRC_TYPE_CDP:
···
279
279
{
280
280
int ret, mask, val;
281
281
282
-
mask = CHT_WC_CHGRCTRL0_SWCONTROL | CHT_WC_CHGRCTRL0_CCSM_OFF_MASK;
282
+
mask = CHT_WC_CHGRCTRL0_SWCONTROL | CHT_WC_CHGRCTRL0_CCSM_OFF;
283
283
val = enable ? mask : 0;
284
284
ret = regmap_update_bits(ext->regmap, CHT_WC_CHGRCTRL0, mask, val);
285
285
if (ret)