diff options
author | Dan Murphy | 2013-04-23 11:05:46 -0500 |
---|---|---|
committer | Dan Murphy | 2013-04-23 11:05:46 -0500 |
commit | 32b90931b26db66638e7a67aa72de4879f60e6a6 (patch) | |
tree | f6f0317c127045f3056f7c1e68ddc251a1a5bcce /Documentation | |
parent | 21ea3d6ad56e51613cad60372aec9fe4dac48890 (diff) | |
parent | 36a2b8d10ee4f46f54afdb2e04e3ef8cf463ad52 (diff) | |
download | kernel-audio-32b90931b26db66638e7a67aa72de4879f60e6a6.tar.gz kernel-audio-32b90931b26db66638e7a67aa72de4879f60e6a6.tar.xz kernel-audio-32b90931b26db66638e7a67aa72de4879f60e6a6.zip |
Merge branch 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree into ti-linux-3.8.y
TI-Feature: power_management
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-linux-3.8.y
* 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree: (33 commits)
staging: ti-soc-thermal: fix device removal
staging: ti-soc-thermal: update OMAP5 extrapolation rules
staging: ti-soc-thermal: introduce OMAP4430 extrapolation constants
staging: ti-soc-thermal: Remove TC1/TC2 TODO (already done)
staging: ti-soc-thermal: fix min/max TODO (already done)
staging: ti-soc-thermal: update TODO list
staging: ti-soc-thermal: Add get_trend support
staging: ti-soc-thermal:Introduce ti_bandgap_get_trend function for OMAP5
staging: ti-soc-thermal: Enable HISTORY_BUFFER Feature for OMAP5
staging: ti-soc-thermal: Introduce HAS_HISTORY_BUFFER feature for bandgap
staging: ti-soc-thermal: Modify update_interval r/w functions to incorporate the OMAP5 feature of COUNTER_DELAY.
staging: ti-soc-thermal: Enable COUNTER_DELAY feature for OMAP5
staging: ti-soc-thermal: Introduce HAS_COUNTER_DELAY feature for bandgap
staging: ti-soc-thermal: Initialise counter_delay field for OMAP5 sensors
staging: ti-soc-thermal: Add counter_delay_mask field to temp_sensor_registers struct
arm: omap2plus_defconfig: enable TI bandgap driver
staging: ti-soc-thermal: defer probe if cpufreq is not ready
cpufreq: Add a get_current_driver helper
arm: add bandgap DT entry for OMAP5
ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot(v4)
...
Conflicts:
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/configs/omap2plus_defconfig
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/clock/omap-clock.txt | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/omap-clock.txt b/Documentation/devicetree/bindings/clock/omap-clock.txt new file mode 100644 index 000000000000..047c1e77245a --- /dev/null +++ b/Documentation/devicetree/bindings/clock/omap-clock.txt | |||
@@ -0,0 +1,40 @@ | |||
1 | Device Tree Clock bindings for Texas Instrument's OMAP compatible platforms | ||
2 | |||
3 | This binding is an initial minimal binding that may be enhanced as part of | ||
4 | transitioning OMAP clock data out of kernel image. | ||
5 | |||
6 | This binding uses the common clock binding[1]. | ||
7 | |||
8 | [1] Documentation/devicetree/bindings/clock/clock-bindings.txt | ||
9 | |||
10 | Required properties: | ||
11 | - compatible : shall be "ti,omap-clock" | ||
12 | - #clock-cells : from common clock binding; shall be set to 0. | ||
13 | NOTE: | ||
14 | node name should map to clock database in arch/arm/mach-omap2/cclock<SoC>_data.c | ||
15 | Since all clocks are described with _ck, the node name is optimized to drop the | ||
16 | usage of _ck. For example, a clock called dpll1_ck will be defined as dpll1. | ||
17 | |||
18 | Example #1: describing clock node for CPU on OMAP34xx platform: | ||
19 | Ref: arch/arm/mach-omap2/cclock3xxx_data.c | ||
20 | describes the CPU clock to be as follows | ||
21 | CLK(NULL, "dpll1_ck", &dpll1_ck, CK_3XXX), | ||
22 | Corresponding binding will be: | ||
23 | dpll1: dpll1 { | ||
24 | #clock-cells = <0>; | ||
25 | compatible = "ti,omap-clock"; | ||
26 | }; | ||
27 | And it's usage will be: | ||
28 | clocks = <&dpll1>; | ||
29 | |||
30 | Example #2: describing clock node for auxilary clock #3 on OMAP443x platform: | ||
31 | Ref: arch/arm/mach-omap2/cclock44xx_data.c | ||
32 | describes the auxclk3 clock to be as follows: | ||
33 | CLK(NULL, "auxclk3_ck", &auxclk3_ck, CK_443X), | ||
34 | Corresponding binding will be: | ||
35 | auxclk3: auxclk3 { | ||
36 | #clock-cells = <0>; | ||
37 | compatible = "ti,omap-clock"; | ||
38 | }; | ||
39 | And it's usage will be: | ||
40 | clocks = <&auxclk3>; | ||