From 31d89ec8bed559e5f047e253031e5fd4a2bf6ca1 Mon Sep 17 00:00:00 2001 From: Magnus Smith Date: Thu, 22 Dec 2011 15:38:11 +0100 Subject: input: Removed CVIDEO from accesory detection. Removed support for CVIDEO (TV-out) from accesory detection. ST-Ericsson ID:404443 ST-Ericsson Linux next:NA ST-Ericsson FOSS-OUT ID:Trivial Change-Id: I7770843c0ab33fb5e3fc8bfcfe968834b0b626da Signed-off-by: Magnus Smith Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/43394 Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Kristoffer KARLSSON Reviewed-by: Jonas ABERG --- drivers/input/misc/ab8500-accdet.c | 2 -- drivers/input/misc/abx500-accdet.c | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/drivers/input/misc/ab8500-accdet.c b/drivers/input/misc/ab8500-accdet.c index 0fe60364d54..8faa7c425a5 100644 --- a/drivers/input/misc/ab8500-accdet.c +++ b/drivers/input/misc/ab8500-accdet.c @@ -63,8 +63,6 @@ #define ACCESSORY_DET_VOL_DONTCARE -1 #define ACCESSORY_HEADPHONE_DET_VOL_MIN 0 #define ACCESSORY_HEADPHONE_DET_VOL_MAX 40 -#define ACCESSORY_CVIDEO_DET_VOL_MIN 41 -#define ACCESSORY_CVIDEO_DET_VOL_MAX 105 #define ACCESSORY_CARKIT_DET_VOL_MIN 1100 #define ACCESSORY_CARKIT_DET_VOL_MAX 1300 #define ACCESSORY_HEADSET_DET_VOL_MIN 0 diff --git a/drivers/input/misc/abx500-accdet.c b/drivers/input/misc/abx500-accdet.c index f9df95cb2a5..c0d1cb04a0e 100644 --- a/drivers/input/misc/abx500-accdet.c +++ b/drivers/input/misc/abx500-accdet.c @@ -53,8 +53,6 @@ #define ACCESSORY_U_HEADSET_DET_VOL_MAX 732 #define ACCESSORY_U_HEADSET_ALT_DET_VOL_MIN 25 #define ACCESSORY_U_HEADSET_ALT_DET_VOL_MAX 50 -#define ACCESSORY_CVIDEO_DET_VOL_MIN 41 -#define ACCESSORY_CVIDEO_DET_VOL_MAX 105 #define ACCESSORY_CARKIT_DET_VOL_MIN 1100 #define ACCESSORY_CARKIT_DET_VOL_MAX 1300 #define ACCESSORY_HEADSET_DET_VOL_MIN 1301 @@ -115,16 +113,6 @@ static struct accessory_detect_task detect_ops[] = { .alt_minvol = ACCESSORY_U_HEADSET_ALT_DET_VOL_MIN, .alt_maxvol = ACCESSORY_U_HEADSET_ALT_DET_VOL_MAX }, - { - .type = JACK_TYPE_CVIDEO, - .typename = "CVIDEO", - .meas_mv = 0, - .req_det_count = 4, - .minvol = ACCESSORY_CVIDEO_DET_VOL_MIN, - .maxvol = ACCESSORY_CVIDEO_DET_VOL_MAX, - .alt_minvol = ACCESSORY_DET_VOL_DONTCARE, - .alt_maxvol = ACCESSORY_DET_VOL_DONTCARE - }, { .type = JACK_TYPE_OPENCABLE, .typename = "OPENCABLE", @@ -327,11 +315,6 @@ void report_jack_status(struct abx500_ad *dd) value |= SND_JACK_MICROPHONE; if (jack_supports_spkr(dd->jack_type)) value |= (SND_JACK_HEADPHONE | SND_JACK_LINEOUT); - if (dd->jack_type == JACK_TYPE_CVIDEO) { - value |= SND_JACK_VIDEOOUT; - if (dd->set_av_switch) - dd->set_av_switch(dd, VIDEO_OUT); - } ux500_ab8500_jack_report(value); out: return; @@ -563,7 +546,6 @@ static int detect_hw(struct abx500_ad *dd, break; case JACK_TYPE_CARKIT: case JACK_TYPE_HEADPHONE: - case JACK_TYPE_CVIDEO: case JACK_TYPE_HEADSET: case JACK_TYPE_UNSUPPORTED_HEADSET: case JACK_TYPE_OPENCABLE: @@ -714,7 +696,6 @@ static void config_accdetect(struct abx500_ad *dd) if (dd->set_av_switch) dd->set_av_switch(dd, NOT_SET); case JACK_TYPE_HEADPHONE: - case JACK_TYPE_CVIDEO: dd->config_accdetect1_hw(dd, 1); dd->config_accdetect2_hw(dd, 0); -- cgit v1.2.3