xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extcon: ptn5150: Switch to GENMASK() and BIT() macros

Browse Source 
Switch to GENMASK() and BIT() macros.

Signed-off-by: Ramuthevar Vadivel Murugan <vadivel.muruganx.ramuthevar@linux.intel.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
Ramuthevar Vadivel Murugan
2020-08-27 11:56:32 +08:00
committed by Chanwoo Choi
parent 611e92a0a3
commit 7e3b1caffc
1 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/extcon/extcon-ptn5150.c
View File

@@ -7,6 +7,7 @@
// Author: Vijai Kumar K <vijaikumar.kanagarajan@gmail.com> // Author: Vijai Kumar K <vijaikumar.kanagarajan@gmail.com>
// Copyright (c) 2020 Krzysztof Kozlowski <krzk@kernel.org> // Copyright (c) 2020 Krzysztof Kozlowski <krzk@kernel.org>
#include <linux/bitfield.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@@ -35,29 +36,13 @@ enum ptn5150_reg {
#define PTN5150_UFP_ATTACHED 0x2 #define PTN5150_UFP_ATTACHED 0x2
/* Define PTN5150 MASK/SHIFT constant */ /* Define PTN5150 MASK/SHIFT constant */
#define PTN5150_REG_DEVICE_ID_VENDOR_SHIFT 0 #define PTN5150_REG_DEVICE_ID_VERSION GENMASK(7, 3)
#define PTN5150_REG_DEVICE_ID_VENDOR_MASK \ #define PTN5150_REG_DEVICE_ID_VENDOR GENMASK(2, 0)
(0x3 << PTN5150_REG_DEVICE_ID_VENDOR_SHIFT)
#define PTN5150_REG_DEVICE_ID_VERSION_SHIFT 3 #define PTN5150_REG_CC_PORT_ATTACHMENT GENMASK(4, 2)
#define PTN5150_REG_DEVICE_ID_VERSION_MASK \ #define PTN5150_REG_CC_VBUS_DETECTION BIT(7)
(0x1f << PTN5150_REG_DEVICE_ID_VERSION_SHIFT) #define PTN5150_REG_INT_CABLE_ATTACH_MASK BIT(0)
#define PTN5150_REG_INT_CABLE_DETACH_MASK BIT(1)
#define PTN5150_REG_CC_PORT_ATTACHMENT_SHIFT 2
#define PTN5150_REG_CC_PORT_ATTACHMENT_MASK \
(0x7 << PTN5150_REG_CC_PORT_ATTACHMENT_SHIFT)
#define PTN5150_REG_CC_VBUS_DETECTION_SHIFT 7
#define PTN5150_REG_CC_VBUS_DETECTION_MASK \
(0x1 << PTN5150_REG_CC_VBUS_DETECTION_SHIFT)
#define PTN5150_REG_INT_CABLE_ATTACH_SHIFT 0
#define PTN5150_REG_INT_CABLE_ATTACH_MASK \
(0x1 << PTN5150_REG_INT_CABLE_ATTACH_SHIFT)
#define PTN5150_REG_INT_CABLE_DETACH_SHIFT 1
#define PTN5150_REG_INT_CABLE_DETACH_MASK \
(0x1 << PTN5150_REG_CC_CABLE_DETACH_SHIFT)
struct ptn5150_info { struct ptn5150_info {
struct device *dev; struct device *dev;
@@ -95,9 +80,7 @@ static void ptn5150_check_state(struct ptn5150_info *info)
return; return;
} }
port_status = ((reg_data & port_status = FIELD_GET(PTN5150_REG_CC_PORT_ATTACHMENT, reg_data);
PTN5150_REG_CC_PORT_ATTACHMENT_MASK) >>
PTN5150_REG_CC_PORT_ATTACHMENT_SHIFT);
switch (port_status) { switch (port_status) {
case PTN5150_DFP_ATTACHED: case PTN5150_DFP_ATTACHED:
@@ -107,8 +90,7 @@ static void ptn5150_check_state(struct ptn5150_info *info)
break; break;
case PTN5150_UFP_ATTACHED: case PTN5150_UFP_ATTACHED:
extcon_set_state_sync(info->edev, EXTCON_USB, false); extcon_set_state_sync(info->edev, EXTCON_USB, false);
vbus = ((reg_data & PTN5150_REG_CC_VBUS_DETECTION_MASK) >> vbus = FIELD_GET(PTN5150_REG_CC_VBUS_DETECTION, reg_data);
PTN5150_REG_CC_VBUS_DETECTION_SHIFT);
if (vbus) if (vbus)
gpiod_set_value_cansleep(info->vbus_gpiod, 0); gpiod_set_value_cansleep(info->vbus_gpiod, 0);
else else
@@ -191,11 +173,8 @@ static int ptn5150_init_dev_type(struct ptn5150_info *info)
return -EINVAL; return -EINVAL;
} }
vendor_id = ((reg_data & PTN5150_REG_DEVICE_ID_VENDOR_MASK) >> vendor_id = FIELD_GET(PTN5150_REG_DEVICE_ID_VENDOR, reg_data);
PTN5150_REG_DEVICE_ID_VENDOR_SHIFT); version_id = FIELD_GET(PTN5150_REG_DEVICE_ID_VERSION, reg_data);
version_id = ((reg_data & PTN5150_REG_DEVICE_ID_VERSION_MASK) >>
PTN5150_REG_DEVICE_ID_VERSION_SHIFT);
dev_dbg(info->dev, "Device type: version: 0x%x, vendor: 0x%x\n", dev_dbg(info->dev, "Device type: version: 0x%x, vendor: 0x%x\n",
version_id, vendor_id); version_id, vendor_id);