Skip to content

Commit d2b2101

Browse files
committed
Merge branches 'clk-st', 'clk-si' and 'clk-hisilicon' into clk-next
- Stop using clock-output-names in ST clk drivers * clk-st: dt-bindings: clock: st: clkgen-fsyn: add new introduced compatible clk: st: clkgen-fsyn: embed soc clock outputs within compatible data dt-bindings: clock: st: clkgen-pll: add new introduced compatible clk: st: clkgen-pll: embed soc clock outputs within compatible data dt-bindings: clock: st: flexgen: add new introduced compatible clk: st: flexgen: embed soc clock outputs within compatible data clk: st: clkgen-pll: remove unused variable of struct clkgen_pll * clk-si: clk: si5341: Add sysfs properties to allow checking/resetting device faults clk: si5341: Add silabs,iovdd-33 property clk: si5341: Add silabs,xaxb-ext-clk property clk: si5341: Allow different output VDD_SEL values clk: si5341: Update initialization magic clk: si5341: Check for input clock presence and PLL lock on startup clk: si5341: Avoid divide errors due to bogus register contents clk: si5341: Wait for DEVICE_READY on startup dt-bindings: clock: clk-si5341: Add new attributes * clk-hisilicon: clk: hisilicon: Add clock driver for hi3559A SoC dt-bindings: Document the hi3559a clock bindings
4 parents 4f47c91 + 301035c + 9b13ff4 + 6c81966 commit d2b2101

File tree

15 files changed

+1960
-79
lines changed

15 files changed

+1960
-79
lines changed
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/hisilicon,hi3559av100-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Hisilicon SOC Clock for HI3559AV100
8+
9+
maintainers:
10+
- Dongjiu Geng <[email protected]>
11+
12+
description: |
13+
Hisilicon SOC clock control module which supports the clocks, resets and
14+
power domains on HI3559AV100.
15+
16+
See also:
17+
dt-bindings/clock/hi3559av100-clock.h
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- hisilicon,hi3559av100-clock
23+
- hisilicon,hi3559av100-shub-clock
24+
25+
reg:
26+
minItems: 1
27+
maxItems: 2
28+
29+
'#clock-cells':
30+
const: 1
31+
32+
'#reset-cells':
33+
const: 2
34+
description: |
35+
First cell is reset request register offset.
36+
Second cell is bit offset in reset request register.
37+
38+
required:
39+
- compatible
40+
- reg
41+
- '#clock-cells'
42+
- '#reset-cells'
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
soc {
49+
#address-cells = <2>;
50+
#size-cells = <2>;
51+
52+
clock-controller@12010000 {
53+
compatible = "hisilicon,hi3559av100-clock";
54+
#clock-cells = <1>;
55+
#reset-cells = <2>;
56+
reg = <0x0 0x12010000 0x0 0x10000>;
57+
};
58+
};
59+
...

Documentation/devicetree/bindings/clock/silabs,si5341.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ it.
2424

2525
The device type, speed grade and revision are determined runtime by probing.
2626

27-
The driver currently only supports XTAL input mode, and does not support any
28-
fancy input configurations. They can still be programmed into the chip and
29-
the driver will leave them "as is".
27+
The driver currently does not support any fancy input configurations. They can
28+
still be programmed into the chip and the driver will leave them "as is".
3029

3130
==I2C device node==
3231

@@ -45,9 +44,9 @@ Required properties:
4544
corresponding to inputs. Use a fixed clock for the "xtal" input.
4645
At least one must be present.
4746
- clock-names: One of: "xtal", "in0", "in1", "in2"
48-
- vdd-supply: Regulator node for VDD
4947

5048
Optional properties:
49+
- vdd-supply: Regulator node for VDD
5150
- vdda-supply: Regulator node for VDDA
5251
- vdds-supply: Regulator node for VDDS
5352
- silabs,pll-m-num, silabs,pll-m-den: Numerator and denominator for PLL
@@ -60,7 +59,14 @@ Optional properties:
6059
be initialized, and always performs the soft-reset routine. Since this will
6160
temporarily stop all output clocks, don't do this if the chip is generating
6261
the CPU clock for example.
62+
- silabs,xaxb-ext-clk: When present, indicates that the XA/XB pins are used
63+
in EXTCLK (external reference clock) rather than XTAL (crystal) mode.
6364
- interrupts: Interrupt for INTRb pin.
65+
- silabs,iovdd-33: When present, indicates that the I2C lines are using 3.3V
66+
rather than 1.8V thresholds.
67+
- vddoX-supply (where X is an output index): Regulator node for VDDO for the
68+
specified output. The driver selects the output VDD_SEL setting based on this
69+
voltage.
6470
- #address-cells: shall be set to 1.
6571
- #size-cells: shall be set to 0.
6672

@@ -77,8 +83,6 @@ Required child node properties:
7783
- reg: number of clock output.
7884

7985
Optional child node properties:
80-
- vdd-supply: Regulator node for VDD for this output. The driver selects default
81-
values for common-mode and amplitude based on the voltage.
8286
- silabs,format: Output format, one of:
8387
1 = differential (defaults to LVDS levels)
8488
2 = low-power (defaults to HCSL levels)

Documentation/devicetree/bindings/clock/st/st,clkgen-pll.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ Required properties:
1010

1111
- compatible : shall be:
1212
"st,clkgen-pll0"
13+
"st,clkgen-pll0-a0"
14+
"st,clkgen-pll0-c0"
1315
"st,clkgen-pll1"
16+
"st,clkgen-pll1-c0"
1417
"st,stih407-clkgen-plla9"
1518
"st,stih418-clkgen-plla9"
1619

Documentation/devicetree/bindings/clock/st/st,flexgen.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ Required properties:
6464
audio use case)
6565
"st,flexgen-video", "st,flexgen" (enable clock propagation on parent
6666
and activate synchronous mode)
67+
"st,flexgen-stih407-a0"
68+
"st,flexgen-stih410-a0"
69+
"st,flexgen-stih407-c0"
70+
"st,flexgen-stih410-c0"
71+
"st,flexgen-stih418-c0"
72+
"st,flexgen-stih407-d0"
73+
"st,flexgen-stih410-d0"
74+
"st,flexgen-stih407-d2"
75+
"st,flexgen-stih418-d2"
76+
"st,flexgen-stih407-d3"
6777

6878
- #clock-cells : from common clock binding; shall be set to 1 (multiple clock
6979
outputs).

Documentation/devicetree/bindings/clock/st/st,quadfs.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ This binding uses the common clock binding[1].
1212
Required properties:
1313
- compatible : shall be:
1414
"st,quadfs"
15+
"st,quadfs-d0"
16+
"st,quadfs-d2"
17+
"st,quadfs-d3"
1518
"st,quadfs-pll"
1619

1720

0 commit comments

Comments
 (0)