Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a742e1b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'zte-pd-4.11' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 2998954c 3755584a

Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* ZTE zx2967 family Power Domains



zx2967 family includes support for multiple power domains which are used

to gate power to one or more peripherals on the processor.



Required Properties:

  - compatible: should be one of the following.

      * zte,zx296718-pcu - for zx296718 power domain.

  - reg: physical base address of the controller and length of memory mapped

      region.

  - #power-domain-cells: Must be 1.



Example:



	pcu_domain: pcu@117000 {

		compatible = "zte,zx296718-pcu";

		reg = <0x00117000 0x1000>;

		#power-domain-cells = <1>;

	};

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -1982,14 +1982,18 @@ F: arch/arm/mach-pxa/include/mach/z2.h 


ARM/ZTE ARCHITECTURE

M:	Jun Nie <jun.nie@linaro.org>

M:	Baoyou Xie <baoyou.xie@linaro.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

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 <michal.simek@xilinx.com>

drivers/soc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ source "drivers/soc/tegra/Kconfig" 
source "drivers/soc/ti/Kconfig"

source "drivers/soc/ux500/Kconfig"

source "drivers/soc/versatile/Kconfig"

source "drivers/soc/zte/Kconfig"



endmenu

drivers/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ obj-$(CONFIG_ARCH_TEGRA) += tegra/ 
obj-$(CONFIG_SOC_TI)		+= ti/

obj-$(CONFIG_ARCH_U8500)	+= ux500/

obj-$(CONFIG_PLAT_VERSATILE)	+= versatile/

obj-$(CONFIG_ARCH_ZX)		+= zte/

drivers/soc/zte/Kconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#

# ZTE SoC drivers

#

menuconfig SOC_ZTE

	bool "ZTE SoC driver support"



if SOC_ZTE



config ZX2967_PM_DOMAINS

	bool "ZX2967 PM domains"

	depends on PM_GENERIC_DOMAINS



endif