diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-24 14:01:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-24 14:01:18 -0700 |
| commit | 1cffe5955f1d16523e2850382f4971c5ec8da5c5 (patch) | |
| tree | ed179a7248db194abd0fd6b1baeadd980b5eafda /drivers/mfd | |
| parent | 311fc65c9fb9c966bca8e6f3ff8132ce57344ab9 (diff) | |
| parent | 93a4c8355e0e448d83f31801b4c72f66e4360975 (diff) | |
| download | linux-1cffe5955f1d16523e2850382f4971c5ec8da5c5.tar.gz linux-1cffe5955f1d16523e2850382f4971c5ec8da5c5.tar.bz2 linux-1cffe5955f1d16523e2850382f4971c5ec8da5c5.zip | |
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann:
"A small number of bugfixes, again nothing serious.
- Alexander Dahl found multiple bugs in the Atmel memory interface
driver
- A randconfig build fix for at91 was incomplete, the second attempt
fixes the remaining corner case
- One fix for the TI Keystone queue handler
- The Odroid XU4 HDMI port (added in 4.13) needs a small DT fix"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: dts: exynos: add needs-hpd for Odroid-XU3/4
ARM: at91: don't select CONFIG_ARM_CPU_SUSPEND for old platforms
soc: ti: knav: Add a NULL pointer check for kdev in knav_pool_create
memory: atmel-ebi: Fix smc cycle xlate converter
memory: atmel-ebi: Allow t_DF timings of zero ns
memory: atmel-ebi: Fix smc timing return value evaluation
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/atmel-smc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/atmel-smc.c b/drivers/mfd/atmel-smc.c index 954cf0f66a31..20cc0ea470fa 100644 --- a/drivers/mfd/atmel-smc.c +++ b/drivers/mfd/atmel-smc.c @@ -206,7 +206,7 @@ EXPORT_SYMBOL_GPL(atmel_smc_cs_conf_set_pulse); * parameter * * This function encodes the @ncycles value as described in the datasheet - * (section "SMC Pulse Register"), and then stores the result in the + * (section "SMC Cycle Register"), and then stores the result in the * @conf->setup field at @shift position. * * Returns -EINVAL if @shift is invalid, -ERANGE if @ncycles does not fit in |