From bbcb7758294b882907b011c0a70b55a5bfd91b43 Mon Sep 17 00:00:00 2001 From: Stephen Oglesby Date: Thu, 19 May 2016 17:19:35 -0700 Subject: ASoC: msmcobalt: Switch ground/mic swap GPIO control to pinctrl Switch to swap ground and mic headset poles is controlled by a GPIO on the Apps processor instead of the PMIC, and therefore software logic must change to use pinctrl APIs CRs-fixed: 1019254 Change-Id: Ibccddc82b18614ddbe6ef9c9720b3de1ce00163e Signed-off-by: Stephen Oglesby --- include/linux/mfd/msm-cdc-pinctrl.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/linux') diff --git a/include/linux/mfd/msm-cdc-pinctrl.h b/include/linux/mfd/msm-cdc-pinctrl.h index a4a34c125581..395b935b6aec 100644 --- a/include/linux/mfd/msm-cdc-pinctrl.h +++ b/include/linux/mfd/msm-cdc-pinctrl.h @@ -19,6 +19,7 @@ #ifdef CONFIG_MSM_CDC_PINCTRL extern int msm_cdc_pinctrl_select_sleep_state(struct device_node *); extern int msm_cdc_pinctrl_select_active_state(struct device_node *); +extern bool msm_cdc_pinctrl_get_state(struct device_node *); #else int msm_cdc_pinctrl_select_sleep_state(struct device_node *np) -- cgit v1.2.3 From 20e43d0532e9cedb5961f8d4ff848b20cdfeb418 Mon Sep 17 00:00:00 2001 From: Asutosh Das Date: Thu, 21 Apr 2016 14:15:15 +0530 Subject: mmc: core: fix reading the bkops status from card The bkops status is indicated by the bit 0 and 1 of the 246th byte of the ext_csd register. The current code doesn't ignore the rest of the byte. Fix this by extracting the bit 0 and 1 only for the current bkops urgency. The exception level is defined by the least significant nibble of 54th byte in the ext_csd register. The current code doesn't ignore the rest of the byte. Fix this by extracting the nibble(LSB) for exception status. Change-Id: Ic90fe26a676ae7dd2063e17bc3771db83605f4dc Signed-off-by: Asutosh Das [subhashj@codeaurora.org: fixed trivial merge conflicts] Signed-off-by: Subhash Jadavani --- include/linux/mmc/card.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/linux') diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index e7578be38ddf..1c87478b5fc0 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -128,6 +128,7 @@ struct mmc_ext_csd { u8 raw_pwr_cl_ddr_52_360; /* 239 */ u8 raw_pwr_cl_ddr_200_360; /* 253 */ u8 cache_flush_policy; /* 240 */ +#define MMC_BKOPS_URGENCY_MASK 0x3 u8 raw_bkops_status; /* 246 */ u8 raw_sectors[4]; /* 212 - 4 bytes */ u8 cmdq_depth; /* 307 */ -- cgit v1.2.3