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

Commit de64f5c8 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'sunxi-clk-for-4.9' of... 

Merge tag 'sunxi-clk-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next

Pull Allwinner clock driver changes from Maxime Ripard:

Four more SoCs converted to the new clock framework (A31, A31s, A23 and
A33).

* tag 'sunxi-clk-for-4.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  clk: sunxi-ng: Add hardware dependency
  clk: sunxi-ng: Add A23 CCU
  clk: sunxi-ng: Add A33 CCU support
  clk: sunxi-ng: Add N-class clocks support
  clk: sunxi-ng: mux: Add mux table macro
  clk: sunxi-ng: div: Allow to set a maximum
  clk: sunxi-ng: div: Add kerneldoc for the _ccu_div structure
  clk: sunxi-ng: div: Add mux table macros
  clk: sunxi-ng: Add A31/A31s clocks
  clk: sunxi-ng: mux: Add clk notifier functions
  clk: sunxi-ng: mux: support fixed pre-dividers on multiple parents
  clk: sunxi-ng: mux: Add support for mux tables
  clk: sunxi-ng: mux: Rename mux macro to be consistent
  clk: sunxi-ng: nkm: Add mux to support multiple parents
  clk: sunxi-ng: mux: Increase fixed pre-divider div size
parents 3db385ea d63a5e7c

Documentation/devicetree/bindings/clock/sunxi-ccu.txt

+4 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,10 @@ Allwinner Clock Control Unit Binding 
------------------------------------

------------------------------------





Required properties :

Required properties :

- compatible: must contain one of the following compatible:

- compatible: must contain one of the following compatibles:

		- "allwinner,sun6i-a31-ccu"

		- "allwinner,sun8i-a23-ccu"

		- "allwinner,sun8i-a33-ccu"

		- "allwinner,sun8i-h3-ccu"

		- "allwinner,sun8i-h3-ccu"





- reg: Must contain the registers base address and length

- reg: Must contain the registers base address and length

drivers/clk/sunxi-ng/Kconfig

+39 −0
Original line number Original line Diff line number Diff line 
config SUNXI_CCU

config SUNXI_CCU

	bool "Clock support for Allwinner SoCs"

	bool "Clock support for Allwinner SoCs"

	depends on ARCH_SUNXI || COMPILE_TEST

	default ARCH_SUNXI

	default ARCH_SUNXI





if SUNXI_CCU

if SUNXI_CCU
@@ -19,6 +20,10 @@ config SUNXI_CCU_GATE 
config SUNXI_CCU_MUX

config SUNXI_CCU_MUX

	bool

	bool





config SUNXI_CCU_MULT

	bool

	select SUNXI_CCU_MUX



config SUNXI_CCU_PHASE

config SUNXI_CCU_PHASE

	bool

	bool
@@ -51,6 +56,40 @@ config SUNXI_CCU_MP 




# SoC Drivers

# SoC Drivers





config SUN6I_A31_CCU

	bool "Support for the Allwinner A31/A31s CCU"

	select SUNXI_CCU_DIV

	select SUNXI_CCU_NK

	select SUNXI_CCU_NKM

	select SUNXI_CCU_NM

	select SUNXI_CCU_MP

	select SUNXI_CCU_PHASE

	default MACH_SUN6I



config SUN8I_A23_CCU

	bool "Support for the Allwinner A23 CCU"

	select SUNXI_CCU_DIV

	select SUNXI_CCU_MULT

	select SUNXI_CCU_NK

	select SUNXI_CCU_NKM

	select SUNXI_CCU_NKMP

	select SUNXI_CCU_NM

	select SUNXI_CCU_MP

	select SUNXI_CCU_PHASE

	default MACH_SUN8I



config SUN8I_A33_CCU

	bool "Support for the Allwinner A33 CCU"

	select SUNXI_CCU_DIV

	select SUNXI_CCU_MULT

	select SUNXI_CCU_NK

	select SUNXI_CCU_NKM

	select SUNXI_CCU_NKMP

	select SUNXI_CCU_NM

	select SUNXI_CCU_MP

	select SUNXI_CCU_PHASE

	default MACH_SUN8I



config SUN8I_H3_CCU

config SUN8I_H3_CCU

	bool "Support for the Allwinner H3 CCU"

	bool "Support for the Allwinner H3 CCU"

	select SUNXI_CCU_DIV

	select SUNXI_CCU_DIV

drivers/clk/sunxi-ng/Makefile

+4 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_SUNXI_CCU_DIV) += ccu_div.o 
obj-$(CONFIG_SUNXI_CCU_FRAC)	+= ccu_frac.o

obj-$(CONFIG_SUNXI_CCU_FRAC)	+= ccu_frac.o

obj-$(CONFIG_SUNXI_CCU_GATE)	+= ccu_gate.o

obj-$(CONFIG_SUNXI_CCU_GATE)	+= ccu_gate.o

obj-$(CONFIG_SUNXI_CCU_MUX)	+= ccu_mux.o

obj-$(CONFIG_SUNXI_CCU_MUX)	+= ccu_mux.o

obj-$(CONFIG_SUNXI_CCU_MULT)	+= ccu_mult.o

obj-$(CONFIG_SUNXI_CCU_PHASE)	+= ccu_phase.o

obj-$(CONFIG_SUNXI_CCU_PHASE)	+= ccu_phase.o





# Multi-factor clocks

# Multi-factor clocks
@@ -17,4 +18,7 @@ obj-$(CONFIG_SUNXI_CCU_NM) += ccu_nm.o 
obj-$(CONFIG_SUNXI_CCU_MP)	+= ccu_mp.o

obj-$(CONFIG_SUNXI_CCU_MP)	+= ccu_mp.o





# SoC support

# SoC support

obj-$(CONFIG_SUN6I_A31_CCU)	+= ccu-sun6i-a31.o

obj-$(CONFIG_SUN8I_A23_CCU)	+= ccu-sun8i-a23.o

obj-$(CONFIG_SUN8I_A33_CCU)	+= ccu-sun8i-a33.o

obj-$(CONFIG_SUN8I_H3_CCU)	+= ccu-sun8i-h3.o
 
obj-$(CONFIG_SUN8I_H3_CCU)	+= ccu-sun8i-h3.o