aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/extcon
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-16 10:40:32 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-16 10:40:32 -0700
commit3afebf577d4cb21215abb388e80c46c9c387ed0f (patch)
tree68db9434049a5119cc5e0a5d689dbfaa7419f6af /include/linux/extcon
parentExtcon: adc_jack: adc-jack driver to support 3.5 pi or simliar devices (diff)
downloadlinux-dev-3afebf577d4cb21215abb388e80c46c9c387ed0f.tar.xz
linux-dev-3afebf577d4cb21215abb388e80c46c9c387ed0f.zip
Revert "Extcon: adc_jack: adc-jack driver to support 3.5 pi or simliar devices"
This reverts commit 980d7929816236476967218645c30acc022042eb as it breaks the build with the error: ERROR: "extcon_cable_name" [drivers/extcon/extcon-adc-jack.ko] undefined! Cc: Lars-Peter Clausen <lars@metafoo.de> Cc: anish kumar <anish.singh@samsung.com> Cc: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/extcon')
-rw-r--r--include/linux/extcon/extcon-adc-jack.h73
1 files changed, 0 insertions, 73 deletions
diff --git a/include/linux/extcon/extcon-adc-jack.h b/include/linux/extcon/extcon-adc-jack.h
deleted file mode 100644
index a1603cfc504f..000000000000
--- a/include/linux/extcon/extcon-adc-jack.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * include/linux/extcon/extcon-adc-jack.h
- *
- * Analog Jack extcon driver with ADC-based detection capability.
- *
- * Copyright (C) 2012 Samsung Electronics
- * MyungJoo Ham <myungjoo.ham@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#ifndef _EXTCON_ADC_JACK_H_
-#define _EXTCON_ADC_JACK_H_ __FILE__
-
-#include <linux/module.h>
-#include <linux/extcon.h>
-
-/**
- * struct adc_jack_cond - condition to use an extcon state
- * @state - the corresponding extcon state (if 0, this struct denotes
- * the last adc_jack_cond element among the array)
- * @min_adc - min adc value for this condition
- * @max_adc - max adc value for this condition
- *
- * For example, if { .state = 0x3, .min_adc = 100, .max_adc = 200}, it means
- * that if ADC value is between (inclusive) 100 and 200, than the cable 0 and
- * 1 are attached (1<<0 | 1<<1 == 0x3)
- *
- * Note that you don't need to describe condition for "no cable attached"
- * because when no adc_jack_cond is met, state = 0 is automatically chosen.
- */
-struct adc_jack_cond {
- u32 state; /* extcon state value. 0 if invalid */
- u32 min_adc;
- u32 max_adc;
-};
-
-/**
- * struct adc_jack_pdata - platform data for adc jack device.
- * @name - name of the extcon device. If null, "adc-jack" is used.
- * @consumer_channel - Unique name to identify the channel on the consumer
- * side. This typically describes the channels used within
- * the consumer. E.g. 'battery_voltage'
- * @cable_names - array of cable names ending with null. If the array itself
- * if null, extcon standard cable names are chosen.
- * @adc_contitions - array of struct adc_jack_cond conditions ending
- * with .state = 0 entry. This describes how to decode
- * adc values into extcon state.
- * @irq_flags - irq flags used for the @irq
- * @handling_delay_ms - in some devices, we need to read ADC value some
- * milli-seconds after the interrupt occurs. You may
- * describe such delays with @handling_delay_ms, which
- * is rounded-off by jiffies.
- */
-struct adc_jack_pdata {
- const char *name;
- const char *consumer_channel;
- /*
- * NULL if standard extcon names are used.
- * The last entry should be NULL
- */
- const char **cable_names;
- /* The last entry's state should be 0 */
- struct adc_jack_cond *adc_conditions;
-
- unsigned long irq_flags;
- unsigned long handling_delay_ms; /* in ms */
-};
-
-#endif /* _EXTCON_ADC_JACK_H */