diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 21:00:47 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 21:00:47 +0300 |
| commit | 63fad06a2733f78f7565a436a97848aee8099600 (patch) | |
| tree | 643a664e96cf4f3a5b71af9dc6944b3c010f7563 /drivers/iio/adc/mcp3422.c | |
| parent | aabab880c5441cd39aef75fc1ecaa3125efb7a89 (diff) | |
| parent | 4b613e9b4bbe94545a588a100e09006d827a7ebe (diff) | |
| download | linux-63fad06a2733f78f7565a436a97848aee8099600.tar.xz | |
Merge tag 'gpmc-omap-for-v4.1' of git://github.com/rogerq/linux into next/drivers
Merge "OMAP-GPMC driver fixes for v4.1" from Roger Quandros:
* Fixed WAITMONITORINGTIME programming to be based on
GPMC_CLK instead of GPMC_FCLK. The GPMC clock divider
programming is fixed for both synchronous and asynchronous
modes.
* Allow GPMC's children of default bus type to be populated in
the device tree.
* Improved DEBUG output data and format.
* Prevent writing 1 into reserved bits of GPMC_CONFIG7.
* tag 'gpmc-omap-for-v4.1' of git://github.com/rogerq/linux:
ARM OMAP2+ GPMC: fix programming/showing reserved timing parameters
ARM OMAP2+ GPMC: fix WAITMONITORINGTIME divider bug
ARM OMAP2+ GPMC: calculate GPMCFCLKDIVIDER based on WAITMONITORINGTIME
ARM OMAP2+ GPMC: always program GPMCFCLKDIVIDER
ARM OMAP2+ GPMC: change get_gpmc_timing_reg output for DTS
ARM OMAP2+ GPMC: fix debug output alignment
ARM OMAP2+ GPMC: add bus children
ARM OMAP2+ GPMC: don't undef DEBUG
ARM: OMAP2+: gpmc: make gpmc_cs_get_name() static
ARM: OMAP2+: gpmc: Fix writing in gpmc_cs_set_memconf
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/iio/adc/mcp3422.c')
0 files changed, 0 insertions, 0 deletions