From: Olof Johansson Date: Mon, 30 Jan 2017 05:17:24 +0000 (-0800) Subject: Merge tag 'zte-pd-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... X-Git-Tag: v4.11-rc1~85^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a742e1b180785464accac3adf14fa1ccc9d02b0;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'zte-pd-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/drivers ZTE PM domain driver support for 4.11: - It includes a series which adds DT bindings and PM domain driver for PCU (Power Control Unit) block found on ZTE ZX2967 family SoC. * tag 'zte-pd-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: soc: zte: pm_domains: Add support for zx296718 soc: zte: pm_domains: Prepare for supporting ARMv8 zx2967 family soc: zte: Add header for PM domains specifiers MAINTAINERS: add zx2967 SoC drivers to ARM ZTE architecture dt-bindings: zte: add bindings document for zx2967 power domain controller Signed-off-by: Olof Johansson --- 2a742e1b180785464accac3adf14fa1ccc9d02b0 diff --cc MAINTAINERS index 33c0e0d176505,9e0e4fa5adb07..e4874cc6b1b99 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1986,10 -1986,11 +1987,13 @@@ L: linux-arm-kernel@lists.infradead.or S: Maintained F: arch/arm/mach-zx/ F: drivers/clk/zte/ +F: drivers/reset/reset-zx2967.c + F: drivers/soc/zte/ F: Documentation/devicetree/bindings/arm/zte.txt F: Documentation/devicetree/bindings/clock/zx296702-clk.txt +F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt + F: Documentation/devicetree/bindings/soc/zte/ + F: include/dt-bindings/soc/zx*.h ARM/ZYNQ ARCHITECTURE M: Michal Simek