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

Commit 19ef2465 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-ingenic-jz4725b' into clk-next 

  - Ingenic jz4725b CGU

* clk-ingenic-jz4725b:
  clk: Add Ingenic jz4725b CGU driver
  dt-bindings: clock: Add jz4725b-cgu.h header
  dt-bindings: clock: ingenic: Explicitly list compatible strings
  clk: ingenic: Add proper Kconfig entries
parents fa4c0e49 226dfa47

Documentation/devicetree/bindings/clock/ingenic,cgu.txt

+5 −2
Original line number Diff line number Diff line
@@ -6,8 +6,11 @@ to provide many different clock signals derived from only 2 external source 
clocks.



Required properties:

- compatible : Should be "ingenic,<soctype>-cgu".

  For example "ingenic,jz4740-cgu" or "ingenic,jz4780-cgu".

- compatible : Should be one of:

  * ingenic,jz4740-cgu

  * ingenic,jz4725b-cgu

  * ingenic,jz4770-cgu

  * ingenic,jz4780-cgu

- reg : The address & length of the CGU registers.

- clocks : List of phandle & clock specifiers for clocks external to the CGU.

  Two such external clocks should be specified - first the external crystal

drivers/clk/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ source "drivers/clk/actions/Kconfig" 
source "drivers/clk/bcm/Kconfig"

source "drivers/clk/hisilicon/Kconfig"

source "drivers/clk/imgtec/Kconfig"

source "drivers/clk/ingenic/Kconfig"

source "drivers/clk/keystone/Kconfig"

source "drivers/clk/mediatek/Kconfig"

source "drivers/clk/meson/Kconfig"

drivers/clk/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ obj-$(CONFIG_H8300) += h8300/ 
obj-$(CONFIG_ARCH_HISI)			+= hisilicon/

obj-y					+= imgtec/

obj-$(CONFIG_ARCH_MXC)			+= imx/

obj-$(CONFIG_MACH_INGENIC)		+= ingenic/

obj-y					+= ingenic/

obj-$(CONFIG_ARCH_K3)			+= keystone/

obj-$(CONFIG_ARCH_KEYSTONE)		+= keystone/

obj-$(CONFIG_MACH_LOONGSON32)		+= loongson1/

drivers/clk/ingenic/Kconfig

0 → 100644
+47 −0
Original line number Diff line number Diff line 
menu "Ingenic JZ47xx CGU drivers"

	depends on MIPS



config INGENIC_CGU_COMMON

	bool



config INGENIC_CGU_JZ4740

	bool "Ingenic JZ4740 CGU driver"

	default MACH_JZ4740

	select INGENIC_CGU_COMMON

	help

	  Support the clocks provided by the CGU hardware on Ingenic JZ4740

	  and compatible SoCs.



	  If building for a JZ4740 SoC, you want to say Y here.



config INGENIC_CGU_JZ4725B

	bool "Ingenic JZ4725B CGU driver"

	default MACH_JZ4725B

	select INGENIC_CGU_COMMON

	help

	  Support the clocks provided by the CGU hardware on Ingenic JZ4725B

	  and compatible SoCs.



	  If building for a JZ4725B SoC, you want to say Y here.



config INGENIC_CGU_JZ4770

	bool "Ingenic JZ4770 CGU driver"

	default MACH_JZ4770

	select INGENIC_CGU_COMMON

	help

	  Support the clocks provided by the CGU hardware on Ingenic JZ4770

	  and compatible SoCs.



	  If building for a JZ4770 SoC, you want to say Y here.



config INGENIC_CGU_JZ4780

	bool "Ingenic JZ4780 CGU driver"

	default MACH_JZ4780

	select INGENIC_CGU_COMMON

	help

	  Support the clocks provided by the CGU hardware on Ingenic JZ4780

	  and compatible SoCs.



	  If building for a JZ4780 SoC, you want to say Y here.



endmenu

drivers/clk/ingenic/Makefile

+5 −4
Original line number Diff line number Diff line 
obj-y				+= cgu.o

obj-$(CONFIG_MACH_JZ4740)	+= jz4740-cgu.o

obj-$(CONFIG_MACH_JZ4770)	+= jz4770-cgu.o

obj-$(CONFIG_MACH_JZ4780)	+= jz4780-cgu.o
 
obj-$(CONFIG_INGENIC_CGU_COMMON)	+= cgu.o

obj-$(CONFIG_INGENIC_CGU_JZ4740)	+= jz4740-cgu.o

obj-$(CONFIG_INGENIC_CGU_JZ4725B)	+= jz4725b-cgu.o

obj-$(CONFIG_INGENIC_CGU_JZ4770)	+= jz4770-cgu.o

obj-$(CONFIG_INGENIC_CGU_JZ4780)	+= jz4780-cgu.o