diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/msm-clocks-cobalt.h | 1 | ||||
| -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 | ||||
| -rw-r--r-- | include/soc/qcom/socinfo.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/msm_mdp.h | 5 |
6 files changed, 20 insertions, 4 deletions
diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h index cfbccad9f516..c4c8f271e944 100644 --- a/include/dt-bindings/clock/msm-clocks-cobalt.h +++ b/include/dt-bindings/clock/msm-clocks-cobalt.h @@ -457,6 +457,7 @@ #define clk_dp_link_2x_clk_divsel_ten 0xfeb9924d #define clk_dp_link_2x_clk_mux 0xce4c4fc6 #define clk_vco_divided_clk_src 0x3da6cb51 +#define clk_hdmi_vco_clk 0xbb7dc20d /* clock_gpu controlled clocks*/ #define clk_gpucc_xo 0xc4e1a890 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_ */ diff --git a/include/soc/qcom/socinfo.h b/include/soc/qcom/socinfo.h index a39e42ce4593..39527ed83fa7 100644 --- a/include/soc/qcom/socinfo.h +++ b/include/soc/qcom/socinfo.h @@ -92,6 +92,8 @@ of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmcobalt") #define early_machine_is_msmhamster() \ of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmhamster") +#define early_machine_is_msmfalcon() \ + of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmfalcon") #else #define of_board_is_sim() 0 #define of_board_is_rumi() 0 @@ -127,6 +129,7 @@ #define early_machine_is_msm8929() 0 #define early_machine_is_msmcobalt() 0 #define early_machine_is_msmhamster() 0 +#define early_machine_is_msmfalcon() 0 #endif #define PLATFORM_SUBTYPE_MDM 1 @@ -185,6 +188,7 @@ enum msm_cpu { MSM_CPU_8929, MSM_CPU_COBALT, MSM_CPU_HAMSTER, + MSM_CPU_FALCON, }; struct msm_soc_info { diff --git a/include/uapi/linux/msm_mdp.h b/include/uapi/linux/msm_mdp.h index 1c04668ffc98..a1237ed996a5 100644 --- a/include/uapi/linux/msm_mdp.h +++ b/include/uapi/linux/msm_mdp.h @@ -296,6 +296,11 @@ enum mdss_mdp_max_bw_mode { /* Count of the number of MDP_FB_PAGE_PROTECTION_... values. */ #define MDP_NUM_FB_PAGE_PROTECTION_VALUES (5) +#define MDP_DEEP_COLOR_YUV444 0x1 +#define MDP_DEEP_COLOR_RGB30B 0x2 +#define MDP_DEEP_COLOR_RGB36B 0x4 +#define MDP_DEEP_COLOR_RGB48B 0x8 + struct mdp_rect { uint32_t x; uint32_t y; |