diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 10:24:08 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 10:24:08 (GMT) |
| commit | 07797e9bb67f801c04d47b323f631ff16bf2bc7e (patch) | |
| tree | 65b56689a2bc13bd104ba392765c838259bd3407 /drivers/mfd | |
| parent | ed87aabf6078ee1169c04ee9da54f03e10cbd8a3 (diff) | |
| parent | bb7838d4f13c50df8ef7324f5fd4aeb729269e22 (diff) | |
| download | linux-fsl-qoriq-07797e9bb67f801c04d47b323f631ff16bf2bc7e.tar.xz | |
Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/mc13xxx-core.c | 5 | ||||
| -rw-r--r-- | drivers/mfd/mc13xxx-spi.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c index 2a9b100..dbbf8ee 100644 --- a/drivers/mfd/mc13xxx-core.c +++ b/drivers/mfd/mc13xxx-core.c @@ -158,8 +158,6 @@ int mc13xxx_reg_read(struct mc13xxx *mc13xxx, unsigned int offset, u32 *val) { int ret; - BUG_ON(!mutex_is_locked(&mc13xxx->lock)); - if (offset > MC13XXX_NUMREGS) return -EINVAL; @@ -172,8 +170,6 @@ EXPORT_SYMBOL(mc13xxx_reg_read); int mc13xxx_reg_write(struct mc13xxx *mc13xxx, unsigned int offset, u32 val) { - BUG_ON(!mutex_is_locked(&mc13xxx->lock)); - dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x\n", offset, val); if (offset > MC13XXX_NUMREGS || val > 0xffffff) @@ -186,7 +182,6 @@ EXPORT_SYMBOL(mc13xxx_reg_write); int mc13xxx_reg_rmw(struct mc13xxx *mc13xxx, unsigned int offset, u32 mask, u32 val) { - BUG_ON(!mutex_is_locked(&mc13xxx->lock)); BUG_ON(val & ~mask); dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x (mask: 0x%06x)\n", offset, val, mask); diff --git a/drivers/mfd/mc13xxx-spi.c b/drivers/mfd/mc13xxx-spi.c index 77189da..5f14ef6 100644 --- a/drivers/mfd/mc13xxx-spi.c +++ b/drivers/mfd/mc13xxx-spi.c @@ -94,10 +94,15 @@ static int mc13xxx_spi_write(void *context, const void *data, size_t count) { struct device *dev = context; struct spi_device *spi = to_spi_device(dev); + const char *reg = data; if (count != 4) return -ENOTSUPP; + /* include errata fix for spi audio problems */ + if (*reg == MC13783_AUDIO_CODEC || *reg == MC13783_AUDIO_DAC) + spi_write(spi, data, count); + return spi_write(spi, data, count); } |