From 76d0d08e1166f5b2bf85204a1ddfe5f00b322992 Mon Sep 17 00:00:00 2001 From: Amit Nischal Date: Mon, 24 Oct 2016 18:06:02 +0530 Subject: clk: msm: Add COMMON_CLK branch memory flags clk_set_flags would fail for clients using the branch memory flags as the macros vary between the COMMON_CLK_QCOM and COMMON_CLK_MSM. Fix the same by adding the enum definitions. Change-Id: I30cd3fb0435e085e76a60043b80b6ff7aded2819 Signed-off-by: Amit Nischal --- include/linux/clk/msm-clk.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include/linux') diff --git a/include/linux/clk/msm-clk.h b/include/linux/clk/msm-clk.h index 22587e8852e2..964909d25021 100644 --- a/include/linux/clk/msm-clk.h +++ b/include/linux/clk/msm-clk.h @@ -14,6 +14,16 @@ #include +#if defined(CONFIG_COMMON_CLK_QCOM) +enum branch_mem_flags { + CLKFLAG_RETAIN_PERIPH, + CLKFLAG_NORETAIN_PERIPH, + CLKFLAG_RETAIN_MEM, + CLKFLAG_NORETAIN_MEM, + CLKFLAG_PERIPH_OFF_SET, + CLKFLAG_PERIPH_OFF_CLEAR, +}; +#elif defined(CONFIG_COMMON_CLK_MSM) #define CLKFLAG_INVERT 0x00000001 #define CLKFLAG_NOINVERT 0x00000002 #define CLKFLAG_NONEST 0x00000004 @@ -32,6 +42,7 @@ #define CLKFLAG_EPROBE_DEFER 0x00010000 #define CLKFLAG_PERIPH_OFF_SET 0x00020000 #define CLKFLAG_PERIPH_OFF_CLEAR 0x00040000 +#endif struct clk_lookup; struct clk; -- cgit v1.2.3 From e1cf6bb611cb9788fc1095a86926b1e1bf70048a Mon Sep 17 00:00:00 2001 From: Ghanim Fodi Date: Wed, 5 Oct 2016 11:59:18 +0300 Subject: msm: ipa3: Support IPA-USB suspend sequence without remote wake-up Today IPA-USB uses disconnect sequence when USB initiates suspend without remote wake-up, and uses suspend sequence when USB initiates suspend with remote wake-up. In accordance with USB-GSI driver, changing this behavior to use suspend sequence in both of the cases. This is to overcome some USB H/W malfunction when using disconnect sequence in case of suspend scenario. Change-Id: Iba43e192905ab37d196aea4b5d00861b9cb7c347 CRs-Fixed: 1068949 Signed-off-by: Ghanim Fodi --- include/linux/ipa_usb.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include/linux') diff --git a/include/linux/ipa_usb.h b/include/linux/ipa_usb.h index 0fe0e36c551f..de1163348c05 100644 --- a/include/linux/ipa_usb.h +++ b/include/linux/ipa_usb.h @@ -253,6 +253,7 @@ int ipa_usb_deinit_teth_prot(enum ipa_usb_teth_prot teth_prot); * @dl_clnt_hdl: client handle previously obtained from * ipa_usb_xdci_connect() for IN channel * @teth_prot: tethering protocol + * @with_remote_wakeup: Does host support remote wakeup? * * Note: Should not be called from atomic context * Note: for DPL, the ul will be ignored as irrelevant @@ -260,7 +261,8 @@ int ipa_usb_deinit_teth_prot(enum ipa_usb_teth_prot teth_prot); * @Return 0 on success, negative on failure */ int ipa_usb_xdci_suspend(u32 ul_clnt_hdl, u32 dl_clnt_hdl, - enum ipa_usb_teth_prot teth_prot); + enum ipa_usb_teth_prot teth_prot, + bool with_remote_wakeup); /** * ipa_usb_xdci_resume - Peripheral should call this function to resume @@ -313,7 +315,8 @@ static inline int ipa_usb_deinit_teth_prot(enum ipa_usb_teth_prot teth_prot) } static inline int ipa_usb_xdci_suspend(u32 ul_clnt_hdl, u32 dl_clnt_hdl, - enum ipa_usb_teth_prot teth_prot) + enum ipa_usb_teth_prot teth_prot, + bool with_remote_wakeup) { return -EPERM; } -- cgit v1.2.3 From 63288e7dc94dcee420413ea2c5d0ecab5b5d9569 Mon Sep 17 00:00:00 2001 From: Satish kumar sugasi Date: Mon, 17 Oct 2016 15:12:11 -0700 Subject: Bluetooth:Add ioctl to power control connectivity chip Added new ioctl command to perform power on/off operations on connectivity chipset from userspace process. CRs-Fixed: 1049512 Change-Id: Id254a12ba8fc2d57951d158c8fce80168375586d Signed-off-by: Satish kumar sugasi Signed-off-by: Bhakthavatsala Raghavendra --- include/linux/bluetooth-power.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/linux') diff --git a/include/linux/bluetooth-power.h b/include/linux/bluetooth-power.h index 7be94d298b88..a822ba8c07d1 100644 --- a/include/linux/bluetooth-power.h +++ b/include/linux/bluetooth-power.h @@ -85,4 +85,5 @@ struct bluetooth_power_platform_data { int bt_register_slimdev(struct device *dev); #define BT_CMD_SLIM_TEST 0xbfac +#define BT_CMD_PWR_CTRL 0xbfad #endif /* __LINUX_BLUETOOTH_POWER_H */ -- cgit v1.2.3