diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-26 19:05:35 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-26 19:05:35 +0300 |
| commit | a38b461ed5329d4c09c36dbc0084fc16f0adeb20 (patch) | |
| tree | 92f700f3e8f98cfc15ddb5c739510cbc0864d7ff /net | |
| parent | e95806dffc2f2d632c7891e71fc9ef7e1ba0ce97 (diff) | |
| parent | ea452678734eb782126f999bf5c4fb3e71d3b196 (diff) | |
| download | linux-a38b461ed5329d4c09c36dbc0084fc16f0adeb20.tar.xz | |
Merge tag 'mmc-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
"This contains fixes to make the WiFi work again for the ARM64 Hikey
board.
Together with a couple of DTS updates for the Hikey board we have also
extended the mmc pwrseq_simple, to support a new power-off-delay-us DT
property, as that was required to enable a graceful power off sequence
for the WiFi chip"
* tag 'mmc-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
arm64: dts: hikey: Fix WiFi support
arm64: dts: hi6220: Move board data from the dwmmc nodes to hikey dts
arm64: dts: hikey: Add the SYS_5V and the VDD_3V3 regulators
arm64: dts: hi6220: Move the fixed_5v_hub regulator to the hikey dts
arm64: dts: hikey: Add clock for the pmic mfd
mfd: dts: hi655x: Add clock binding for the pmic
mmc: pwrseq_simple: Parse DTS for the power-off-delay-us property
mmc: dt: pwrseq-simple: Invent power-off-delay-us
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions