- 05 Nov, 2014 10 commits
-
-
Benjamin Romer authored
Clean up the extraneous blank lines in charqueue.c. Signed-off-by:
Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
Greg Kroah-Hartman authored
Merge tag 'iio-for-3.19a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next Jonathan writes: First round of new drivers, features and cleanups for IIO in the 3.19 cycle. New drivers / supported parts * rockchip - rk3066-tsadc variant * si7020 humidity and temperature sensor * mcp320x - add mcp3001, mcp3002, mcp3004, mcp3008, mcp3201, mcp3202 * bmp280 pressure and temperature sensor * Qualcomm SPMI PMIC current ADC driver * Exynos_adc - support exynos7 New features * vf610-adc - add temperature sensor support * Documentation of current attributes, scaled pressure, offset and scaled humidity, RGBC intensity gain factor and scale applied to differential voltage channels. * Bring iio_event_monitor up to date with newer modifiers. * Add of_xlate function to allow for complex channel mappings from the device tree. * Add -g parameter to generic_buffer example to allow for devices with directly fed (no trigger) buffers. * Move exynos driver over to syscon for PMU register access. Cleanups, fixes for new drivers * lis3l02dq drop an unneeded else. * st sensors - renam st_sensors to st_sensor_settings (for clarity) * st sensors - drop an unused parameter from all the probe utility functions. * vf610 better error handling and tidy up. * si7020 - cleanups following merge * as3935 - drop some unnecessary semicolons. * bmp280 - fix the pressure calculation.
-
Darshana Padmadas authored
This patch adds an entry in ABI documentation for in_voltage-voltage_scale. It has at least one user driver, adis16220, in accel driver. Signed-off-by:
Darshana Padmadas <darshanapadmadas@gmail.com> Signed-off-by:
Jonathan Cameron <jic23@kernel.org>
-
Hartmut Knaack authored
According to the datasheet and as defined in struct bmp280_comp_press, dig_p1 is of type u16, while dig_p2 to dig_p9 are of type s16. In bmp280_read_compensation_press(), values read from the device were treated as the wrong type. In bmp280_read_press() the fractional part of the measured pressure is calculated wrong. A better way is to use *val for the raw pressure and *val2 for the quotient and let the core do the proper conversion using IIO_VAL_FRACTIONAL. Signed-off-by:
Hartmut Knaack <knaack.h@gmx.de> Acked-by:
Vlad Dogaru <vlad.dogaru@intel.com> Signed-off-by:
-
Abhilash Kesavan authored
The ADC on exynos7 is quite similar to ADCv2. The differences are as follows: - exynos7-adc has 8 input channels (as against 10 in ADCv2). - exynos7 does not include an ADC PHY control register. - Some ADC_CON2 register bits being used in ADCv2 are listed as reserved in exynos7-adc. This results in a different init_hw function for exynos7. Signed-off-by:
Abhilash Kesavan <a.kesavan@samsung.com> Reviewed-by:
Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by:
-
Naveen Krishna Chatradhi authored
Instead of using the ADC_PHY register base address, use sysreg phandle in ADC node to control ADC_PHY configuration register. This patch adds syscon node for Exynos3250, Exynos4x12, Exynos5250, and Exynos5420, Exynos5800. Signed-off-by:
Naveen Krishna Chatradhi <ch.naveen@samsung.com> To: linux-samsung-soc@vger.kernel.org Acked-by:
Kukjin Kim <kgene.kim@samsung.com> Signed-off-by:
-
Naveen Krishna Chatradhi authored
This patch updates the DT bindings for ADC in exynos-adc.txt with the syscon phandle to the ADC nodes. Signed-off-by:
-
Naveen Krishna Chatradhi authored
This patch updates the IIO based ADC driver to use syscon and regmap APIs to access and use PMU registers instead of remapping the PMU registers in the driver. Signed-off-by:
-
Karol Wrona authored
Some IIO devices do not use the triggers. This patch makes trigger setting conditional so generic_buffer can be used when triggers are disabled. Signed-off-by:
Karol Wrona <k.wrona@samsung.com> Signed-off-by:
-
George McCollister authored
Signed-off-by:
George McCollister <george.mccollister@gmail.com> Acked-by:
-
- 04 Nov, 2014 30 commits
-
-
Jia He authored
This fixes space related ERROR reports by checkpatch.pl Generated by $ git ls-files "drivers/staging/rtl8188eu/*.[ch]" | \ xargs ./scripts/checkpatch.pl -f --fix-inplace --strict --types=SPACING Already checked by text comparasion $git diff -w and binary comparasion of r8188eu.ko $objdiff diff <old_commit> <new_commit> Signed-off-by:
Jia He <hejianet@gmail.com> Signed-off-by:
-
Joe Perches authored
Use a more common logging style. o Convert DEBUG macros to pr_debug o Add pr_fmt o Remove embedded function names from pr_debug o Convert printks to pr_<level> o Coalesce formats and align arguments o Add missing terminating newlines Signed-off-by:
Joe Perches <joe@perches.com> Signed-off-by:
-
Joe Perches authored
Use normal kernel style, indentation and alignment. git diff -w shows no difference Signed-off-by:
-
Rickard Strandqvist authored
Remove unneeded #define. This was previously included in a patch set two but patchset one was taken by mistake. Signed-off-by:
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> Reviewed-by:
Ian Abbott <abbotti@mev.co.uk> Signed-off-by:
-
H Hartley Sweeten authored
Use the recently added sample manipulation helpers to remove the hardcoded assumption of the sample size. Signed-off-by:
H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by:
-
H Hartley Sweeten authored
Use the recently added sample manipulation helpers to remove the hardcoded assumption of the sample size. Signed-off-by:
-
H Hartley Sweeten authored
Use the recently added sample manipulation helpers to remove the hardcoded assumption of the sample size. Signed-off-by:
-
H Hartley Sweeten authored
Use the recently added sample manipulation helpers to remove the hardcoded assumption of the sample size. Signed-off-by:
-
H Hartley Sweeten authored
Use the recently added sample manipulation helpers to remove the hardcoded assumption of the sample size. Signed-off-by:
-
H Hartley Sweeten authored
Use the recently added sample manipulation helpers to remove the hardcoded assumption of the sample size. Signed-off-by:
-
H Hartley Sweeten authored
Use the recently added sample manipulation helpers to remove the hardcoded assumption of the sample size. Signed-off-by:
-
H Hartley Sweeten authored
Use the recently added sample manipulation helpers to remove the hardcoded assumption of the sample size. Signed-off-by:
-
H Hartley Sweeten authored
This inline helper function has been replaced with comedi_bytes_per_sample(). The same commit (bf33eb4b) introduced a couple other related helper functions a manipulate the sample size. Use the new helper functions to remove the use of 'bytes_per_sample()' and remove it. Signed-off-by:
-
H Hartley Sweeten authored
This member of the private data is replicating what the comedi_async 'cur_chan' member is used for. Use that instead and remove the private data member. Signed-off-by:
-
H Hartley Sweeten authored
The commedi_async 'cur_chan' member is used to track the current position in the chanlist for a scan. Currently only a couple comedi drivers use this member. For aeshtetics, move the 'cur_chan' tracking into the core for non-SDF_PACKED subdevices. The 'cur_chan' will be updated after reading or writing samples to the async buffer by comedi_inc_scan_progress(). All non-SDF_PACKED subdevices will then automatiaclly track the 'cur_chan'. Some of the drivers use the 'cur_chan' to detect the end of scan event when counting scans. The COMEDI_CB_EOS event is automatically added by the core when the end of scan is detected. The drivers just need to check if the 'cur_chan' is 0 to count the number of scans completed. Signed-off-by:
-
H Hartley Sweeten authored
The local variable 'range' is set but never used. Remove it. Signed-off-by:
-
Ian Abbott authored
For some unfathomable reason, the Comedi `insn_bits` handler for the digital output subdevice (`icp_multi_insn_bits_do()`) writes the digital output register and reads back the unrelated digital input register. Read back the current state of the outputs (held in `s->state`) instead. Signed-off-by:
-
H Hartley Sweeten authored
Currently this driver uses a bitmap in the private data to keep track of the unipolar/bipolar range for each channel. This is needed to determine if the data needs to be munged for bipolar samples. Remove this member from the private data and use the comedi core helper function comedi_range_is_bipolar() to determine if the data needs to be munged. Signed-off-by:
-
H Hartley Sweeten authored
This functions uses the async->cur_chan to determine if the current channel is using a bipolar range and the sample needs to be munged. The cur_chan is never incremented so all the samples are munged based on the fist channel in the cmd->chanlist. Bump the cur_chan after writing each sample. This fixes the code so that the munging will be done correctly. Signed-off-by:
-
H Hartley Sweeten authored
The comedi core calls comedi_buf_reset() before starting an async command (*do_cmd) and after returning a subdevice to an idle state (*cancel). The drivers do not need to reset the async->cur_chan in those functions. Signed-off-by:
-
H Hartley Sweeten authored
The SDF_READABLE flag is not necessary for digital output subdevices. For consistency, remove this flag from the comedi drivers that set it. Signed-off-by:
-
H Hartley Sweeten authored
The SDF_GROUND, SDF_COMMON, SDF_DIFF, and SDF_OTHER flags are only useful with the analog input and output subdevices. Remove these flags from the other subdevice types in the comedi drivers. Signed-off-by:
-
H Hartley Sweeten authored
As indicated in the comedi.h uapi header, SDF_WRITEABLE was a spelling error in the API, SDF_WRITABLE is prefered. For aesthetics, replace all the SDF_WRITEABLE uses with SDF_WRITABLE. Signed-off-by:
-
Ian Abbott authored
`do_bufinfo_ioctl()` handled the `COMEDI_BUFINFO` ioctl. It is supposed to update the read or write positions in the buffer depending on the direction of data transfer set up by the asynchronous command. Currently it checks the `SDF_CMD_READ` and `SDF_CMD_WRITE` subdevice flags. That's fine for most subdevices - the ones that only support one direction, but is incorrect for those subdevices that allow the command to be set up in either direction. Since we now set the `CMDF_WRITE` flag according to the data transfer direction of the current command running on the subdevice, check that flag instead. Signed-off-by:
-
Ian Abbott authored
`comedi_poll()` handles the poll() file operation for comedi devices. If no asynchronous command has been set up on the current "read" subdevice, it sets the `POLLIN` and `POLLRDNORM` bits in the return value to indicate that the read() file operation would not block as it would return an error. Add a check so it also does that if the asynchronous command has been set up in the "write" direction as that also causes the read() file operation to return an error. Similarly, if no asynchronous command has need set up on the current "write" subdevice, it sets the `POLLOUT` and `POLLWRNORM` bits in the return value to indicate that the write() file operation would not block as it would return an error. Add a check so it also does that if the asynchronous command has been set up in the "read" direction as that also causes the write() file operation to return an error. Signed-off-by:
-
Ian Abbott authored
If a Comedi asynchronous command has been set up for data transfer in the "read" direction on the current "write" subdevice (for those subdevices that support both directions), don't allow the "write" file operation as that would mess with the data in the comedi data buffer that is written by the low-level comedi hardware driver. Signed-off-by:
-
Ian Abbott authored
If a Comedi asynchronous command has been set up for data transfer in the "write" direction on the current "read" subdevice (for those subdevices that support both directions), don't allow the "read" file operation as that would mess with the data in the comedi data buffer that is read by the low-level comedi hardware driver. Signed-off-by:
-
Ian Abbott authored
There is no need for `ni_ai_cmdtest()` or `ni_ao_cmdtest()` to set the `CMDF_WRITE` flag to the correct state as it has already been done by the core comedi module. Signed-off-by:
-
Ian Abbott authored
The low-level Comedi drivers shouldn't change the `flags` member of `struct comedi_cmd` as the Comedi core also uses some of those flags. They should just ignore the flags they don't understand. Signed-off-by:
-
Ian Abbott authored
Most comedi subdevices that support asynchronous commands only support data transfer in either the "read" or "write" direction, as indicated by the `SDF_CMD_READ` and `SDF_CMD_WRITE` subdevice flags, although a few support both directions on the same subdevice (though not simultaneously). The `struct comedi_cmd` structure passed via ioctl call to set up the command contains a `CMDF_WRITE` flag that can be used to choose the direction if the subdevice supports both directions, but the flag is optional if the subdevice only supports data transfer in one direction. If the subdevice only supports asynchronous data transfer in a sing direction, set the `CMDF_WRITE` flag to the correct state so that Comedi can make use of it later. In the case of the `COMEDI_CMDTEST` ioctl, the updated flag will be written back to the `struct comedi_cmd` in user-space. In the case of the `COMEDI_CMD` ioctl, the flag only gets written back if an error is detected while testing the command, or if the `CMDF_BOGUS` command flag is set. Since `__comedi_get_user_cmd()` is called for both ioctls, that's a good place to set the flag. Signed-off-by:
-
