Merge tag 'uniphier-fixes-v4.9' of...
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>
Showing
- Documentation/devicetree/bindings/reset/uniphier-reset.txt 31 additions, 31 deletionsDocumentation/devicetree/bindings/reset/uniphier-reset.txt
- arch/arm/boot/dts/uniphier-pro5.dtsi 2 additions, 2 deletionsarch/arm/boot/dts/uniphier-pro5.dtsi
- arch/arm/boot/dts/uniphier-pxs2.dtsi 2 additions, 2 deletionsarch/arm/boot/dts/uniphier-pxs2.dtsi
- arch/arm/mach-uniphier/Kconfig 1 addition, 0 deletionsarch/arm/mach-uniphier/Kconfig
- arch/arm64/Kconfig.platforms 1 addition, 0 deletionsarch/arm64/Kconfig.platforms
- arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi 6 additions, 6 deletionsarch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
- drivers/reset/reset-uniphier.c 8 additions, 8 deletionsdrivers/reset/reset-uniphier.c
Please register or sign in to comment