diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 16:01:34 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 16:01:34 +0100 |
commit | 62a295bd823aa726e1bf1626385bd274a2b7b65c (patch) | |
tree | 31edb5e79858cec9def983ba9ca0299483ef433d /drivers/mmc/host/dw_mmc-zx.c | |
parent | arm: npcm: add basic support for Nuvoton BMCs (diff) | |
parent | ARM: davinci: move davinci_clk_init() to init_time (diff) | |
download | linux-62a295bd823aa726e1bf1626385bd274a2b7b65c.tar.xz linux-62a295bd823aa726e1bf1626385bd274a2b7b65c.zip |
Merge tag 'davinci-for-v4.17/soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull "Miscellaneous DaVinci SoC support improvements for v4.17" from Sekhar Nori:
* rationalization of con_id names for phy clocks to make DT conversion easy
* A patch to move away from syscon as platform device. This is needed for
common clock framework conversion as well as helps get rid of
syscon_regmap_lookup_by_pdevname() by removing the last known user.
* convert mach-davinci to use reset support available in watchdog driver
* a non-critical warning fix. It has been around since beginning so not sending
as a standalone fix for -rc cycle.
* moving mach-davinci clock init to .init_time() for legacy boot. This is
again in preparation for CCF conversion.
* tag 'davinci-for-v4.17/soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: move davinci_clk_init() to init_time
ARM: davinci: board-da830-evm: fix unused const variable warning
ARM: davinci: remove watchdog reset
ARM: da8xx: use platform data for CFGCHIP syscon regmap
phy: da8xx-usb: rename clock con_ids
Diffstat (limited to 'drivers/mmc/host/dw_mmc-zx.c')
0 files changed, 0 insertions, 0 deletions