|
@@ -43,6 +43,9 @@
|
|
#define ARIZONA_MICD_CLAMP_MODE_JDL_GP5H 0x9
|
|
#define ARIZONA_MICD_CLAMP_MODE_JDL_GP5H 0x9
|
|
#define ARIZONA_MICD_CLAMP_MODE_JDH_GP5H 0xb
|
|
#define ARIZONA_MICD_CLAMP_MODE_JDH_GP5H 0xb
|
|
|
|
|
|
|
|
+#define ARIZONA_TST_CAP_DEFAULT 0x3
|
|
|
|
+#define ARIZONA_TST_CAP_CLAMP 0x1
|
|
|
|
+
|
|
#define ARIZONA_HPDET_MAX 10000
|
|
#define ARIZONA_HPDET_MAX 10000
|
|
|
|
|
|
#define HPDET_DEBOUNCE 500
|
|
#define HPDET_DEBOUNCE 500
|
|
@@ -147,6 +150,7 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
|
|
{
|
|
{
|
|
struct arizona *arizona = info->arizona;
|
|
struct arizona *arizona = info->arizona;
|
|
unsigned int mask = 0, val = 0;
|
|
unsigned int mask = 0, val = 0;
|
|
|
|
+ unsigned int cap_sel = 0;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
switch (arizona->type) {
|
|
switch (arizona->type) {
|
|
@@ -154,10 +158,21 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
|
|
case WM8280:
|
|
case WM8280:
|
|
mask = ARIZONA_HP1L_SHRTO | ARIZONA_HP1L_FLWR |
|
|
mask = ARIZONA_HP1L_SHRTO | ARIZONA_HP1L_FLWR |
|
|
ARIZONA_HP1L_SHRTI;
|
|
ARIZONA_HP1L_SHRTI;
|
|
- if (clamp)
|
|
|
|
|
|
+ if (clamp) {
|
|
val = ARIZONA_HP1L_SHRTO;
|
|
val = ARIZONA_HP1L_SHRTO;
|
|
- else
|
|
|
|
|
|
+ cap_sel = ARIZONA_TST_CAP_CLAMP;
|
|
|
|
+ } else {
|
|
val = ARIZONA_HP1L_FLWR | ARIZONA_HP1L_SHRTI;
|
|
val = ARIZONA_HP1L_FLWR | ARIZONA_HP1L_SHRTI;
|
|
|
|
+ cap_sel = ARIZONA_TST_CAP_DEFAULT;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ ret = regmap_update_bits(arizona->regmap,
|
|
|
|
+ ARIZONA_HP_TEST_CTRL_1,
|
|
|
|
+ ARIZONA_HP1_TST_CAP_SEL_MASK,
|
|
|
|
+ cap_sel);
|
|
|
|
+ if (ret != 0)
|
|
|
|
+ dev_warn(arizona->dev,
|
|
|
|
+ "Failed to set TST_CAP_SEL: %d\n", ret);
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
mask = ARIZONA_RMV_SHRT_HP1L;
|
|
mask = ARIZONA_RMV_SHRT_HP1L;
|