Commit 0dfc86b3 authored by Scott Wood's avatar Scott Wood

clk: qoriq: Move chip-specific knowledge into driver

The device tree should describe the chips (or chip-like subblocks) in
the system, but it generally does not describe individual registers --
it should identify, rather than describe, a programming interface.

This has not been the case with the QorIQ clockgen nodes.  The
knowledge of what each bit setting of CLKCnCSR means is encoded in
three places (binding, pll node, and mux node), and the last also needs
to know which options are valid on a particular chip.  All three of
these locations are considered stable ABI, making it difficult to fix
mistakes (of which I have found several), much less refactor the
abstraction to be able to address problems, limitations, or new chips.

Under the current binding, a pll clock specifier of 2 means that the
PLL is divided by 4 -- and the driver implements this, unless there
happen to be four clock-output-names rather than 3, in which case it
interprets it as PLL divided by 3.  This does not appear in the binding
documentation at all.  That hack is now considered stable ABI.

The current device tree nodes contain errors, such as saying that
T1040 can set a core clock to PLL/4 when only PLL and PLL/2 are options.
The current binding also ignores some restrictions on clock selection,
such as p5020's requirement that if a core uses the "wrong" PLL, that
PLL must be clocked lower than the "correct" PLL and be at most 80% of
the rated CPU frequency.

Possibly because of the lack of the ability to express such nuance in
the binding, some valid options are omitted from the device trees, such
as the ability on p4080 to run cores 0-3 from PLL3 and cores 4-7 from
PLL1 (again, only if they are at most 80% of rated CPU frequency).
This omission, combined with excessive caution in the cpufreq driver
(addressed in a subsequent patch), means that currently on a 1500 MHz
p4080 with typical PLL configuration, cpufreq can lower the frequency
to 1200 MHz on half the CPUs and do nothing on the others.  With this
patchset, all CPUs can be lowered to 1200 MHz on a rev2 p4080, and on a
rev3 p4080 half can be lowered to 750 MHz and the other half to 600
MHz.

The current binding only deals with CPU clocks.  To describe FMan in
the device tree, we need to describe its clock.  Some chips have
additional muxes that work like the CPU muxes, but are not described in
the device tree.  Others require inspecting the Reset Control Word to
determine which PLL is used.  Rather than continue to extend this mess,
replace it.  Have the driver bind to the chip-specific clockgen
compatible, and keep the detailed description of quirky chip variations
in the driver, where it can be easily fixed, refactored, and extended.

Older device trees will continue to work (including a workaround for
old ls1021a device trees that are missing compatible and reg in the
clockgen node, which even the old binding required).  The pll/mux
details in old device trees will be ignored, but "clocks" properties
pointing at the old nodes will still work, and be directed at the
corresponding new clock.
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Acked-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 94848654
* Clock Block on Freescale QorIQ Platforms * Clock Block on Freescale QorIQ Platforms
Freescale qoriq chips take primary clocking input from the external Freescale QorIQ chips take primary clocking input from the external
SYSCLK signal. The SYSCLK input (frequency) is multiplied using SYSCLK signal. The SYSCLK input (frequency) is multiplied using
multiple phase locked loops (PLL) to create a variety of frequencies multiple phase locked loops (PLL) to create a variety of frequencies
which can then be passed to a variety of internal logic, including which can then be passed to a variety of internal logic, including
...@@ -13,14 +13,16 @@ which the chip complies. ...@@ -13,14 +13,16 @@ which the chip complies.
Chassis Version Example Chips Chassis Version Example Chips
--------------- ------------- --------------- -------------
1.0 p4080, p5020, p5040 1.0 p4080, p5020, p5040
2.0 t4240, b4860, t1040 2.0 t4240, b4860
1. Clock Block Binding 1. Clock Block Binding
Required properties: Required properties:
- compatible: Should contain a specific clock block compatible string - compatible: Should contain a chip-specific clock block compatible
and a single chassis clock compatible string. string and (if applicable) may contain a chassis-version clock
Clock block strings include, but not limited to, one of the: compatible string.
Chip-specific strings are of the form "fsl,<chip>-clockgen", such as:
* "fsl,p2041-clockgen" * "fsl,p2041-clockgen"
* "fsl,p3041-clockgen" * "fsl,p3041-clockgen"
* "fsl,p4080-clockgen" * "fsl,p4080-clockgen"
...@@ -30,15 +32,14 @@ Required properties: ...@@ -30,15 +32,14 @@ Required properties:
* "fsl,b4420-clockgen" * "fsl,b4420-clockgen"
* "fsl,b4860-clockgen" * "fsl,b4860-clockgen"
* "fsl,ls1021a-clockgen" * "fsl,ls1021a-clockgen"
Chassis clock strings include: Chassis-version clock strings include:
* "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks * "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks
* "fsl,qoriq-clockgen-2.0": for chassis 2.0 clocks * "fsl,qoriq-clockgen-2.0": for chassis 2.0 clocks
- reg: Describes the address of the device's resources within the - reg: Describes the address of the device's resources within the
address space defined by its parent bus, and resource zero address space defined by its parent bus, and resource zero
represents the clock register set represents the clock register set
- clock-frequency: Input system clock frequency
Recommended properties: Optional properties:
- ranges: Allows valid translation between child's address space and - ranges: Allows valid translation between child's address space and
parent's. Must be present if the device has sub-nodes. parent's. Must be present if the device has sub-nodes.
- #address-cells: Specifies the number of cells used to represent - #address-cells: Specifies the number of cells used to represent
...@@ -47,8 +48,46 @@ Recommended properties: ...@@ -47,8 +48,46 @@ Recommended properties:
- #size-cells: Specifies the number of cells used to represent - #size-cells: Specifies the number of cells used to represent
the size of an address. Must be present if the device has the size of an address. Must be present if the device has
sub-nodes and set to 1 if present sub-nodes and set to 1 if present
- clock-frequency: Input system clock frequency (SYSCLK)
- clocks: If clock-frequency is not specified, sysclk may be provided
as an input clock. Either clock-frequency or clocks must be
provided.
2. Clock Provider
The clockgen node should act as a clock provider, though in older device
trees the children of the clockgen node are the clock providers.
When the clockgen node is a clock provider, #clock-cells = <2>.
The first cell of the clock specifier is the clock type, and the
second cell is the clock index for the specified type.
Type# Name Index Cell
0 sysclk must be 0
1 cmux index (n in CLKCnCSR)
2 hwaccel index (n in CLKCGnHWACSR)
3 fman 0 for fm1, 1 for fm2
4 platform pll 0=pll, 1=pll/2, 2=pll/3, 3=pll/4
3. Example
clockgen: global-utilities@e1000 {
compatible = "fsl,p5020-clockgen", "fsl,qoriq-clockgen-1.0";
clock-frequency = <133333333>;
reg = <0xe1000 0x1000>;
#clock-cells = <2>;
};
fman@400000 {
...
clocks = <&clockgen 3 0>;
...
};
}
4. Legacy Child Nodes
2. Clock Provider/Consumer Binding NOTE: These nodes are deprecated. Kernels should continue to support
device trees with these nodes, but new device trees should not use them.
Most of the bindings are from the common clock binding[1]. Most of the bindings are from the common clock binding[1].
[1] Documentation/devicetree/bindings/clock/clock-bindings.txt [1] Documentation/devicetree/bindings/clock/clock-bindings.txt
...@@ -82,7 +121,7 @@ Recommended properties: ...@@ -82,7 +121,7 @@ Recommended properties:
- reg: Should be the offset and length of clock block base address. - reg: Should be the offset and length of clock block base address.
The length should be 4. The length should be 4.
Example for clock block and clock provider: Legacy Example:
/ { / {
clockgen: global-utilities@e1000 { clockgen: global-utilities@e1000 {
compatible = "fsl,p5020-clockgen", "fsl,qoriq-clockgen-1.0"; compatible = "fsl,p5020-clockgen", "fsl,qoriq-clockgen-1.0";
...@@ -142,7 +181,7 @@ Example for clock block and clock provider: ...@@ -142,7 +181,7 @@ Example for clock block and clock provider:
}; };
}; };
Example for clock consumer: Example for legacy clock consumer:
/ { / {
cpu0: PowerPC,e5500@0 { cpu0: PowerPC,e5500@0 {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment