diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2016-02-19 09:46:31 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-02-19 12:46:09 -0800 |
| commit | e1f520dc70a23e7fca742eb722cffaca906f83a1 (patch) | |
| tree | 631ce6faf779001287ffd2731473ef765264f4a7 /Documentation/devicetree | |
| parent | 6a05d862c3f03b367e14d8727c5b243ecb92a653 (diff) | |
| parent | f099aa075749c6fadb79554ce175fbdc31c45d7a (diff) | |
| download | op-kernel-dev-e1f520dc70a23e7fca742eb722cffaca906f83a1.zip op-kernel-dev-e1f520dc70a23e7fca742eb722cffaca906f83a1.tar.gz | |
Merge branch 'clk-shmobile-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-next
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt index 59297d3..fefb802 100644 --- a/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt +++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt @@ -61,7 +61,7 @@ Examples reg = <0 0xe6e88000 0 64>; interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpg CPG_MOD 310>; - clock-names = "sci_ick"; + clock-names = "fck"; dmas = <&dmac1 0x13>, <&dmac1 0x12>; dma-names = "tx", "rx"; power-domains = <&cpg>; |
