-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'clk-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/k…
…ernel/git/clk/linux Pull clk updates from Michael Turquette: "The bulk of the changes are updates and fixes to existing clk provider drivers, along with a pretty standard number of new drivers. The core recieved a small number of updates as well. Core changes of note: - removed CLK_IS_ROOT flag New clk provider drivers: - Renesas r8a7796 clock pulse generator / module standby and software reset - Allwinner sun8i H3 clock controller unit - AmLogic meson8b clock controller (rewritten) - AmLogic gxbb clock controller - support for some new ICs was added by simple changes to static data tables for chips sharing the same family Driver updates of note: - the Allwinner sunxi clock driver infrastucture was rewritten to comform to the state of the art at drivers/clk/sunxi-ng. The old implementation is still supported for backwards compatibility with the DT ABI" * tag 'clk-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (162 commits) clk: Makefile: re-sort and clean up Revert "clk: gxbb: expose CLKID_MMC_PCLK" clk: samsung: Allow modular build of the Audio Subsystem CLKCON driver clk: samsung: make clk-s5pv210-audss explicitly non-modular clk: exynos5433: remove CLK_IGNORE_UNUSED flag from SPI clocks clk: oxnas: Add hardware dependencies clk: imx7d: do not set parent of ethernet time/ref clocks ARM: dt: sun8i: switch the H3 to the new CCU driver clk: sunxi-ng: h3: Fix Kconfig symbol typo clk: sunxi-ng: h3: Fix audio clock divider offset clk: sunxi-ng: Add H3 clocks clk: sunxi-ng: Add N-K-M-P factor clock clk: sunxi-ng: Add N-K-M Factor clock clk: sunxi-ng: Add N-M-factor clock support clk: sunxi-ng: Add N-K-factor clock support clk: sunxi-ng: Add M-P factor clock support clk: sunxi-ng: Add divider clk: sunxi-ng: Add phase clock support clk: sunxi-ng: Add mux clock support clk: sunxi-ng: Add gate clock support ...
- Loading branch information
Showing
148 changed files
with
9,004 additions
and
3,419 deletions.
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
* Amlogic GXBB Clock and Reset Unit | ||
|
||
The Amlogic GXBB clock controller generates and supplies clock to various | ||
controllers within the SoC. | ||
|
||
Required Properties: | ||
|
||
- compatible: should be "amlogic,gxbb-clkc" | ||
- reg: physical base address of the clock controller and length of memory | ||
mapped region. | ||
|
||
- #clock-cells: should be 1. | ||
|
||
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 the dt-bindings/clock/gxbb-clkc.h header and can be | ||
used in device tree sources. | ||
|
||
Example: Clock controller node: | ||
|
||
clkc: clock-controller@c883c000 { | ||
#clock-cells = <1>; | ||
compatible = "amlogic,gxbb-clkc"; | ||
reg = <0x0 0xc883c000 0x0 0x3db>; | ||
}; | ||
|
||
Example: UART controller node that consumes the clock generated by the clock | ||
controller: | ||
|
||
uart_AO: serial@c81004c0 { | ||
compatible = "amlogic,meson-uart"; | ||
reg = <0xc81004c0 0x14>; | ||
interrupts = <0 90 1>; | ||
clocks = <&clkc CLKID_CLK81>; | ||
status = "disabled"; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
Allwinner Clock Control Unit Binding | ||
------------------------------------ | ||
|
||
Required properties : | ||
- compatible: must contain one of the following compatible: | ||
- "allwinner,sun8i-h3-ccu" | ||
|
||
- reg: Must contain the registers base address and length | ||
- clocks: phandle to the oscillators feeding the CCU. Two are needed: | ||
- "hosc": the high frequency oscillator (usually at 24MHz) | ||
- "losc": the low frequency oscillator (usually at 32kHz) | ||
- clock-names: Must contain the clock names described just above | ||
- #clock-cells : must contain 1 | ||
- #reset-cells : must contain 1 | ||
|
||
Example: | ||
ccu: clock@01c20000 { | ||
compatible = "allwinner,sun8i-h3-ccu"; | ||
reg = <0x01c20000 0x400>; | ||
clocks = <&osc24M>, <&osc32k>; | ||
clock-names = "hosc", "losc"; | ||
#clock-cells = <1>; | ||
#reset-cells = <1>; | ||
}; |
Oops, something went wrong.