diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-20 13:35:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-20 13:35:10 -0800 |
| commit | 444fec197e529aa858e42274feafa10c216ed879 (patch) | |
| tree | 259984c9a9dca0370b11aeb360b6717cdeb31a48 /include | |
| parent | a5f89a5015d4ca86e4fe48e924146ded01627fbb (diff) | |
| parent | b860b419d970f286294fbfb2b21a4028fd8ee442 (diff) | |
| download | linux-444fec197e529aa858e42274feafa10c216ed879.tar.bz2 | |
Merge tag 'mfd-fixes-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MDF bugfixes from Lee Jones:
- Fix message timing issues and report correct state when an error
occurs in cros_ec_spi
- Reorder enums used for Power Management in rtsx_pci
- Use correct OF helper for obtaining child nodes in twl4030-audio and
twl6040
* tag 'mfd-fixes-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
mfd: Fix RTS5227 (and others) powermanagement
mfd: cros ec: spi: Fix "in progress" error signaling
mfd: twl6040: Fix child-node lookup
mfd: twl4030-audio: Fix sibling-node lookup
mfd: cros ec: spi: Don't send first message too soon
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/rtsx_pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/rtsx_pci.h b/include/linux/mfd/rtsx_pci.h index a2a1318a3d0c..c3d3f04d8cc6 100644 --- a/include/linux/mfd/rtsx_pci.h +++ b/include/linux/mfd/rtsx_pci.h @@ -915,10 +915,10 @@ enum PDEV_STAT {PDEV_STAT_IDLE, PDEV_STAT_RUN}; #define LTR_L1SS_PWR_GATE_CHECK_CARD_EN BIT(6) enum dev_aspm_mode { - DEV_ASPM_DISABLE = 0, DEV_ASPM_DYNAMIC, DEV_ASPM_BACKDOOR, DEV_ASPM_STATIC, + DEV_ASPM_DISABLE, }; /* |