From: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
To: lee.jones@linaro.org, broonie@kernel.org,
linus.walleij@linaro.org, gnurou@gmail.com,
cw00.choi@samsung.com
Cc: myungjoo.ham@samsung.com, devicetree@vger.kernel.org,
alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com,
linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org,
ckeepax@opensource.wolfsonmicro.com
Subject: [PATCH v3 6/8] extcon: arizona: Add support for WM8998 and WM1814
Date: Fri, 1 May 2015 16:15:17 +0100 [thread overview]
Message-ID: <1430493319-23808-7-git-send-email-rf@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1430493319-23808-1-git-send-email-rf@opensource.wolfsonmicro.com>
This patch adds support for the WM8998 and WM1814 codecs.
These use the same IP version as WM5110 but have different
clamp control.
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/extcon/extcon-arizona.c | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 830c5f9..586ec53 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -1,7 +1,7 @@
/*
* extcon-arizona.c - Extcon driver Wolfson Arizona devices
*
- * Copyright (C) 2012 Wolfson Microelectronics plc
+ * Copyright (C) 2012-2014 Wolfson Microelectronics plc
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -140,10 +140,14 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
bool clamp)
{
struct arizona *arizona = info->arizona;
- unsigned int mask = 0, val = 0;
+ unsigned int mask, val = 0;
int ret;
switch (arizona->type) {
+ case WM8998:
+ case WM1814:
+ mask = 0;
+ break;
case WM5110:
mask = ARIZONA_HP1L_SHRTO | ARIZONA_HP1L_FLWR |
ARIZONA_HP1L_SHRTI;
@@ -175,17 +179,19 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
ret);
}
- ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1L,
- mask, val);
- if (ret != 0)
- dev_warn(arizona->dev, "Failed to do clamp: %d\n",
+ if (mask) {
+ ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1L,
+ mask, val);
+ if (ret != 0)
+ dev_warn(arizona->dev, "Failed to do clamp: %d\n",
ret);
- ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1R,
- mask, val);
- if (ret != 0)
- dev_warn(arizona->dev, "Failed to do clamp: %d\n",
- ret);
+ ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1R,
+ mask, val);
+ if (ret != 0)
+ dev_warn(arizona->dev, "Failed to do clamp: %d\n",
+ ret);
+ }
/* Restore the desired state while not doing the clamp */
if (!clamp) {
@@ -1176,6 +1182,11 @@ static int arizona_extcon_probe(struct platform_device *pdev)
break;
}
break;
+ case WM8998:
+ case WM1814:
+ info->micd_clamp = true;
+ info->hpdet_ip_version = 2;
+ break;
default:
break;
}
--
1.7.2.5
next prev parent reply other threads:[~2015-05-01 15:17 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-01 15:15 [PATCH v3 0/8] Add support for Wolfson WM8998 and WM1814 codecs Richard Fitzgerald
2015-05-01 15:15 ` [PATCH v3 1/8] mfd: arizona: Split INx_MODE into two fields Richard Fitzgerald
2015-05-13 12:28 ` Lee Jones
2015-05-01 15:15 ` [PATCH v3 2/8] ASoC: arizona: add defines for single-input gain control Richard Fitzgerald
2015-05-01 15:15 ` [PATCH v3 3/8] mfd: arizona: Add support for WM8998 and WM1814 Richard Fitzgerald
2015-05-02 9:58 ` Paul Bolle
2015-05-04 9:11 ` Richard Fitzgerald
2015-05-04 10:44 ` Paul Bolle
2015-05-07 8:52 ` Lee Jones
2015-05-08 9:11 ` Richard Fitzgerald
2015-05-01 15:15 ` [PATCH v3 4/8] gpio: arizona: add " Richard Fitzgerald
2015-05-01 15:15 ` [PATCH v3 5/8] regulator: " Richard Fitzgerald
2015-05-01 15:15 ` Richard Fitzgerald [this message]
2015-05-01 15:15 ` [PATCH v3 7/8] ASoC: wm8998: Initial WM8998 codec driver Richard Fitzgerald
2015-05-04 11:39 ` Mark Brown
2015-05-05 9:24 ` Richard Fitzgerald
2015-05-05 10:53 ` Mark Brown
2015-05-05 13:31 ` Richard Fitzgerald
2015-05-05 21:59 ` Mark Brown
2015-05-06 9:24 ` Richard Fitzgerald
2015-05-06 11:48 ` Mark Brown
2015-05-06 12:21 ` Richard Fitzgerald
2015-05-06 12:34 ` Mark Brown
2015-05-01 15:15 ` [PATCH v3 8/8] Documentation: Add WM8998/WM1814 device tree bindings Richard Fitzgerald
2015-05-13 12:29 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430493319-23808-7-git-send-email-rf@opensource.wolfsonmicro.com \
--to=rf@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=cw00.choi@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=gnurou@gmail.com \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=patches@opensource.wolfsonmicro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).