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

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

Merge branches 'clk-actions-s700', 'clk-exynos-unused', 'clk-qcom-dispcc-845',... 

Merge branches 'clk-actions-s700', 'clk-exynos-unused', 'clk-qcom-dispcc-845', 'clk-scmi-round' and 'clk-cs2000-spdx' into clk-next

* clk-actions-s700:
  :  - Actions Semi Owl series S700 SoC clk driver
  clk: actions: Add S700 SoC clock support
  dt-bindings: clock: Add S700 support for Actions Semi Soc's
  clk: actions: Add missing REGMAP_MMIO dependency

* clk-exynos-unused:
  :  - Remove an unused variable from Exynos4412 ISP driver
  clk: samsung: Remove unused mout_user_aclk400_mcuisp_p4x12 variable

* clk-qcom-dispcc-845:
  :  - Qualcomm SDM845 display clock controller
  clk: qcom: Add display clock controller driver for SDM845
  dt-bindings: clock: Introduce QCOM Display clock bindings
  clk: qcom: Move frequency table macro to common file

* clk-scmi-round:
  :  - Fix a thinko bug in SCMI clk division logic
  clk: scmi: Fix the rounding of clock rate

* clk-cs2000-spdx:
  clk: cs2000-cp: convert to SPDX identifiers
parents 032405a7 d47317ca 96455f73 81351776 7a8655e1 67075b3c

Documentation/devicetree/bindings/clock/actions,s900-cmu.txt→Documentation/devicetree/bindings/clock/actions,owl-cmu.txt

+11 −9
Original line number Diff line number Diff line 
* Actions S900 Clock Management Unit (CMU)

* Actions Semi Owl Clock Management Unit (CMU)



The Actions S900 clock management unit generates and supplies clock to various

controllers within the SoC. The clock binding described here is applicable to

S900 SoC.

The Actions Semi Owl Clock Management Unit generates and supplies clock

to various controllers within the SoC. The clock binding described here is

applicable to S900 and S700 SoC's.



Required Properties:



- compatible: should be "actions,s900-cmu"

- compatible: should be one of the following,

	"actions,s900-cmu"

	"actions,s700-cmu"

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

  region.

- clocks: Reference to the parent clocks ("hosc", "losc")
@@ -15,16 +17,16 @@ Required Properties: 
Each clock is assigned an identifier, and client nodes can use this identifier

to specify the clock which they consume.



All available clocks are defined as preprocessor macros in

dt-bindings/clock/actions,s900-cmu.h header and can be used in device

tree sources.

All available clocks are defined as preprocessor macros in corresponding

dt-bindings/clock/actions,s900-cmu.h or actions,s700-cmu.h header and can be

used in device tree sources.



External clocks:



The hosc clock used as input for the plls is generated outside the SoC. It is

expected that it is defined using standard clock bindings as "hosc".



Actions S900 CMU also requires one more clock:

Actions Semi S900 CMU also requires one more clock:

 - "losc" - internal low frequency oscillator



Example: Clock Management Unit node:

Documentation/devicetree/bindings/clock/qcom,dispcc.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. Display Clock Controller Binding

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



Required properties :



- compatible : shall contain "qcom,sdm845-dispcc"

- reg : shall contain base register location and length.

- #clock-cells : from common clock binding, shall contain 1.

- #reset-cells : from common reset binding, shall contain 1.

- #power-domain-cells : from generic power domain binding, shall contain 1.



Example:

	dispcc: clock-controller@af00000 {

		compatible = "qcom,sdm845-dispcc";

		reg = <0xaf00000 0x100000>;

		#clock-cells = <1>;

		#reset-cells = <1>;

		#power-domain-cells = <1>;

	};

drivers/clk/actions/Kconfig

+7 −0
Original line number Diff line number Diff line 
config CLK_ACTIONS

	bool "Clock driver for Actions Semi SoCs"

	depends on ARCH_ACTIONS || COMPILE_TEST

	select REGMAP_MMIO

	default ARCH_ACTIONS



if CLK_ACTIONS



# SoC Drivers



config CLK_OWL_S700

	bool "Support for the Actions Semi OWL S700 clocks"

	depends on (ARM64 && ARCH_ACTIONS) || COMPILE_TEST

	default ARM64 && ARCH_ACTIONS



config CLK_OWL_S900

	bool "Support for the Actions Semi OWL S900 clocks"

	depends on (ARM64 && ARCH_ACTIONS) || COMPILE_TEST

	default ARM64 && ARCH_ACTIONS



endif

drivers/clk/actions/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,4 +9,5 @@ clk-owl-y += owl-composite.o 
clk-owl-y			+= owl-pll.o



# SoC support

obj-$(CONFIG_CLK_OWL_S700)	+= owl-s700.o

obj-$(CONFIG_CLK_OWL_S900)	+= owl-s900.o

drivers/clk/actions/owl-s700.c

0 → 100644
+606 −0

File added.

Preview size limit exceeded, changes collapsed.