Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 03:43:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge "ASoC: wcd9xxx: update the pinctrl for the slimbus based devices"

Browse source
This commit is contained in:
Linux Build Service Account 2014-08-14 23:33:28 -07:00 committed by Gerrit - the friendly Code Review server
parent 9a657f4914 8ecaf403ff
commit aa80e5f865
3 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/mfd/wcd9xxx-core.c
View file

@ -545,9 +545,10 @@ static void wcd9xxx_bring_down(struct wcd9xxx *wcd9xxx)
static int wcd9xxx_reset(struct wcd9xxx *wcd9xxx)
{
int ret;
struct wcd9xxx_pdata *pdata = wcd9xxx->dev->platform_data;
if (wcd9xxx->reset_gpio && wcd9xxx->slim_device_bootup
&& !wcd9xxx->use_pinctrl) {
&& !pdata->use_pinctrl) {
ret = gpio_request(wcd9xxx->reset_gpio, "CDC_RESET");
if (ret) {
pr_err("%s: Failed to request gpio %d\n", __func__,
@ -557,19 +558,8 @@ static int wcd9xxx_reset(struct wcd9xxx *wcd9xxx)
}
}
if (wcd9xxx->reset_gpio) {
if (wcd9xxx->use_pinctrl) {
if (pdata->use_pinctrl) {
/* Reset the CDC PDM TLMM pins to a default state */
ret = pinctrl_select_state(pinctrl_info.pinctrl,
pinctrl_info.extncodec_act);
if (ret != 0) {
pr_err("%s: Failed to enable gpio pins; ret=%d\n",
__func__, ret);
return ret;
}
gpio_set_value_cansleep(wcd9xxx->reset_gpio, 0);
msleep(20);
gpio_set_value_cansleep(wcd9xxx->reset_gpio, 1);
msleep(20);
ret = pinctrl_select_state(pinctrl_info.pinctrl,
pinctrl_info.extncodec_sus);
if (ret != 0) {
@ -577,6 +567,15 @@ static int wcd9xxx_reset(struct wcd9xxx *wcd9xxx)
__func__, ret);
return ret;
}
msleep(20);
ret = pinctrl_select_state(pinctrl_info.pinctrl,
pinctrl_info.extncodec_act);
if (ret != 0) {
pr_err("%s: Failed to enable gpio pins; ret=%d\n",
__func__, ret);
return ret;
}
msleep(20);
} else {
gpio_direction_output(wcd9xxx->reset_gpio, 0);
msleep(20);
@ -589,8 +588,9 @@ static int wcd9xxx_reset(struct wcd9xxx *wcd9xxx)
static void wcd9xxx_free_reset(struct wcd9xxx *wcd9xxx)
{
struct wcd9xxx_pdata *pdata = wcd9xxx->dev->platform_data;
if (wcd9xxx->reset_gpio) {
if (!wcd9xxx->use_pinctrl) {
if (!pdata->use_pinctrl) {
gpio_free(wcd9xxx->reset_gpio);
wcd9xxx->reset_gpio = 0;
} else
@ -1297,9 +1297,9 @@ static int wcd9xxx_i2c_probe(struct i2c_client *client,
}
ret = extcodec_get_pinctrl(&client->dev);
if (ret < 0)
wcd9xxx->use_pinctrl = false;
pdata->use_pinctrl = false;
else
wcd9xxx->use_pinctrl = true;
pdata->use_pinctrl = true;
if (i2c_check_functionality(client->adapter,
I2C_FUNC_I2C) == 0) {
@ -1815,6 +1815,12 @@ static int wcd9xxx_slim_probe(struct slim_device *slim)
wcd9xxx->mclk_rate = pdata->mclk_rate;
wcd9xxx->slim_device_bootup = true;
ret = extcodec_get_pinctrl(&slim->dev);
if (ret < 0)
pdata->use_pinctrl = false;
else
pdata->use_pinctrl = true;
ret = wcd9xxx_init_supplies(wcd9xxx, pdata);
if (ret) {
pr_err("%s: Fail to init Codec supplies %d\n", __func__, ret);

1
include/linux/mfd/wcd9xxx/core.h
View file

@ -214,7 +214,6 @@ struct wcd9xxx {
struct wcd9xxx_ch *rx_chs;
struct wcd9xxx_ch *tx_chs;
u32 mclk_rate;
u16 use_pinctrl;
const struct wcd9xxx_codec_type *codec_type;
};

1
include/linux/mfd/wcd9xxx/pdata.h
View file

@ -182,6 +182,7 @@ struct wcd9xxx_pdata {
u32 mclk_rate;
u32 dmic_sample_rate;
enum codec_variant cdc_variant;
u16 use_pinctrl;
};
#endif