From: Arnd Bergmann Date: Fri, 15 Feb 2019 16:16:17 +0000 (+0100) Subject: Merge tag 'zynqmp-soc-for-v5.1' of https://github.com/Xilinx/linux-xlnx into arm... X-Git-Tag: v5.1-rc1~156^2~24 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=59f527dd7a6191734f7c2049f045cbcac290efa8;p=uclinux-h8%2Flinux.git Merge tag 'zynqmp-soc-for-v5.1' of https://github.com/Xilinx/linux-xlnx into arm/drivers arm64: zynqmp: SoC changes for v5.1 - Extend firmware interface with reset, nvmem, power management and power domain support - Add reset, nvmem driver, power management and power domain drivers - * tag 'zynqmp-soc-for-v5.1' of https://github.com/Xilinx/linux-xlnx: drivers: soc: xilinx: Add ZynqMP power domain driver firmware: xilinx: Add APIs to control node status/power dt-bindings: power: Add ZynqMP power domain bindings drivers: soc: xilinx: Add ZynqMP PM driver firmware: xilinx: Implement ZynqMP power management APIs dt-bindings: soc: Add ZynqMP PM bindings nvmem: zynqmp: Added zynqmp nvmem firmware driver dt-bindings: nvmem: Add bindings for ZynqMP nvmem driver firmware: xilinx: Add zynqmp_pm_get_chipid() API reset: reset-zynqmp: Adding support for Xilinx zynqmp reset controller. dt-bindings: reset: Add bindings for ZynqMP reset driver firmware: xilinx: Add reset API's Signed-off-by: Arnd Bergmann --- 59f527dd7a6191734f7c2049f045cbcac290efa8 diff --cc drivers/reset/Makefile index dc7874df78d9,380602d9c9b4..573b8386d901 --- a/drivers/reset/Makefile +++ b/drivers/reset/Makefile @@@ -24,6 -23,7 +24,7 @@@ obj-$(CONFIG_RESET_SUNXI) += reset-sunx obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o obj-$(CONFIG_RESET_TI_SYSCON) += reset-ti-syscon.o obj-$(CONFIG_RESET_UNIPHIER) += reset-uniphier.o -obj-$(CONFIG_RESET_UNIPHIER_USB3) += reset-uniphier-usb3.o +obj-$(CONFIG_RESET_UNIPHIER_GLUE) += reset-uniphier-glue.o obj-$(CONFIG_RESET_ZYNQ) += reset-zynq.o + obj-$(CONFIG_ARCH_ZYNQMP) += reset-zynqmp.o