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>

diff --git a/drivers/extcon/extcon-intel-cht-wc.c b/drivers/extcon/extcon-intel-cht-wc.c
index bdb6787..71b1126 100644 (file)
--- a/drivers/extcon/extcon-intel-cht-wc.c
+++ b/drivers/extcon/extcon-intel-cht-wc.c
@@ -32,10 +32,10 @@
 #define CHT_WC_CHGRCTRL0_EMRGCHREN     BIT(1)
 #define CHT_WC_CHGRCTRL0_EXTCHRDIS     BIT(2)
 #define CHT_WC_CHGRCTRL0_SWCONTROL     BIT(3)
-#define CHT_WC_CHGRCTRL0_TTLCK_MASK    BIT(4)
-#define CHT_WC_CHGRCTRL0_CCSM_OFF_MASK BIT(5)
-#define CHT_WC_CHGRCTRL0_DBPOFF_MASK   BIT(6)
-#define CHT_WC_CHGRCTRL0_WDT_NOKICK    BIT(7)
+#define CHT_WC_CHGRCTRL0_TTLCK         BIT(4)
+#define CHT_WC_CHGRCTRL0_CCSM_OFF      BIT(5)
+#define CHT_WC_CHGRCTRL0_DBPOFF                BIT(6)
+#define CHT_WC_CHGRCTRL0_CHR_WDT_NOKICK        BIT(7)
 
 #define CHT_WC_CHGRCTRL1               0x5e17
 
@@ -52,7 +52,7 @@
 #define CHT_WC_USBSRC_TYPE_ACA         4
 #define CHT_WC_USBSRC_TYPE_SE1         5
 #define CHT_WC_USBSRC_TYPE_MHL         6
-#define CHT_WC_USBSRC_TYPE_FLOAT_DP_DN 7
+#define CHT_WC_USBSRC_TYPE_FLOATING    7
 #define CHT_WC_USBSRC_TYPE_OTHER       8
 #define CHT_WC_USBSRC_TYPE_DCP_EXTPHY  9
 
@@ -61,7 +61,7 @@
 #define CHT_WC_PWRSRC_STS              0x6e1e
 #define CHT_WC_PWRSRC_VBUS             BIT(0)
 #define CHT_WC_PWRSRC_DC               BIT(1)
-#define CHT_WC_PWRSRC_BAT              BIT(2)
+#define CHT_WC_PWRSRC_BATT             BIT(2)
 #define CHT_WC_PWRSRC_ID_GND           BIT(3)
 #define CHT_WC_PWRSRC_ID_FLOAT         BIT(4)
 
@@ -158,7 +158,7 @@ static int cht_wc_extcon_get_charger(struct cht_wc_extcon_data *ext,
                         ret);
                return EXTCON_CHG_USB_SDP;
        case CHT_WC_USBSRC_TYPE_SDP:
-       case CHT_WC_USBSRC_TYPE_FLOAT_DP_DN:
+       case CHT_WC_USBSRC_TYPE_FLOATING:
        case CHT_WC_USBSRC_TYPE_OTHER:
                return EXTCON_CHG_USB_SDP;
        case CHT_WC_USBSRC_TYPE_CDP:
@@ -279,7 +279,7 @@ static int cht_wc_extcon_sw_control(struct cht_wc_extcon_data *ext, bool enable)
 {
        int ret, mask, val;
 
-       mask = CHT_WC_CHGRCTRL0_SWCONTROL | CHT_WC_CHGRCTRL0_CCSM_OFF_MASK;
+       mask = CHT_WC_CHGRCTRL0_SWCONTROL | CHT_WC_CHGRCTRL0_CCSM_OFF;
        val = enable ? mask : 0;
        ret = regmap_update_bits(ext->regmap, CHT_WC_CHGRCTRL0, mask, val);
        if (ret)