09 Apr, 2013
5 commits
-
…nwoo/extcon into char-misc-next
Chanwoo writes:
This is small fixes for extcon driver.
MAX77693 extcon driver
- Add 'static' keryword to internal data structure
- Fix return value using 'ret' instead of hardcodingMAX8997 extcon driver
- Use dev_err() instead of pr_err()
- Fix return value using 'ret' instead of hardcoding -
Return the value obtained from the function instead of hardcoding.
Fixes the following warnings:
drivers/extcon/extcon-max8997.c:235 max8997_muic_set_path() info:
why not propagate 'ret' from max8997_update_reg() instead of (-11)?
drivers/extcon/extcon-max8997.c:248 max8997_muic_set_path() info:
why not propagate 'ret' from max8997_update_reg() instead of (-11)?Signed-off-by: Sachin Kamat
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
Return the value obtained from the function instead of hardcoding.
Silences the following warnings:
drivers/extcon/extcon-max77693.c:297 max77693_muic_set_path()
info: why not propagate 'ret' from max77693_update_reg() instead of (-11)?
drivers/extcon/extcon-max77693.c:310 max77693_muic_set_path()
info: why not propagate 'ret' from max77693_update_reg() instead of (-11)?Signed-off-by: Sachin Kamat
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
dev_err() is more preferred than pr_err().
Signed-off-by: Jingoo Han
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
Commit 0ec83bd246 ("extcon: max77693: Initialize register of MUIC
device to bring up it without platform data") added this structure
but forgot to make it static. Without this patch we get the following
warning:
drivers/extcon/extcon-max77693.c:41:26: warning:
symbol 'default_init_data' was not declared. Should it be static?Signed-off-by: Sachin Kamat
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham
04 Apr, 2013
1 commit
-
…t/broonie/misc into char-misc-next
Mark writes:
extcon: arizona: Updates for v3.10
There's a bunch of different things in this series, I can split them out
if need be:- Support for configuring the button detection circuit to reflect the
accessories supplied with the system.
- Improvements in the HPDET based detection scheme.
- Additional robustness against more pathological use cases.
- A few small standalone fixes.
02 Apr, 2013
15 commits
-
Signed-off-by: Mark Brown
-
Help mitigate against mechanical bounce during the initial detection by
allowing the configuration of an additional debounce on top of that the
hardware does during the initial phase of microphone detection operation.Signed-off-by: Mark Brown
-
If the user moves directly from one button to another then we won't get a
no buttons pressed event and will therefore end up reporting that two
buttons are simultaneously pressed which isn't supported by the hardware.
Make sure we clear any existing button reports before reporting any new
ones.Signed-off-by: Mark Brown
-
In pathological cases the microphone detection may fail to report, for
example due to a failure to get a stable measurement. Provide a timeout
to cover such cases.Signed-off-by: Mark Brown
-
Rather than measuring both HP channels we can simply directly measure the
microphone impedance and then rely on MICDET for final confirmation of the
presence of a suitable microphone. This improves the overall performance
of the identification process.Signed-off-by: Mark Brown
-
This extra check makes the procedure take longer and is of marginal use
in identification so do not execute it.Signed-off-by: Mark Brown
-
Sometimes we can trigger measurements early if contacts are shorted during
a slow insertion. As well as debouncing add further robustness by retrying
if we get a high impedance measurement for headphones as this can indicate
that the headphones were not yet connected.Signed-off-by: Mark Brown
-
Signed-off-by: Mark Brown
-
Occasionally we can trigger an interrupt before we have completed
impedance measurement, although the valid bit will still be set. This
patch spins reading the impedance value until a valid value is seen.Signed-off-by: Charles Keepax
Signed-off-by: Mark Brown -
In cases where we see a brief (dis)connection of the jack detection signals
we may see a noop jack insertion or removal where the jack has returned to
the original state by the time the interrupt is serviced. Suppress these
events in order to save work and avoid confusing the rest of the code.Signed-off-by: Mark Brown
-
Ensure greater reliability by increasing the minimum threashold for
identifying a microphone.Signed-off-by: Mark Brown
-
In some designs an external pull won't be needed.
Signed-off-by: Mark Brown
-
There is no need to do this as HPDET identification will cause MICBIAS to
be powered down again.Signed-off-by: Mark Brown
-
The Arizona button detection circuit is configurable, allowing the system
integrator to program a range of thresholds for the buttons supported on
the accessory but currently the driver uses the default button ranges and
does not provide any flexibility in how this is exposed to the application
layer.Provide platform data allowing the user to control this and to map
the buttons to keys in the input subsystem.Signed-off-by: Mark Brown
-
In some pathological use cases users may insert an accessory very slowly
causing multiple indeterminate measurements. Handle this by retrying many
measurements before we give up and declare a headphone.Signed-off-by: Mark Brown
27 Mar, 2013
1 commit
-
This picks up the MEI fixes that we need in this branch now.
Signed-off-by: Greg Kroah-Hartman
26 Mar, 2013
2 commits
-
Running HPDET while the headphone outputs are enabled can disrupt the
operation of HPDET. In order to avoid this HPDET needs to disable the
headphone outputs and ASoC needs to not enable them while HPDET is
running.For extcon instead of checking if the headphone output is enabled when
doing magic application unconditionally disable the output and restore
the state which ASoC wants set when undoing the magic.Signed-off-by: Mark Brown
-
We have a very similar sequence doing magic writes in several places
(one of which missed an update to interlock with the CODEC driver) so
factor it out into a function.Signed-off-by: Mark Brown
13 Mar, 2013
3 commits
-
This patch set default value of MUIC register to bring up MUIC device.
If user don't set some initial value for MUIC device through platform data,
extcon-max77693 driver use 'default_init_data' to bring up base operation
of MAX77693 MUIC device.Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
This patch fix wrong pointer of platform data. If each machine set
platform data for h/w path or delay time of workqueue, this driver
happen kernel panic related to null pointer.Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
This patch check the pointer of platform data to protect
kernel panic when platform data is not used and code clean.Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham
22 Feb, 2013
1 commit
-
Pull char/misc driver patches from Greg Kroah-Hartman:
"Here's the big char/misc driver patches for 3.9-rc1.Nothing major here, just lots of different driver updates (mei,
hyperv, ipack, extcon, vmci, etc.).All of these have been in the linux-next tree for a while."
* tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (209 commits)
w1: w1_therm: Add force-pullup option for "broken" sensors
w1: ds2482: Added 1-Wire pull-up support to the driver
vme: add missing put_device() after device_register() fails
extcon: max8997: Use workqueue to check cable state after completing boot of platform
extcon: max8997: Set default UART/USB path on probe
extcon: max8997: Consolidate duplicate code for checking ADC/CHG cable type
extcon: max8997: Set default of ADC debounce time during initialization
extcon: max8997: Remove duplicate code related to set H/W line path
extcon: max8997: Move defined constant to header file
extcon: max77693: Make max77693_extcon_cable static
extcon: max8997: Remove unreachable code
extcon: max8997: Make max8997_extcon_cable static
extcon: max77693: Remove unnecessary goto statement to improve readability
extcon: max77693: Convert to devm_input_allocate_device()
extcon: gpio: Rename filename of extcon-gpio.c according to kernel naming style
CREDITS: update email and address of Harald Hoyer
extcon: arizona: Use MICDET for final microphone identification
extcon: arizona: Always take the first HPDET reading as the final one
extcon: arizona: Clear _trig_sts bits after jack detection
extcon: arizona: Don't HPDET magic when headphones are enabled
...
14 Feb, 2013
12 commits
-
This patch use delayed workqueue to check cable state after a certain
time. If extcon-max8997 driver check cable state during booting of
platform, this couldn't send the correct notification of cable state
to extcon consumer. Alwasys, this driver should check cable state
after the completion of platform initializationSigned-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
This patch set default H/W line path according to platfomr data.
The MAX8997 MUIC device can possibly set UART/USB or UART_AUX
/USB_AUX to internal H/W line path of MUIC device. Namely, only
one H/W line is used for two operation.For example,
if H/W line path of MAX8997 device set UART/USB, micro usb cable
is connected to AP(Application Processor) and if H/W line path
set UART_AUX/USB_AUX, micro usb cable is connected to CP(Coprocessor).Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
This patch make max8997_muic_get_cable_type() function to remove
duplicate code for checking ADC/Charger cable type because almost
internal function need to read adc/chg_type value of MUIC register.Also, remove *_detach() function, extcon-max8997 driver treat
attach/detach operation of cable in max8997_*_handler() function.
Lastly, this patch move defined constant in header file(include/
linux/mfd/max8997.h, max8997-private.h) because defined constant
is only used in the 'extcon-max8997.c'.Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
This patch set default of ADC Debounce Time(25ms) during probe step.
Also, can possible change ADC Debounce Time according to H/W situation
by using max8997_set_adc_debounce_time()Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
This patch move defined constants to header file(max77693-private.h)
because of mask/unmask selectively interrupt of MUIC device according
to attribute of H/W board.Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
'max77693_extcon_cable' is used only in this file. Hence
make it static.Signed-off-by: Sachin Kamat
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
'break' after 'return' is never executed and hence can be deleted.
Signed-off-by: Sachin Kamat
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
'max8997_extcon_cable' is used only in this file. Hence make it static.
Signed-off-by: Sachin Kamat
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham -
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham
Signed-off-by: Greg Kroah-Hartman -
Signed-off-by: Chanwoo Choi
Signed-off-by: Myungjoo Ham
Signed-off-by: Greg Kroah-Hartman