diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bluetooth-power.h | 4 | ||||
| -rw-r--r-- | include/linux/diagchar.h | 9 | ||||
| -rw-r--r-- | include/linux/phy/phy-qcom-ufs.h | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/include/linux/bluetooth-power.h b/include/linux/bluetooth-power.h index 7211c48dbc7b..d2dfc1477c9d 100644 --- a/include/linux/bluetooth-power.h +++ b/include/linux/bluetooth-power.h @@ -50,6 +50,7 @@ struct bt_power_vreg_data { struct bluetooth_power_platform_data { /* Bluetooth reset gpio */ int bt_gpio_sys_rst; + struct device *slim_dev; /* VDDIO voltage regulator */ struct bt_power_vreg_data *bt_vdd_io; /* VDD_PA voltage regulator */ @@ -70,4 +71,7 @@ struct bluetooth_power_platform_data { int (*bt_power_setup)(int); }; +int bt_register_slimdev(struct device *dev); + +#define BT_CMD_SLIM_TEST 0xbfac #endif /* __LINUX_BLUETOOTH_POWER_H */ diff --git a/include/linux/diagchar.h b/include/linux/diagchar.h index 3b25d7d1280c..768c44d9ea8b 100644 --- a/include/linux/diagchar.h +++ b/include/linux/diagchar.h @@ -144,10 +144,10 @@ the appropriate macros. */ /* This needs to be modified manually now, when we add a new RANGE of SSIDs to the msg_mask_tbl */ #define MSG_MASK_TBL_CNT 25 -#define APPS_EVENT_LAST_ID 0x0ABB +#define APPS_EVENT_LAST_ID 0x0B14 #define MSG_SSID_0 0 -#define MSG_SSID_0_LAST 117 +#define MSG_SSID_0_LAST 118 #define MSG_SSID_1 500 #define MSG_SSID_1_LAST 506 #define MSG_SSID_2 1000 @@ -335,7 +335,8 @@ static const uint32_t msg_bld_masks_0[] = { MSG_LVL_LOW|MSG_LVL_MED|MSG_LVL_HIGH|MSG_LVL_ERROR|MSG_LVL_FATAL, MSG_LVL_LOW|MSG_LVL_MED|MSG_LVL_HIGH|MSG_LVL_ERROR|MSG_LVL_FATAL, MSG_LVL_MED, - MSG_LVL_MED + MSG_LVL_MED, + MSG_LVL_HIGH }; static const uint32_t msg_bld_masks_1[] = { @@ -853,7 +854,7 @@ static const uint32_t msg_bld_masks_23[] = { /* LOG CODES */ static const uint32_t log_code_last_tbl[] = { 0x0, /* EQUIP ID 0 */ - 0x192C, /* EQUIP ID 1 */ + 0x1966, /* EQUIP ID 1 */ 0x0, /* EQUIP ID 2 */ 0x0, /* EQUIP ID 3 */ 0x4910, /* EQUIP ID 4 */ diff --git a/include/linux/phy/phy-qcom-ufs.h b/include/linux/phy/phy-qcom-ufs.h index 540938ea3bc3..7945fea14d77 100644 --- a/include/linux/phy/phy-qcom-ufs.h +++ b/include/linux/phy/phy-qcom-ufs.h @@ -57,5 +57,6 @@ int ufs_qcom_phy_is_pcs_ready(struct phy *phy); void ufs_qcom_phy_save_controller_version(struct phy *phy, u8 major, u16 minor, u16 step); const char *ufs_qcom_phy_name(struct phy *phy); +int ufs_qcom_phy_configure_lpm(struct phy *generic_phy, bool enable); #endif /* PHY_QCOM_UFS_H_ */ |