diff options
author | Olof Johansson <olof@lixom.net> | 2016-10-29 11:05:49 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-10-29 11:05:49 -0700 |
commit | 10e15a639caac3be3c142f8837a17520da84db9f (patch) | |
tree | 3d4a894bfd54048510654d3dbbefa673624eeb36 /arch/arm64/kvm | |
parent | 2723605169d8f58ebc2881d2b8a59e6ee6fe074a (diff) | |
parent | 8e68c65d111a57a4cbe41dc886bb2a1e671e0b6e (diff) | |
download | linux-10e15a639caac3be3c142f8837a17520da84db9f.tar.bz2 |
Merge tag 'uniphier-fixes-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into fixes
UniPhier ARM SoC fixes for v4.9
- Add "select ARCH_HAS_RESET_CONTROLLER" in Kconfig
- Rename wrongly-named mioctrl to sdctrl
* tag 'uniphier-fixes-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
arm64: dts: uniphier: change MIO node to SD control node
ARM: dts: uniphier: change MIO node to SD control node
reset: uniphier: rename MIO reset to SD reset for Pro5, PXs2, LD20 SoCs
arm64: uniphier: select ARCH_HAS_RESET_CONTROLLER
ARM: uniphier: select ARCH_HAS_RESET_CONTROLLER
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/kvm')
0 files changed, 0 insertions, 0 deletions