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

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

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

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

Pull Allwinner clock changes from Maxime Ripard:

The usual patches from us, but most notably the introduction of the A64
clocks unit.

* tag 'sunxi-clk-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  clk: sunxi-ng: sun8i-h3: Set CLK_SET_RATE_PARENT for audio module clocks
  clk: sunxi-ng: sun8i-a23: Set CLK_SET_RATE_PARENT for audio module clocks
  clk: sunxi-ng: Add A64 clocks
  clk: sunxi-ng: Implement minimum for multipliers
  clk: sunxi-ng: Add minimums for all the relevant structures and clocks
  clk: sunxi-ng: Finish to convert to structures for arguments
  clk: sunxi-ng: Remove the use of rational computations
  clk: sunxi-ng: Rename the internal structures
  clk: sunxi: mod0: improve function-level documentation
parents c284a7ba 0f6f9302

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

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties : 
		- "allwinner,sun8i-a23-ccu"

		- "allwinner,sun8i-a33-ccu"

		- "allwinner,sun8i-h3-ccu"

		- "allwinner,sun50i-a64-ccu"



- reg: Must contain the registers base address and length

- clocks: phandle to the oscillators feeding the CCU. Two are needed:

drivers/clk/sunxi-ng/Kconfig

+11 −3
Original line number Diff line number Diff line
@@ -35,17 +35,14 @@ config SUNXI_CCU_NK 


config SUNXI_CCU_NKM

	bool

	select RATIONAL

	select SUNXI_CCU_GATE



config SUNXI_CCU_NKMP

	bool

	select RATIONAL

	select SUNXI_CCU_GATE



config SUNXI_CCU_NM

	bool

	select RATIONAL

	select SUNXI_CCU_FRAC

	select SUNXI_CCU_GATE
@@ -56,6 +53,17 @@ config SUNXI_CCU_MP 


# SoC Drivers



config SUN50I_A64_CCU

	bool "Support for the Allwinner A64 CCU"

	select SUNXI_CCU_DIV

	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 ARM64 && ARCH_SUNXI



config SUN6I_A31_CCU

	bool "Support for the Allwinner A31/A31s CCU"

	select SUNXI_CCU_DIV

drivers/clk/sunxi-ng/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ obj-$(CONFIG_SUNXI_CCU_NM) += ccu_nm.o 
obj-$(CONFIG_SUNXI_CCU_MP)	+= ccu_mp.o



# SoC support

obj-$(CONFIG_SUN50I_A64_CCU)	+= ccu-sun50i-a64.o

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