OMAP CCF DT conversion
Subsystems (9)
v6 cover OMAP CCF DT conversion
Hi,
Rather large diff from previous version, main changes:
- Rebased on top of v3.11-rc5 (+ DRA7 data + Mike's clock bindings v4)
- Clkdev code hacks replaced with a static array of clkdev entries which get initialized during boot based on SoC type. These arrays can be eventually removed once DT support for device drivers is fixed
- Devicetree documentation changes
- Split compatible + flag clock types to different clock types (e.g. ti,gate-clock + ti,dss-clock => ti,dss-gate-clock), flags are no longer needed
- Removed some unnecessary DT properties for some of the clocks (like DPLL has no longer clk-ref/clk-bypass / recal bit info)
- Added a couple of patch sets from Rajendra (31-33) + Nishanth (38-40) to the end; these are dealing with DT clock data and help to reduce code from mach-omap2, added also a number of patches that tweak the DT data based on these sets
NOTES:
- Patches 31+ are only needed for cleanup purposes
- Patches 43+ require Tony's DRA7 data pull-req to apply cleanly / work
- Patch 37 should only be applied once legacy boot for OMAP3 can be omitted
Test branch available here:
https://github.com/t-kristo/linux-pm.git
branch: v3.11-rc5-clk-dt-v6
This branch contains:
- Tony's DRA7 data pull-request
- Mike's basic clock binding patches v4
- Couple of hacks for testing purposes
- This set
Testing done:
- AM335x-bone - boot test
- OMAP3-beagle - boot test, suspend test
- OMAP4-panda-es - boot test, suspend test
- OMAP5-sevm - boot test
- DRA7-evm - boot test
-Tero
PATCH v6 1/45 CLK: TI: Add DPLL clock support
The OMAP clock driver now supports DPLL clock type. This patch also adds support for DT DPLL nodes.
--- .../devicetree/bindings/clock/ti/dpll.txt | 68 +++ arch/arm/mach-omap2/clock.h | 144 +----- arch/arm/mach-omap2/clock3xxx.h | 2 - drivers/clk/Makefile | 1 + drivers/clk/ti/Makefile | 3 + drivers/clk/ti/dpll.c | 476 ++++++++++++++++++++ include/linux/clk/ti.h | 164 +++++++ 7 files changed, 713 insertions(+), 145 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/ti/dpll.txt create mode 100644 drivers/clk/ti/Makefile create mode 100644 drivers/clk/ti/dpll.c create mode 100644 include/linux/clk/ti.h
Documentation/devicetree/bindings/clock/ti/dpll.txt new file +68 -0
@@ -0,0 +1,68 @@ +Binding for Texas Instruments DPLL clock. + +This binding uses the common clock binding[1]. It assumes a +register-mapped DPLL with usually two selectable input clocks +(reference clock and bypass clock), with digital phase locked +loop logic for multiplying the input clock to a desired output +clock. This clock also typically supports different operation +modes (locked, low power stop etc.) This binding has several +sub-types, which effectively result in slightly different setup +for the actual DPLL clock. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt + +Required properties: +- compatible : shall be one of: + "ti,omap4-dpll-x2-clock", + "ti,omap3-dpll-clock", + "ti,omap3-dpll-core-clock", + "ti,omap3-dpll-per-clock", + "ti,omap3-dpll-per-j-type-clock", + "ti,omap4-dpll-clock", + "ti,omap4-dpll-core-clock", + "ti,omap4-dpll-m4xen-clock", + "ti,omap4-dpll-j-type-clock", + "ti,omap4-dpll-no-gate-clock", + "ti,omap4-dpll-no-gate-j-type-clock", + +- #clock-cells : from common clock binding; shall be set to 0. +- clocks : link phandles of parent clocks, first entry lists reference clock + and second entry bypass clock +- reg : address and length of the register set for controlling the DPLL. + It contains the information of registers in the same order as described by + reg-names. +- reg-names : array of the register names for controlling the device, sorted + in the same order as the reg property. + "control" - contains the control register base address + "idlest" - contains the idle status register base address + "autoidle" - contains the autoidle register base address + "mult-div1" - contains the multiplier / divider register base address + +Optional properties: +- ti,modes : available modes for the DPLL, bitmask of: + 0x02 - DPLL supports low power stop mode + 0x20 - DPLL can be put to low power bypass mode + 0x80 - DPLL can be put to lock mode (running) + Other values currently unsupported. +- ti,clkdm-name : clockdomain name for the DPLL + +Examples: + dpll_core_ck: dpll_core_ck at 44e00490 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-core-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44e00490 0x4>, <0x44e0045c 0x4>, <0x0 0x4>, + <0x44e00468 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; + }; + + dpll2_ck: dpll2_ck at 48004004 { + #clock-cells = <0>; + compatible = "ti,omap3-dpll-clock"; + clocks = <&sys_ck>, <&dpll2_fck>; + ti,modes = <0xa2>; + reg = <0x48004004 0x4>, <0x48004024 0x4>, <0x48004034 0x4>, + <0x48004040 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; + ti,clkdm-name = "dpll2_clkdm"; + };
arch/arm/mach-omap2/clock.h +1 -143
195 lines not on this page · raw message
arch/arm/mach-omap2/clock3xxx.h +0 -2
@@ -9,8 +9,6 @@#define __ARCH_ARM_MACH_OMAP2_CLOCK3XXX_Hint omap3xxx_clk_init (void ); -int omap3_dpll4_set_rate (struct clk_hw *clk,unsigned long rate, -unsigned long parent_rate);int omap3_core_dpll_m2_set_rate (struct clk_hw *clk,unsigned long rate,unsigned long parent_rate);void omap3_clk_lock_dpll5 (void );
drivers/clk/Makefile +1 -0
@@ -32,6 +32,7 @@ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o obj-$(CONFIG_ARCH_ZYNQ) += zynq/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ +obj-$(CONFIG_ARCH_OMAP) += ti/ obj-$(CONFIG_X86) += x86/
drivers/clk/ti/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +ifneq ($(CONFIG_OF),) +obj-y += dpll.o +endif
drivers/clk/ti/dpll.c new file +476 -0
476 lines not on this page · raw message
include/linux/clk/ti.h new file +164 -0
164 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v6 1/45 CLK: TI: Add DPLL clock support
Quoting Tero Kristo (2013-08-29 06:15:53)
Quoted 4 lines
The OMAP clock driver now supports DPLL clock type. This patch also adds support for DT DPLL nodes.
Signed-off-by Tero Kristo <[email protected]>
Tero,
Overall this patch is really great. Some minor comments below.
Quoted 41 lines
Documentation/devicetree/bindings/clock/ti/dpll.txt new file +35
-0@@ -0,0 +1,68 @@ +Binding for Texas Instruments DPLL clock. + +This binding uses the common clock binding[1]. It assumes a +register-mapped DPLL with usually two selectable input clocks +(reference clock and bypass clock), with digital phase locked +loop logic for multiplying the input clock to a desired output +clock. This clock also typically supports different operation +modes (locked, low power stop etc.) This binding has several +sub-types, which effectively result in slightly different setup +for the actual DPLL clock. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt + +Required properties: +- compatible : shall be one of: + "ti,omap4-dpll-x2-clock", + "ti,omap3-dpll-clock", + "ti,omap3-dpll-core-clock", + "ti,omap3-dpll-per-clock", + "ti,omap3-dpll-per-j-type-clock", + "ti,omap4-dpll-clock", + "ti,omap4-dpll-core-clock", + "ti,omap4-dpll-m4xen-clock", + "ti,omap4-dpll-j-type-clock", + "ti,omap4-dpll-no-gate-clock", + "ti,omap4-dpll-no-gate-j-type-clock", + +- #clock-cells : from common clock binding; shall be set to 0. +- clocks : link phandles of parent clocks, first entry lists reference clock + and second entry bypass clock +- reg : address and length of the register set for controlling the DPLL. + It contains the information of registers in the same order as described by + reg-names. +- reg-names : array of the register names for controlling the device, sorted + in the same order as the reg property.
Documentation/devicetree/bindings/clock/ti/dpll.txt line 45
Quoted 10 lines
Documentation/devicetree/bindings/clock/ti/dpll.txt new file +10
-0+ "control" - contains the control register base address + "idlest" - contains the idle status register base address + "autoidle" - contains the autoidle register base address + "mult-div1" - contains the multiplier / divider register base address + +Optional properties: +- ti,modes : available modes for the DPLL, bitmask of: + 0x02 - DPLL supports low power stop mode + 0x20 - DPLL can be put to low power bypass mode + 0x80 - DPLL can be put to lock mode (running)
Any particular reason to use a bitmask here versus flags/DT properties? Something like
Optional properties:
low-power-stop : DPLL supports low power stop mode, gating output low-power-bypass : DPLL output matches rate of parent bypass clock lock : DPLL locks in programmed rate
Is there ever a time when a DPLL does not support the locked state? We can probably remove that from binding entirely.
Documentation/devicetree/bindings/clock/ti/dpll.txt line 47
Quoted 2 lines
Documentation/devicetree/bindings/clock/ti/dpll.txt new file +2
-0+ Other values currently unsupported. +- ti,clkdm-name : clockdomain name for the DPLL
What does this mean? I thought that the clockdomain data would not go into the clock binding?
Quoted 81 lines
drivers/clk/ti/dpll.c new file +75
-0@@ -0,0 +1,476 @@ +/* +* OMAP DPLL clock support +* +* Copyright (C) 2013 Texas Instruments, Inc. +* +* Tero Kristo <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed "as is" WITHOUT ANY WARRANTY of any +* kind, whether express or implied; without even the implied warranty +* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/clk-provider.h> +#include <linux/slab.h> +#include <linux/err.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/clk/ti.h> + +static const struct clk_ops dpll_m4xen_ck_ops = { + .enable = &omap3_noncore_dpll_enable, + .disable = &omap3_noncore_dpll_disable, + .recalc_rate = &omap4_dpll_regm4xen_recalc, + .round_rate = &omap4_dpll_regm4xen_round_rate, + .set_rate = &omap3_noncore_dpll_set_rate, + .get_parent = &omap2_init_dpll_parent, +}; + +static const struct clk_ops dpll_core_ck_ops = { + .recalc_rate = &omap3_dpll_recalc, + .get_parent = &omap2_init_dpll_parent, +}; + +static const struct clk_ops omap3_dpll_core_ck_ops = { + .init = &omap2_init_clk_clkdm, + .get_parent = &omap2_init_dpll_parent, + .recalc_rate = &omap3_dpll_recalc, + .round_rate = &omap2_dpll_round_rate, +}; + +static const struct clk_ops dpll_ck_ops = { + .enable = &omap3_noncore_dpll_enable, + .disable = &omap3_noncore_dpll_disable, + .recalc_rate = &omap3_dpll_recalc, + .round_rate = &omap2_dpll_round_rate, + .set_rate = &omap3_noncore_dpll_set_rate, + .get_parent = &omap2_init_dpll_parent, + .init = &omap2_init_clk_clkdm, +}; + +static const struct clk_ops dpll_no_gate_ck_ops = { + .recalc_rate = &omap3_dpll_recalc, + .get_parent = &omap2_init_dpll_parent, + .round_rate = &omap2_dpll_round_rate, + .set_rate = &omap3_noncore_dpll_set_rate, +}; + +static const struct clk_ops omap3_dpll_ck_ops = { + .init = &omap2_init_clk_clkdm, + .enable = &omap3_noncore_dpll_enable, + .disable = &omap3_noncore_dpll_disable, + .get_parent = &omap2_init_dpll_parent, + .recalc_rate = &omap3_dpll_recalc, + .set_rate = &omap3_noncore_dpll_set_rate, + .round_rate = &omap2_dpll_round_rate, +}; + +static const struct clk_ops omap3_dpll_per_ck_ops = { + .init = &omap2_init_clk_clkdm, + .enable = &omap3_noncore_dpll_enable,
drivers/clk/ti/dpll.c line 85
Quoted 10 lines
drivers/clk/ti/dpll.c new file +10
-0+ .disable = &omap3_noncore_dpll_disable, + .get_parent = &omap2_init_dpll_parent, + .recalc_rate = &omap3_dpll_recalc, + .set_rate = &omap3_dpll4_set_rate, + .round_rate = &omap2_dpll_round_rate, +}; + +static const struct clk_ops dpll_x2_ck_ops = { + .recalc_rate = &omap3_clkoutx2_recalc, +};
No .set_parent ops for any of the DPLLs? How do you handle bypassing them? Are you using another mux clock that is the parent of the DPLL, or just open-coding the bypass stuff?
Regards,
Mike
Tony Lindgren
maintainerPATCH v6 1/45 CLK: TI: Add DPLL clock support
In reply to Tero KristoQuoted 2 lines · Tero Kristo
The OMAP clock driver now supports DPLL clock type. This patch also adds support for DT DPLL nodes.
...
Documentation/devicetree/bindings/clock/ti/dpll.txt line 39
Quoted 6 lines
+- reg-names : array of the register names for controlling the device, sorted
Documentation/devicetree/bindings/clock/ti/dpll.txt new file +5
-0+ in the same order as the reg property. + "control" - contains the control register base address + "idlest" - contains the idle status register base address + "autoidle" - contains the autoidle register base address + "mult-div1" - contains the multiplier / divider register base address
FYI, looks like there's some tab vs spaces issue with the formatting above.
Quoted 10 lines
Documentation/devicetree/bindings/clock/ti/dpll.txt new file +10
-0+Examples: + dpll_core_ck: dpll_core_ck at 44e00490 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-core-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44e00490 0x4>, <0x44e0045c 0x4>, <0x0 0x4>, + <0x44e00468 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; + }; +
Documentation/devicetree/bindings/clock/ti/dpll.txt line 68
Quoted 10 lines
Documentation/devicetree/bindings/clock/ti/dpll.txt new file +10
-0+ dpll2_ck: dpll2_ck at 48004004 { + #clock-cells = <0>; + compatible = "ti,omap3-dpll-clock"; + clocks = <&sys_ck>, <&dpll2_fck>; + ti,modes = <0xa2>; + reg = <0x48004004 0x4>, <0x48004024 0x4>, <0x48004034 0x4>, + <0x48004040 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; + ti,clkdm-name = "dpll2_clkdm"; + };
Do you need the reg-names at all? You may be able to do that automatically in the driver based on the compatible flags if you only have few different types.
Regards,
Tony
PATCH v6 2/45 CLK: TI: add DT alias clock registration mechanism
In reply to Tero KristoSome devices require their clocks to be available with a specific dev-id con-id mapping. With DT, the clocks can be found by default only with their name, or alternatively through the device node of the consumer. With drivers, that don't support DT fully yet, add mechanism to register specific clock names.
--- drivers/clk/ti/Makefile | 2 +- drivers/clk/ti/clk.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/clk/ti.h | 23 +++++++++++++++++++++ 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/ti/clk.c
drivers/clk/ti/Makefile +1 -1
@@ -1,3 +1,3 @@ ifneq ($(CONFIG_OF),) -obj-y += dpll.o +obj-y += clk.o dpll.o endif
drivers/clk/ti/clk.c new file +52 -0
52 lines not on this page · raw message
include/linux/clk/ti.h +23 -0
@@ -15,6 +15,8 @@#ifndef __LINUX_CLK_TI_H__#define __LINUX_CLK_TI_H__ +#include <linux/clkdev.h> +/** * struct dpll_data - DPLL registers and integration data * @mult_div1_reg: register containing the DPLL M and N bitfields
@@ -138,6 +140,25 @@ struct clk_hw_omap {/* DPLL Type and DCO Selection Flags */ #define DPLL_J_TYPE 0x1 +/** +* struct omap_dt_clk - OMAP DT clock alias declarations +* @lk: clock lookup definition +* @node_name: clock DT node to map to +*/ +struct omap_dt_clk { +struct clk_lookup lk; +char *node_name; +}; + +#define DT_CLK (dev, con, name) \ + { \ + .lk = { \ + .dev_id = dev, \ + .con_id = con, \ + }, \ + .node_name = name, \ + } +void omap2_init_clk_hw_omap_clocks (struct clk *clk);int omap3_noncore_dpll_enable (struct clk_hw *hw);void omap3_noncore_dpll_disable (struct clk_hw *hw);
@@ -158,6 +179,8 @@ unsigned long omap3_clkoutx2_recalc(struct clk_hw *hw,int omap3_dpll4_set_rate (struct clk_hw *clk,unsigned long rate,unsigned long parent_rate); +void omap_dt_clocks_register (struct omap_dt_clk *oclks); +extern const struct clk_hw_omap_ops clkhwops_omap3_dpll;extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx;
Signature · 1 line
1.7.9.5
PATCH v6 3/45 CLK: TI: add autoidle support
In reply to Tero KristoTI clk driver now routes some of the basic clocks through own registration routine to allow autoidle support. This routine just checks a couple of device node properties and adds autoidle support if required, and just passes the registration forward to basic clocks.
--- .../devicetree/bindings/clock/ti/autoidle.txt | 48 ++++++++ arch/arm/mach-omap2/clock.c | 6 + drivers/clk/ti/Makefile | 2 +- drivers/clk/ti/autoidle.c | 121 ++++++++++++++++++++ include/linux/clk/ti.h | 7 ++ 5 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/clock/ti/autoidle.txt create mode 100644 drivers/clk/ti/autoidle.c
Documentation/devicetree/bindings/clock/ti/autoidle.txt new file +48 -0
@@ -0,0 +1,48 @@ +Binding for Texas Instruments autoidling clock. + +This binding uses the common clock binding[1]. Autoidle clocks +are inherited clocks from basic divider-clock [2] or +fixed-factor-clock [3] and just add autoidle support on top of +this. Autoidle is an OMAP clock feature, which allows the clock +to gate autonomously by hardware when they are no longer needed. +The autoidle feature must be enabled manually for these clocks. +Otherwise the clocks behave exactly as their base clock type. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt +[2] Documentation/devicetree/bindings/clock/divider-clock.txt +[3] Documentation/devicetree/bindings/clock/fixed-factor-clock.txt + +Required properties: +- compatible : shall be one of: + "ti,divider-clock", + "ti,fixed-factor-clock" +- ti,autoidle-shift : bit shift of the autoidle enable bit for the clock +- reg : base address for the control register of this clock + +Optional properties: +- ti,autoidle-low : autoidle is enabled by setting the bit to 0 + +Other properties as per the base clock type. + +Examples: + dpll_abe_m2x2_ck: dpll_abe_m2x2_ck at 4a0051f0 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_abe_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0051f0 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; + }; + + dpll_usb_clkdcoldo_ck: dpll_usb_clkdcoldo_ck at 4a0081b4 { + #clock-cells = <0>; + compatible = "ti,fixed-factor-clock"; + clocks = <&dpll_usb_ck>; + ti,autoidle-shift = <8>; + clock-div = <1>; + reg = <0x4a0081b4 0x4>; + clock-mult = <1>; + ti,autoidle-low; + };
arch/arm/mach-omap2/clock.c +6 -0
@@ -520,6 +520,9 @@ int omap2_clk_enable_autoidle_all(void)list_for_each_entry (c, &clk_hw_omap_clocks, node)if (c->ops && c->ops->allow_idle) c->ops->allow_idle (c); + +of_omap_clk_allow_autoidle_all (); +return 0 ; }
@@ -539,6 +542,9 @@ int omap2_clk_disable_autoidle_all(void)list_for_each_entry (c, &clk_hw_omap_clocks, node)if (c->ops && c->ops->deny_idle) c->ops->deny_idle (c); + +of_omap_clk_deny_autoidle_all (); +return 0 ; }
drivers/clk/ti/Makefile +1 -1
@@ -1,3 +1,3 @@ ifneq ($(CONFIG_OF),) -obj-y += clk.o dpll.o +obj-y += clk.o dpll.o autoidle.o endif
drivers/clk/ti/autoidle.c new file +121 -0
121 lines not on this page · raw message
include/linux/clk/ti.h +7 -0
@@ -180,6 +180,13 @@ int omap3_dpll4_set_rate(struct clk_hw *clk, unsigned long rate, unsigned long parent_rate);void omap_dt_clocks_register (struct omap_dt_clk *oclks); +#ifdef CONFIG_OF +void of_omap_clk_allow_autoidle_all (void ); +void of_omap_clk_deny_autoidle_all (void ); +#else +static inline void of_omap_clk_allow_autoidle_all (void ) { } +static inline void of_omap_clk_deny_autoidle_all (void ) { } +#endif extern const struct clk_hw_omap_ops clkhwops_omap3_dpll;extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx;
Signature · 1 line
1.7.9.5
PATCH v6 4/45 CLK: TI: add support for OMAP gate clock
In reply to Tero KristoThis patch adds support for TI specific gate clocks. These behave as basic gate-clock, but have different ops / hw-ops for controlling the actual gate, for example waiting until the clock is ready. Several sub-types are supported:
- ti,gate-clock: basic gate clock with default ops/hwops
- ti,clkdm-gate-clock: clockdomain level gate control
- ti,dss-gate-clock: gate clock with DSS specific hardware handling
- ti,am35xx-gate-clock: gate clock with AM35xx specific hardware handling
- ti,hsdiv-gate-clock: gate clock with OMAP36xx hardware errata handling
--- .../devicetree/bindings/clock/ti/gate.txt | 73 ++++++++ arch/arm/mach-omap2/clock.h | 28 ---- drivers/clk/ti/Makefile | 2 +- drivers/clk/ti/gate.c | 174 ++++++++++++++++++++ include/linux/clk/ti.h | 35 ++++ 5 files changed, 283 insertions(+), 29 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/ti/gate.txt create mode 100644 drivers/clk/ti/gate.c
Documentation/devicetree/bindings/clock/ti/gate.txt new file +73 -0
@@ -0,0 +1,73 @@ +Binding for Texas Instruments gate clock. + +This binding uses the common clock binding[1]. This clock is +quite much similar to the basic gate-clock [2], however, +it supports a number of additional features. If no register +is provided for this clock, the code assumes that a clockdomain +will be controlled instead and the corresponding hw-ops for +that is used. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt +[2] Documentation/devicetree/bindings/clock/gate-clock.txt +[3] Documentation/devicetree/bindings/clock/ti/clockdomain.txt + +Required properties: +- compatible : shall be one of: + "ti,gate-clock" - basic gate clock + "ti,dss-gate-clock" - gate clock with DSS specific hardware handling + "ti,am35xx-gate-clock" - gate clock with AM35xx specific hardware handling + "ti,clkdm-gate-clock" - clockdomain gate clock, which derives its functional + clock directly from a clockdomain, see [3] how + to map clockdomains properly + "ti,hsdiv-gate-clock" - gate clock with OMAP36xx specific hardware handling, + required for a hardware errata +- #clock-cells : from common clock binding; shall be set to 0 +- clocks : link to phandle of parent clock +- reg : base address for register controlling adjustable gate, not needed for + ti,clkdm-gate-clock type +- ti,enable-bit : bit shift for programming the clock gate, not needed for + ti,clkdm-gate-clock type + +Optional properties: +- ti,set-bit-to-disable : inverts default gate programming. Setting the bit + gates the clock and clearing the bit ungates the clock. + +Examples: + mmchs2_fck: mmchs2_fck at 48004a00 { + #clock-cells = <0>; + compatible = "ti,gate-clock"; + clocks = <&core_96m_fck>; + reg = <0x48004a00 0x4>; + ti,enable-bit = <25>; + }; + + dss1_alwon_fck_3430es2: dss1_alwon_fck_3430es2 at 48004e00 { + #clock-cells = <0>; + compatible = "ti,dss-gate-clock"; + clocks = <&dpll4_m4x2_ck>; + reg = <0x48004e00 0x4>; + ti,enable-bit = <0>; + }; + + emac_ick: emac_ick at 4800259c { + #clock-cells = <0>; + compatible = "ti,am35xx-gate-clock"; + clocks = <&ipss_ick>; + reg = <0x4800259c 0x4>; + ti,enable-bit = <1>; + }; + + emu_src_ck: emu_src_ck { + #clock-cells = <0>; + compatible = "ti,clkdm-gate-clock"; + clocks = <&emu_src_mux_ck>; + }; + + dpll4_m2x2_ck: dpll4_m2x2_ck at 48004d00 { + #clock-cells = <0>; + compatible = "ti,hsdiv-gate-clock"; + clocks = <&dpll4_m2x2_mul_ck>; + ti,enable-bit = <0x1b>; + reg = <0x48004d00 0x4>; + ti,set-bit-to-disable; + };
arch/arm/mach-omap2/clock.h +0 -28
@@ -179,25 +179,6 @@ struct clksel {const struct clksel_rate *rates; }; -/* -* struct clk.flags possibilities -* -* XXX document the rest of the clock flags here -* -* CLOCK_CLKOUTX2: (OMAP4 only) DPLL CLKOUT and CLKOUTX2 GATE_CTRL -* bits share the same register. This flag allows the -* omap4_dpllmx*() code to determine which GATE_CTRL bit field -* should be used. This is a temporary solution - a better approach -* would be to associate clock type-specific data with the clock, -* similar to the struct dpll_data approach. -*/ -#define ENABLE_REG_32BIT (1 << 0)/* Use 32-bit access */ -#define CLOCK_IDLE_CONTROL (1 << 1) -#define CLOCK_NO_IDLE_PARENT (1 << 2) -#define ENABLE_ON_INIT (1 << 3)/* Enable upon framework init */ -#define INVERT_ENABLE (1 << 4)/* 0 enables, 1 disables */ -#define CLOCK_CLKOUTX2 (1 << 5) -struct clk_hw_omap_ops { void (*find_idlest)(struct clk_hw_omap *oclk, void __iomem **idlest_reg,
@@ -260,9 +241,6 @@ extern void omap2_clkt_iclk_deny_idle(struct clk_hw_omap *clk);unsigned long omap2_get_dpll_rate (struct clk_hw_omap *clk); -int omap2_dflt_clk_enable (struct clk_hw *hw); -void omap2_dflt_clk_disable (struct clk_hw *hw); -int omap2_dflt_clk_is_enabled (struct clk_hw *hw);void omap2_clk_dflt_find_companion (struct clk_hw_omap *clk,void __iomem **other_reg,u8 *other_bit);
@@ -292,15 +270,12 @@ extern const struct clksel_rate dsp_ick_rates[];extern struct clk dummy_ck;extern const struct clk_hw_omap_ops clkhwops_iclk_wait; -extern const struct clk_hw_omap_ops clkhwops_wait;extern const struct clk_hw_omap_ops clkhwops_iclk;extern const struct clk_hw_omap_ops clkhwops_omap3430es2_ssi_wait;extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_ssi_wait; -extern const struct clk_hw_omap_ops clkhwops_omap3430es2_dss_usbhost_wait;extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_dss_usbhost_wait;extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_hsotgusb_wait;extern const struct clk_hw_omap_ops clkhwops_omap3430es2_hsotgusb_wait; -extern const struct clk_hw_omap_ops clkhwops_am35xx_ipss_module_wait;extern const struct clk_hw_omap_ops clkhwops_am35xx_ipss_wait;extern const struct clk_hw_omap_ops clkhwops_apll54;extern const struct clk_hw_omap_ops clkhwops_apll96;
@@ -318,8 +293,5 @@ extern const struct clksel_rate div31_1to31_rates[];extern int am33xx_clk_init (void ); -extern int omap2_clkops_enable_clkdm (struct clk_hw *hw); -extern void omap2_clkops_disable_clkdm (struct clk_hw *hw); -extern void omap_clocks_register (struct omap_clk *oclks,int cnt);#endif
drivers/clk/ti/Makefile +1 -1
@@ -1,3 +1,3 @@ ifneq ($(CONFIG_OF),) -obj-y += clk.o dpll.o autoidle.o +obj-y += clk.o dpll.o autoidle.o gate.o endif
drivers/clk/ti/gate.c new file +174 -0
174 lines not on this page · raw message
include/linux/clk/ti.h +35 -0
@@ -132,6 +132,33 @@ struct clk_hw_omap {const struct clk_hw_omap_ops *ops; }; +/* +* struct clk_hw_omap.flags possibilities +* +* XXX document the rest of the clock flags here +* +* ENABLE_REG_32BIT: (OMAP1 only) clock control register must be accessed +* with 32bit ops, by default OMAP1 uses 16bit ops. +* CLOCK_IDLE_CONTROL: (OMAP1 only) clock has autoidle support. +* CLOCK_NO_IDLE_PARENT: (OMAP1 only) when clock is enabled, its parent +* clock is put to no-idle mode. +* ENABLE_ON_INIT: Clock is enabled on init. +* INVERT_ENABLE: By default, clock enable bit behavior is '1' enable, '0' +* disable. This inverts the behavior making '0' enable and '1' disable. +* CLOCK_CLKOUTX2: (OMAP4 only) DPLL CLKOUT and CLKOUTX2 GATE_CTRL +* bits share the same register. This flag allows the +* omap4_dpllmx*() code to determine which GATE_CTRL bit field +* should be used. This is a temporary solution - a better approach +* would be to associate clock type-specific data with the clock, +* similar to the struct dpll_data approach. +*/ +#define ENABLE_REG_32BIT (1 << 0)/* Use 32-bit access */ +#define CLOCK_IDLE_CONTROL (1 << 1) +#define CLOCK_NO_IDLE_PARENT (1 << 2) +#define ENABLE_ON_INIT (1 << 3)/* Enable upon framework init */ +#define INVERT_ENABLE (1 << 4)/* 0 enables, 1 disables */ +#define CLOCK_CLKOUTX2 (1 << 5) +/* CM_CLKEN_PLL*.EN* bit values - not all are available for every DPLL */ #define DPLL_LOW_POWER_STOP 0x1#define DPLL_LOW_POWER_BYPASS 0x5
@@ -176,8 +203,13 @@ long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate,void omap2_init_clk_clkdm (struct clk_hw *clk);unsigned long omap3_clkoutx2_recalc (struct clk_hw *hw,unsigned long parent_rate); +int omap2_clkops_enable_clkdm (struct clk_hw *hw); +void omap2_clkops_disable_clkdm (struct clk_hw *hw);int omap3_dpll4_set_rate (struct clk_hw *clk,unsigned long rate,unsigned long parent_rate); +int omap2_dflt_clk_enable (struct clk_hw *hw); +void omap2_dflt_clk_disable (struct clk_hw *hw); +int omap2_dflt_clk_is_enabled (struct clk_hw *hw);void omap_dt_clocks_register (struct omap_dt_clk *oclks);#ifdef CONFIG_OF
@@ -190,5 +222,8 @@ static inline void of_omap_clk_deny_autoidle_all(void) { }extern const struct clk_hw_omap_ops clkhwops_omap3_dpll;extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx; +extern const struct clk_hw_omap_ops clkhwops_wait; +extern const struct clk_hw_omap_ops clkhwops_omap3430es2_dss_usbhost_wait; +extern const struct clk_hw_omap_ops clkhwops_am35xx_ipss_module_wait;#endif
Signature · 1 line
1.7.9.5
PATCH v6 5/45 CLK: TI: add support for clockdomain binding
In reply to Tero KristoSome OMAP clocks require knowledge about their parent clockdomain for book keeping purposes. This patch creates a new DT binding for TI clockdomains, which act as a collection of device clocks.
--- .../devicetree/bindings/clock/ti/clockdomain.txt | 19 ++++++++ arch/arm/mach-omap2/clock.h | 1 - drivers/clk/ti/Makefile | 3 +- drivers/clk/ti/clockdomain.c | 46 ++++++++++++++++++++ include/linux/clk/ti.h | 2 + 5 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/ti/clockdomain.txt create mode 100644 drivers/clk/ti/clockdomain.c
Documentation/devicetree/bindings/clock/ti/clockdomain.txt new file +19 -0
@@ -0,0 +1,19 @@ +Binding for Texas Instruments clockdomain. + +This binding uses the common clock binding[1]. Every clock on +TI SoC belongs to one clockdomain, but software only needs this +information for specific clocks which require their parent +clockdomain to be controlled when the clock is enabled/disabled. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt + +Required properties: +- compatible : shall be "ti,clockdomain" +- #clock-cells : from common clock binding; shall be set to 0. +- clocks : link phandles of clocks within this domain + +Examples: + dss_clkdm: dss_clkdm { + compatible = "ti,clockdomain"; + clocks = <&dss1_alwon_fck_3430es2>, <&dss_ick_3430es2>; + };
arch/arm/mach-omap2/clock.h +0 -1
@@ -38,7 +38,6 @@ struct omap_clk { }struct clockdomain ; -#define to_clk_hw_omap (_hw) container_of(_hw, struct clk_hw_omap, hw)#define DEFINE_STRUCT_CLK (_name, _parent_array_name, _clkops_name) \ static struct clk _name = { \
drivers/clk/ti/Makefile +2 -1
@@ -1,3 +1,4 @@ ifneq ($(CONFIG_OF),) -obj-y += clk.o dpll.o autoidle.o gate.o +obj-y += clk.o dpll.o autoidle.o gate.o \ + clockdomain.o endif
drivers/clk/ti/clockdomain.c new file +46 -0
46 lines not on this page · raw message
include/linux/clk/ti.h +2 -0
@@ -186,6 +186,8 @@ struct omap_dt_clk { .node_name = name, \ } +#define to_clk_hw_omap (_hw) container_of(_hw, struct clk_hw_omap, hw) +void omap2_init_clk_hw_omap_clocks (struct clk *clk);int omap3_noncore_dpll_enable (struct clk_hw *hw);void omap3_noncore_dpll_disable (struct clk_hw *hw);
Signature · 1 line
1.7.9.5
PATCH v6 6/45 ARM: dts: omap4 clock data
In reply to Tero KristoThis patch creates a unique node for each clock in the OMAP4 power, reset and clock manager (PRCM). OMAP443x and OMAP446x have slightly different clock tree which is taken into account in the data.
--- arch/arm/boot/dts/omap443x-clocks.dtsi | 17 + arch/arm/boot/dts/omap443x.dtsi | 20 + arch/arm/boot/dts/omap4460.dtsi | 20 + arch/arm/boot/dts/omap446x-clocks.dtsi | 27 + arch/arm/boot/dts/omap44xx-clocks.dtsi | 1639 ++++++++++++++++++++++++++++++++ 5 files changed, 1723 insertions(+) create mode 100644 arch/arm/boot/dts/omap443x-clocks.dtsi create mode 100644 arch/arm/boot/dts/omap446x-clocks.dtsi create mode 100644 arch/arm/boot/dts/omap44xx-clocks.dtsi
arch/arm/boot/dts/omap443x-clocks.dtsi new file +17 -0
@@ -0,0 +1,17 @@ +/* + * Device Tree Source for OMAP443x clock data + * + * Copyright (C) 2013 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +bandgap_fclk: bandgap_fclk at 4a307888 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a307888 0x4>; +};
arch/arm/boot/dts/omap443x.dtsi +20 -0
@@ -30,4 +30,24 @@ 0x4a00232C 0x4>; compatible = "ti,omap4430-bandgap"; }; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + /include/ "omap44xx-clocks.dtsi" + /include/ "omap443x-clocks.dtsi" + }; + + clockdomains { + l3_init_clkdm: l3_init_clkdm { + compatible = "ti,clockdomain"; + clocks = <&dpll_usb_ck>; + }; + + emu_sys_clkdm: emu_sys_clkdm { + compatible = "ti,clockdomain"; + clocks = <&trace_clk_div_ck>; + }; + }; };
arch/arm/boot/dts/omap4460.dtsi +20 -0
@@ -38,4 +38,24 @@ interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>; /* talert */ gpios = <&gpio3 22 0>; /* tshut */ }; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + /include/ "omap44xx-clocks.dtsi" + /include/ "omap446x-clocks.dtsi" + }; + + clockdomains { + l3_init_clkdm: l3_init_clkdm { + compatible = "ti,clockdomain"; + clocks = <&dpll_usb_ck>; + }; + + emu_sys_clkdm: emu_sys_clkdm { + compatible = "ti,clockdomain"; + clocks = <&trace_clk_div_ck>; + }; + }; };
arch/arm/boot/dts/omap446x-clocks.dtsi new file +27 -0
@@ -0,0 +1,27 @@ +/* + * Device Tree Source for OMAP446x clock data + * + * Copyright (C) 2013 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +div_ts_ck: div_ts_ck at 4a307888 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&l4_wkup_clk_mux_ck>; + bit-shift = <24>; + reg = <0x4a307888 0x4>; + table = < 8 0 >, < 16 1 >, < 32 2 >; + bit-mask = <0x3>; +}; + +bandgap_ts_fclk: bandgap_ts_fclk at 4a307888 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&div_ts_ck>; + bit-shift = <8>; + reg = <0x4a307888 0x4>; +};
arch/arm/boot/dts/omap44xx-clocks.dtsi new file +1639 -0
1,639 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v6 7/45 CLK: TI: add omap4 clock init file
In reply to Tero Kristoclk-44xx.c now contains the clock init functionality for omap4, including DT clock registration and adding of static clkdev entries.
--- arch/arm/mach-omap2/clock.h | 1 - drivers/clk/ti/clk-44xx.c | 303 +++++++++++++++++++++++++++++++++++++++++++ include/linux/clk/ti.h | 1 + 3 files changed, 304 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/ti/clk-44xx.c
arch/arm/mach-omap2/clock.h +0 -1
@@ -247,7 +247,6 @@ void omap2_clk_dflt_find_idlest(struct clk_hw_omap *clk,void __iomem **idlest_reg, u8 *idlest_bit, u8 *idlest_val);int omap2_clk_enable_autoidle_all (void ); -int omap2_clk_disable_autoidle_all (void );void omap2_clk_enable_init_clocks (const char **clk_names,u8 num_clocks);int omap2_clk_switch_mpurate_at_boot (const char *mpurate_ck_name); void omap2_clk_print_new_rates(const char *hfclkin_ck_name,
drivers/clk/ti/clk-44xx.c new file +303 -0
303 lines not on this page · raw message
include/linux/clk/ti.h +1 -0
@@ -207,6 +207,7 @@ unsigned long omap3_clkoutx2_recalc(struct clk_hw *hw, unsigned long parent_rate);int omap2_clkops_enable_clkdm (struct clk_hw *hw);void omap2_clkops_disable_clkdm (struct clk_hw *hw); +int omap2_clk_disable_autoidle_all (void );int omap3_dpll4_set_rate (struct clk_hw *clk,unsigned long rate,unsigned long parent_rate);int omap2_dflt_clk_enable (struct clk_hw *hw);
Signature · 1 line
1.7.9.5
PATCH v6 8/45 ARM: OMAP4: remove old clock data and link in new clock init code
In reply to Tero KristoOMAP4 clocks have now been moved to DT, thus remove the old data file and use the new init code under drivers/clk/omap/clk-44xx.c.
--- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/cclock44xx_data.c | 1730 --------------------------------- drivers/clk/ti/Makefile | 2 +- 3 files changed, 2 insertions(+), 1732 deletions(-) delete mode 100644 arch/arm/mach-omap2/cclock44xx_data.c
arch/arm/mach-omap2/Makefile +1 -1
@@ -184,7 +184,7 @@ obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o clkt34xx_dpll3m2.o obj-$(CONFIG_ARCH_OMAP3) += clock3517.o clock36xx.o obj-$(CONFIG_ARCH_OMAP3) += dpll3xxx.o cclock3xxx_data.o obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o -obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) cclock44xx_data.o +obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o obj-$(CONFIG_SOC_AM33XX) += $(clock-common) dpll3xxx.o obj-$(CONFIG_SOC_AM33XX) += cclock33xx_data.o
arch/arm/mach-omap2/cclock44xx_data.c deleted +0 -1730
1,730 lines not on this page · raw message
drivers/clk/ti/Makefile +1 -1
@@ -1,4 +1,4 @@ ifneq ($(CONFIG_OF),) obj-y += clk.o dpll.o autoidle.o gate.o \ - clockdomain.o + clockdomain.o clk-44xx.o endif
Signature · 1 line
1.7.9.5
PATCH v6 9/45 ARM: dts: omap5 clock data
In reply to Tero KristoThis patch creates a unique node for each clock in the OMAP5 power, reset and clock manager (PRCM).
--- arch/arm/boot/dts/omap5.dtsi | 14 + arch/arm/boot/dts/omap54xx-clocks.dtsi | 1400 ++++++++++++++++++++++++++++++++ 2 files changed, 1414 insertions(+) create mode 100644 arch/arm/boot/dts/omap54xx-clocks.dtsi
arch/arm/boot/dts/omap5.dtsi +14 -0
@@ -713,4 +713,18 @@ compatible = "ti,omap5430-bandgap"; }; }; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + /include/ "omap54xx-clocks.dtsi" + }; + + clockdomains { + l3init_clkdm: l3init_clkdm { + compatible = "ti,clockdomain"; + clocks = <&dpll_usb_ck>; + }; + }; };
arch/arm/boot/dts/omap54xx-clocks.dtsi new file +1400 -0
1,400 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v6 10/45 CLK: TI: add omap5 clock init file
In reply to Tero Kristoclk-54xx.c now contains the clock init functionality for omap5, including DT clock registration and adding of static clkdev entries.
--- arch/arm/mach-omap2/io.c | 1 + drivers/clk/ti/Makefile | 3 +- drivers/clk/ti/clk-54xx.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/clk/ti.h | 2 + 4 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/ti/clk-54xx.c
arch/arm/mach-omap2/io.c +1 -0
@@ -650,6 +650,7 @@ void __init omap5_init_early(void)omap54xx_clockdomains_init ();omap54xx_hwmod_init ();omap_hwmod_init_postsetup (); + omap_clk_init = omap5xxx_clk_init; }#endif
drivers/clk/ti/Makefile +2 -1
@@ -1,4 +1,5 @@ ifneq ($(CONFIG_OF),) obj-y += clk.o dpll.o autoidle.o gate.o \ - clockdomain.o clk-44xx.o + clockdomain.o clk-44xx.o \ + clk-54xx.o endif
drivers/clk/ti/clk-54xx.c new file +215 -0
215 lines not on this page · raw message
include/linux/clk/ti.h +2 -0
@@ -223,6 +223,8 @@ static inline void of_omap_clk_allow_autoidle_all(void) { }static inline void of_omap_clk_deny_autoidle_all (void ) { }#endif +int omap5xxx_clk_init (void ); +extern const struct clk_hw_omap_ops clkhwops_omap3_dpll;extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx;extern const struct clk_hw_omap_ops clkhwops_wait;
Signature · 1 line
1.7.9.5
PATCH v6 11/45 CLK: TI: omap5: Initialize USB_DPLL at boot
In reply to Tero KristoFrom: Roger Quadros <[email protected]>
USB_DPLL must be initialized and locked at boot so that USB modules can work.
--- drivers/clk/ti/clk-54xx.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/clk/ti/clk-54xx.c +17 -1
@@ -19,6 +19,12 @@#define OMAP5_DPLL_ABE_DEFFREQ 98304000 +/* +* OMAP543x TRM, section "3.6.3.9.5 DPLL_USB Preferred Settings" +* states it must be at 960MHz +*/ +#define OMAP5_DPLL_USB_DEFFREQ 960000000 +static struct omap_dt_clk omap54xx_clks[] = {DT_CLK (NULL ,"pad_clks_src_ck" ,"pad_clks_src_ck" ),DT_CLK (NULL ,"pad_clks_ck" ,"pad_clks_ck" ),
@@ -194,7 +200,7 @@ static struct omap_dt_clk omap54xx_clks[] = {int __init omap5xxx_clk_init (void ) {int rc; -struct clk *abe_dpll_ref, *abe_dpll, *sys_32k_ck; +struct clk *abe_dpll_ref, *abe_dpll, *sys_32k_ck, *usb_dpll;of_clk_init (NULL );
@@ -211,5 +217,15 @@ int __init omap5xxx_clk_init(void)if (rc)pr_err ("%s: failed to configure ABE DPLL!\n" , __func__); + usb_dpll =clk_get_sys (NULL ,"dpll_usb_ck" ); + rc =clk_set_rate (usb_dpll,OMAP5_DPLL_USB_DEFFREQ ); +if (rc) +pr_err ("%s: failed to configure USB DPLL!\n" , __func__); + + usb_dpll =clk_get_sys (NULL ,"dpll_usb_m2_ck" ); + rc =clk_set_rate (usb_dpll,OMAP5_DPLL_USB_DEFFREQ /2 ); +if (rc) +pr_err ("%s: failed to set USB_DPLL M2 OUT\n" , __func__); +return 0 ; }
Signature · 1 line
1.7.9.5
PATCH v6 12/45 ARM: dts: dra7 clock data
In reply to Tero KristoThis patch creates a unique node for each clock in the DRA7 power, reset and clock manager (PRCM).
TODO: apll_pcie clock node is still a dummy in this version, and proper support for the APLL should be added.
--- arch/arm/boot/dts/dra7xx-clocks.dtsi | 2058 ++++++++++++++++++++++++++++++++++ 1 file changed, 2058 insertions(+) create mode 100644 arch/arm/boot/dts/dra7xx-clocks.dtsi
arch/arm/boot/dts/dra7xx-clocks.dtsi new file +2058 -0
@@ -0,0 +1,2058 @@ +/* + * Device Tree Source for DRA7xx clock data + * + * Copyright (C) 2013 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +atl_clkin0_ck: atl_clkin0_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +atl_clkin1_ck: atl_clkin1_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +atl_clkin2_ck: atl_clkin2_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +atlclkin3_ck: atlclkin3_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +hdmi_clkin_ck: hdmi_clkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +mlb_clkin_ck: mlb_clkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +mlbp_clkin_ck: mlbp_clkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +pciesref_acs_clk_ck: pciesref_acs_clk_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <100000000>; +}; + +ref_clkin0_ck: ref_clkin0_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +ref_clkin1_ck: ref_clkin1_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +ref_clkin2_ck: ref_clkin2_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +ref_clkin3_ck: ref_clkin3_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +rmii_clk_ck: rmii_clk_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +sdvenc_clkin_ck: sdvenc_clkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +secure_32k_clk_src_ck: secure_32k_clk_src_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; +}; + +sys_32k_ck: sys_32k_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; +}; + +virt_12000000_ck: virt_12000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <12000000>; +}; + +virt_13000000_ck: virt_13000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <13000000>; +}; + +virt_16800000_ck: virt_16800000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <16800000>; +}; + +virt_19200000_ck: virt_19200000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <19200000>; +}; + +virt_20000000_ck: virt_20000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <20000000>; +}; + +virt_26000000_ck: virt_26000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <26000000>; +}; + +virt_27000000_ck: virt_27000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <27000000>; +}; + +virt_38400000_ck: virt_38400000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <38400000>; +}; + +sys_clkin1: sys_clkin1 at 4ae06110 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&virt_12000000_ck>, <&virt_20000000_ck>, <&virt_16800000_ck>, <&virt_19200000_ck>, <&virt_26000000_ck>, <&virt_27000000_ck>, <&virt_38400000_ck>; + reg = <0x4ae06110 0x4>; + bit-mask = <0x7>; + index-starts-at-one; +}; + +sys_clkin2: sys_clkin2 { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <22579200>; +}; + +usb_otg_clkin_ck: usb_otg_clkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +video1_clkin_ck: video1_clkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +video1_m2_clkin_ck: video1_m2_clkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +video2_clkin_ck: video2_clkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +video2_m2_clkin_ck: video2_m2_clkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <0>; +}; + +abe_dpll_sys_clk_mux: abe_dpll_sys_clk_mux at 4ae06118 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clkin1>, <&sys_clkin2>; + reg = <0x4ae06118 0x4>; + bit-mask = <0x1>; +}; + +abe_dpll_bypass_clk_mux: abe_dpll_bypass_clk_mux at 4ae06114 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_dpll_sys_clk_mux>, <&sys_32k_ck>; + reg = <0x4ae06114 0x4>; + bit-mask = <0x1>; +}; + +abe_dpll_clk_mux: abe_dpll_clk_mux at 4ae0610c { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_dpll_sys_clk_mux>, <&sys_32k_ck>; + reg = <0x4ae0610c 0x4>; + bit-mask = <0x1>; +}; + +dpll_abe_ck: dpll_abe_ck at 4a0051e0 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-m4xen-clock"; + clocks = <&abe_dpll_clk_mux>, <&abe_dpll_bypass_clk_mux>; + reg = <0x4a0051e0 0x4>, <0x4a0051e4 0x4>, <0x4a0051e8 0x4>, <0x4a0051ec 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_abe_x2_ck: dpll_abe_x2_ck { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-x2-clock"; + clocks = <&dpll_abe_ck>; +}; + +dpll_abe_m2x2_ck: dpll_abe_m2x2_ck at 4a0051f0 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_abe_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0051f0 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +abe_24m_fclk: abe_24m_fclk at 4ae0611c { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_abe_m2x2_ck>; + reg = <0x4ae0611c 0x4>; + table = < 8 0 >, < 16 1 >; + bit-mask = <0x1>; +}; + +abe_clk: abe_clk at 4a005108 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_abe_m2x2_ck>; + reg = <0x4a005108 0x4>; + bit-mask = <0x3>; + index-power-of-two; +}; + +aess_fclk: aess_fclk at 4ae06178 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&abe_clk>; + reg = <0x4ae06178 0x4>; + bit-mask = <0x1>; +}; + +abe_giclk_div: abe_giclk_div at 4ae06174 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&aess_fclk>; + reg = <0x4ae06174 0x4>; + bit-mask = <0x1>; +}; + +abe_lp_clk_div: abe_lp_clk_div at 4ae061d8 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_abe_m2x2_ck>; + reg = <0x4ae061d8 0x4>; + table = < 16 0 >, < 32 1 >; + bit-mask = <0x1>; +}; + +abe_sys_clk_div: abe_sys_clk_div at 4ae06120 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&sys_clkin1>; + reg = <0x4ae06120 0x4>; + bit-mask = <0x1>; +}; + +adc_gfclk_mux: adc_gfclk_mux at 4ae061dc { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clkin1>, <&sys_clkin2>, <&sys_32k_ck>; + reg = <0x4ae061dc 0x4>; + bit-mask = <0x7>; +}; + +dpll_pcie_ref_ck: dpll_pcie_ref_ck at 4a008200 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin1>, <&sys_clkin1>; + reg = <0x4a008200 0x4>, <0x4a008204 0x4>, <0x4a008208 0x4>, <0x4a00820c 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_pcie_ref_m2ldo_ck: dpll_pcie_ref_m2ldo_ck at 4a008210 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_pcie_ref_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a008210 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +apll_pcie_ck: apll_pcie_ck at 4a008200 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&dpll_pcie_ref_ck>, <&dpll_pcie_ref_ck>; + reg = <0x4a008200 0x4>, <0x4a008204 0x4>, <0x4a008208 0x4>, <0x4a00820c 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +apll_pcie_clkvcoldo: apll_pcie_clkvcoldo { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&apll_pcie_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +apll_pcie_clkvcoldo_div: apll_pcie_clkvcoldo_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&apll_pcie_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +apll_pcie_m2_ck: apll_pcie_m2_ck at 4a008224 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&apll_pcie_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a008224 0x4>; + bit-mask = <0x7f>; + index-starts-at-one; + ti,autoidle-low; +}; + +sys_clk1_dclk_div: sys_clk1_dclk_div at 4ae061c8 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&sys_clkin1>; + reg = <0x4ae061c8 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +sys_clk2_dclk_div: sys_clk2_dclk_div at 4ae061cc { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&sys_clkin2>; + reg = <0x4ae061cc 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +dpll_abe_m2_ck: dpll_abe_m2_ck at 4a0051f0 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_abe_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0051f0 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +per_abe_x1_dclk_div: per_abe_x1_dclk_div at 4ae061bc { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_abe_m2_ck>; + reg = <0x4ae061bc 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +dpll_abe_m3x2_ck: dpll_abe_m3x2_ck at 4a0051f4 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_abe_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0051f4 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_core_ck: dpll_core_ck at 4a005120 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-core-clock"; + clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>; + reg = <0x4a005120 0x4>, <0x4a005124 0x4>, <0x4a005128 0x4>, <0x4a00512c 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_core_x2_ck: dpll_core_x2_ck { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-x2-clock"; + clocks = <&dpll_core_ck>; +}; + +dpll_core_h12x2_ck: dpll_core_h12x2_ck at 4a00513c { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a00513c 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +mpu_dpll_hs_clk_div: mpu_dpll_hs_clk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_h12x2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dpll_mpu_ck: dpll_mpu_ck at 4a005160 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin1>, <&mpu_dpll_hs_clk_div>; + reg = <0x4a005160 0x4>, <0x4a005164 0x4>, <0x4a005168 0x4>, <0x4a00516c 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_mpu_m2_ck: dpll_mpu_m2_ck at 4a005170 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_mpu_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005170 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +mpu_dclk_div: mpu_dclk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_mpu_m2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dsp_dpll_hs_clk_div: dsp_dpll_hs_clk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_h12x2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dpll_dsp_ck: dpll_dsp_ck at 4a005234 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin1>, <&dsp_dpll_hs_clk_div>; + reg = <0x4a005234 0x4>, <0x4a005238 0x4>, <0x4a00523c 0x4>, <0x4a005240 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_dsp_m2_ck: dpll_dsp_m2_ck at 4a005244 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_dsp_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005244 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dsp_gclk_div: dsp_gclk_div at 4ae0618c { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_dsp_m2_ck>; + reg = <0x4ae0618c 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +iva_dpll_hs_clk_div: iva_dpll_hs_clk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_h12x2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dpll_iva_ck: dpll_iva_ck at 4a0051a0 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin1>, <&iva_dpll_hs_clk_div>; + reg = <0x4a0051a0 0x4>, <0x4a0051a4 0x4>, <0x4a0051a8 0x4>, <0x4a0051ac 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_iva_m2_ck: dpll_iva_m2_ck at 4a0051b0 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_iva_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0051b0 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +iva_dclk: iva_dclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_iva_m2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dpll_gpu_ck: dpll_gpu_ck at 4a0052d8 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>; + reg = <0x4a0052d8 0x4>, <0x4a0052dc 0x4>, <0x4a0052e0 0x4>, <0x4a0052e4 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_gpu_m2_ck: dpll_gpu_m2_ck at 4a0052e8 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_gpu_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0052e8 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +gpu_dclk: gpu_dclk at 4ae061a0 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_gpu_m2_ck>; + reg = <0x4ae061a0 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +dpll_core_m2_ck: dpll_core_m2_ck at 4a005130 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005130 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +core_dpll_out_dclk_div: core_dpll_out_dclk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dpll_ddr_ck: dpll_ddr_ck at 4a005210 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>; + reg = <0x4a005210 0x4>, <0x4a005214 0x4>, <0x4a005218 0x4>, <0x4a00521c 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_ddr_m2_ck: dpll_ddr_m2_ck at 4a005220 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_ddr_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005220 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +emif_phy_dclk_div: emif_phy_dclk_div at 4ae06190 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_ddr_m2_ck>; + reg = <0x4ae06190 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +dpll_gmac_ck: dpll_gmac_ck at 4a0052a8 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin1>, <&dpll_abe_m3x2_ck>; + reg = <0x4a0052a8 0x4>, <0x4a0052ac 0x4>, <0x4a0052b0 0x4>, <0x4a0052b4 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_gmac_m2_ck: dpll_gmac_m2_ck at 4a0052b8 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_gmac_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0052b8 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +gmac_250m_dclk_div: gmac_250m_dclk_div at 4ae0619c { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_gmac_m2_ck>; + reg = <0x4ae0619c 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +video2_dclk_div: video2_dclk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&video2_m2_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +video1_dclk_div: video1_dclk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&video1_m2_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +hdmi_dclk_div: hdmi_dclk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&hdmi_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +per_dpll_hs_clk_div: per_dpll_hs_clk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_abe_m3x2_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +dpll_per_ck: dpll_per_ck at 4a008140 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin1>, <&per_dpll_hs_clk_div>; + reg = <0x4a008140 0x4>, <0x4a008144 0x4>, <0x4a008148 0x4>, <0x4a00814c 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_per_m2_ck: dpll_per_m2_ck at 4a008150 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_per_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a008150 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +func_96m_aon_dclk_div: func_96m_aon_dclk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +usb_dpll_hs_clk_div: usb_dpll_hs_clk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_abe_m3x2_ck>; + clock-mult = <1>; + clock-div = <3>; +}; + +dpll_usb_ck: dpll_usb_ck at 4a008180 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-j-type-clock"; + clocks = <&sys_clkin1>, <&usb_dpll_hs_clk_div>; + reg = <0x4a008180 0x4>, <0x4a008184 0x4>, <0x4a008188 0x4>, <0x4a00818c 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_usb_m2_ck: dpll_usb_m2_ck at 4a008190 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_usb_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a008190 0x4>; + bit-mask = <0x7f>; + index-starts-at-one; + ti,autoidle-low; +}; + +l3init_480m_dclk_div: l3init_480m_dclk_div at 4ae061ac { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_usb_m2_ck>; + reg = <0x4ae061ac 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +usb_otg_dclk_div: usb_otg_dclk_div at 4ae06184 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&usb_otg_clkin_ck>; + reg = <0x4ae06184 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +sata_dclk_div: sata_dclk_div at 4ae061c0 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&sys_clkin1>; + reg = <0x4ae061c0 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +dpll_pcie_ref_m2_ck: dpll_pcie_ref_m2_ck at 4a008210 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_pcie_ref_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a008210 0x4>; + bit-mask = <0x7f>; + index-starts-at-one; + ti,autoidle-low; +}; + +pcie2_dclk_div: pcie2_dclk_div at 4ae061b8 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_pcie_ref_m2_ck>; + reg = <0x4ae061b8 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +pcie_dclk_div: pcie_dclk_div at 4ae061b4 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&apll_pcie_m2_ck>; + reg = <0x4ae061b4 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +emu_dclk_div: emu_dclk_div at 4ae06194 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&sys_clkin1>; + reg = <0x4ae06194 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +secure_32k_dclk_div: secure_32k_dclk_div at 4ae061c4 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&secure_32k_clk_src_ck>; + reg = <0x4ae061c4 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +eve_dpll_hs_clk_div: eve_dpll_hs_clk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_h12x2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dpll_eve_ck: dpll_eve_ck at 4a005284 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin1>, <&eve_dpll_hs_clk_div>; + reg = <0x4a005284 0x4>, <0x4a005288 0x4>, <0x4a00528c 0x4>, <0x4a005290 0x4>; + reg-names = "control", "idlest", "autoidle", "mult-div1"; +}; + +dpll_eve_m2_ck: dpll_eve_m2_ck at 4a005294 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_eve_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005294 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +eve_dclk_div: eve_dclk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_eve_m2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +clkoutmux0_clk_mux: clkoutmux0_clk_mux at 4ae06158 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clk1_dclk_div>, <&sys_clk2_dclk_div>, <&per_abe_x1_dclk_div>, <&mpu_dclk_div>, <&dsp_gclk_div>, <&iva_dclk>, <&gpu_dclk>, <&core_dpll_out_dclk_div>, <&emif_phy_dclk_div>, <&gmac_250m_dclk_div>, <&video2_dclk_div>, <&video1_dclk_div>, <&hdmi_dclk_div>, <&func_96m_aon_dclk_div>, <&l3init_480m_dclk_div>, <&usb_otg_dclk_div>, <&sata_dclk_div>, <&pcie2_dclk_div>, <&pcie_dclk_div>, <&emu_dclk_div>, <&secure_32k_dclk_div>, <&eve_dclk_div>; + reg = <0x4ae06158 0x4>; + bit-mask = <0x1f>; +}; + +clkoutmux1_clk_mux: clkoutmux1_clk_mux at 4ae0615c { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clk1_dclk_div>, <&sys_clk2_dclk_div>, <&per_abe_x1_dclk_div>, <&mpu_dclk_div>, <&dsp_gclk_div>, <&iva_dclk>, <&gpu_dclk>, <&core_dpll_out_dclk_div>, <&emif_phy_dclk_div>, <&gmac_250m_dclk_div>, <&video2_dclk_div>, <&video1_dclk_div>, <&hdmi_dclk_div>, <&func_96m_aon_dclk_div>, <&l3init_480m_dclk_div>, <&usb_otg_dclk_div>, <&sata_dclk_div>, <&pcie2_dclk_div>, <&pcie_dclk_div>, <&emu_dclk_div>, <&secure_32k_dclk_div>, <&eve_dclk_div>; + reg = <0x4ae0615c 0x4>; + bit-mask = <0x1f>; +}; + +clkoutmux2_clk_mux: clkoutmux2_clk_mux at 4ae06160 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clk1_dclk_div>, <&sys_clk2_dclk_div>, <&per_abe_x1_dclk_div>, <&mpu_dclk_div>, <&dsp_gclk_div>, <&iva_dclk>, <&gpu_dclk>, <&core_dpll_out_dclk_div>, <&emif_phy_dclk_div>, <&gmac_250m_dclk_div>, <&video2_dclk_div>, <&video1_dclk_div>, <&hdmi_dclk_div>, <&func_96m_aon_dclk_div>, <&l3init_480m_dclk_div>, <&usb_otg_dclk_div>, <&sata_dclk_div>, <&pcie2_dclk_div>, <&pcie_dclk_div>, <&emu_dclk_div>, <&secure_32k_dclk_div>, <&eve_dclk_div>; + reg = <0x4ae06160 0x4>; + bit-mask = <0x1f>; +}; + +custefuse_sys_gfclk_div: custefuse_sys_gfclk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin1>; + clock-mult = <1>; + clock-div = <2>; +}; + +dpll_core_h13x2_ck: dpll_core_h13x2_ck at 4a005140 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005140 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_core_h14x2_ck: dpll_core_h14x2_ck at 4a005144 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005144 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_core_h22x2_ck: dpll_core_h22x2_ck at 4a005154 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005154 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_core_h23x2_ck: dpll_core_h23x2_ck at 4a005158 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005158 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_core_h24x2_ck: dpll_core_h24x2_ck at 4a00515c { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a00515c 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_ddr_x2_ck: dpll_ddr_x2_ck { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-x2-clock"; + clocks = <&dpll_ddr_ck>; +}; + +dpll_ddr_h11x2_ck: dpll_ddr_h11x2_ck at 4a005228 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_ddr_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005228 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_dsp_x2_ck: dpll_dsp_x2_ck { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-x2-clock"; + clocks = <&dpll_dsp_ck>; +}; + +dpll_dsp_m3x2_ck: dpll_dsp_m3x2_ck at 4a005248 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_dsp_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a005248 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_gmac_x2_ck: dpll_gmac_x2_ck { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-x2-clock"; + clocks = <&dpll_gmac_ck>; +}; + +dpll_gmac_h11x2_ck: dpll_gmac_h11x2_ck at 4a0052c0 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_gmac_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0052c0 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_gmac_h12x2_ck: dpll_gmac_h12x2_ck at 4a0052c4 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_gmac_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0052c4 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_gmac_h13x2_ck: dpll_gmac_h13x2_ck at 4a0052c8 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_gmac_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0052c8 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_gmac_m3x2_ck: dpll_gmac_m3x2_ck at 4a0052bc { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_gmac_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0052bc 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_per_x2_ck: dpll_per_x2_ck { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-x2-clock"; + clocks = <&dpll_per_ck>; +}; + +dpll_per_h11x2_ck: dpll_per_h11x2_ck at 4a008158 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_per_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a008158 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_per_h12x2_ck: dpll_per_h12x2_ck at 4a00815c { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_per_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a00815c 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_per_h13x2_ck: dpll_per_h13x2_ck at 4a008160 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_per_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a008160 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_per_h14x2_ck: dpll_per_h14x2_ck at 4a008164 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_per_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a008164 0x4>; + bit-mask = <0x3f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_per_m2x2_ck: dpll_per_m2x2_ck at 4a008150 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_per_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a008150 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_usb_clkdcoldo: dpll_usb_clkdcoldo { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_usb_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +eve_clk: eve_clk at 4ae06180 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&dpll_eve_m2_ck>, <&dpll_dsp_m3x2_ck>; + reg = <0x4ae06180 0x4>; + bit-mask = <0x1>; +}; + +func_128m_clk: func_128m_clk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_h11x2_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +func_12m_fclk: func_12m_fclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2x2_ck>; + clock-mult = <1>; + clock-div = <16>; +}; + +func_24m_clk: func_24m_clk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <4>; +}; + +func_48m_fclk: func_48m_fclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2x2_ck>; + clock-mult = <1>; + clock-div = <4>; +}; + +func_96m_fclk: func_96m_fclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2x2_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +gmii_m_clk_div: gmii_m_clk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_gmac_h11x2_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +hdmi_clk2_div: hdmi_clk2_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&hdmi_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +hdmi_div_clk: hdmi_div_clk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&hdmi_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +hdmi_dpll_clk_mux: hdmi_dpll_clk_mux at 4ae061a4 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clkin1>, <&sys_clkin2>; + reg = <0x4ae061a4 0x4>; + bit-mask = <0x7>; +}; + +l3_iclk_div: l3_iclk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_h12x2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +l3init_60m_fclk: l3init_60m_fclk at 4a008104 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_usb_m2_ck>; + reg = <0x4a008104 0x4>; + table = < 1 0 >, < 8 1 >; + bit-mask = <0x1>; +}; + +l4_root_clk_div: l4_root_clk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&l3_iclk_div>; + clock-mult = <1>; + clock-div = <1>; +}; + +mlb_clk: mlb_clk at 4ae06134 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&mlb_clkin_ck>; + reg = <0x4ae06134 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +mlbp_clk: mlbp_clk at 4ae06130 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&mlbp_clkin_ck>; + reg = <0x4ae06130 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +per_abe_x1_gfclk2_div: per_abe_x1_gfclk2_div at 4ae06138 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_abe_m2_ck>; + reg = <0x4ae06138 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +timer_sys_clk_div: timer_sys_clk_div at 4ae06144 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&sys_clkin1>; + reg = <0x4ae06144 0x4>; + bit-mask = <0x1>; +}; + +video1_clk2_div: video1_clk2_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&video1_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +video1_div_clk: video1_div_clk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&video1_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +video1_dpll_clk_mux: video1_dpll_clk_mux at 4ae061d0 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clkin1>, <&sys_clkin2>; + reg = <0x4ae061d0 0x4>; + bit-mask = <0x7>; +}; + +video2_clk2_div: video2_clk2_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&video2_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +video2_div_clk: video2_div_clk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&video2_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +video2_dpll_clk_mux: video2_dpll_clk_mux at 4ae061d4 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clkin1>, <&sys_clkin2>; + reg = <0x4ae061d4 0x4>; + bit-mask = <0x7>; +}; + +wkupaon_iclk_mux: wkupaon_iclk_mux at 4ae06108 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clkin1>, <&abe_lp_clk_div>; + reg = <0x4ae06108 0x4>; + bit-mask = <0x1>; +}; + +dss_32khz_clk: dss_32khz_clk at 4a009120 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <11>; + reg = <0x4a009120 0x4>; +}; + +dss_48mhz_clk: dss_48mhz_clk at 4a009120 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&func_48m_fclk>; + bit-shift = <9>; + reg = <0x4a009120 0x4>; +}; + +dss_dss_clk: dss_dss_clk at 4a009120 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&dpll_per_h12x2_ck>; + bit-shift = <8>; + reg = <0x4a009120 0x4>; +}; + +dss_hdmi_clk: dss_hdmi_clk at 4a009120 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&hdmi_dpll_clk_mux>; + bit-shift = <10>; + reg = <0x4a009120 0x4>; +}; + +dss_video1_clk: dss_video1_clk at 4a009120 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&video1_dpll_clk_mux>; + bit-shift = <12>; + reg = <0x4a009120 0x4>; +}; + +dss_video2_clk: dss_video2_clk at 4a009120 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&video2_dpll_clk_mux>; + bit-shift = <13>; + reg = <0x4a009120 0x4>; +}; + +gpio1_dbclk: gpio1_dbclk at 4ae07838 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4ae07838 0x4>; +}; + +gpio2_dbclk: gpio2_dbclk at 4a009760 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009760 0x4>; +}; + +gpio3_dbclk: gpio3_dbclk at 4a009768 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009768 0x4>; +}; + +gpio4_dbclk: gpio4_dbclk at 4a009770 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009770 0x4>; +}; + +gpio5_dbclk: gpio5_dbclk at 4a009778 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009778 0x4>; +}; + +gpio6_dbclk: gpio6_dbclk at 4a009780 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009780 0x4>; +}; + +gpio7_dbclk: gpio7_dbclk at 4a009810 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009810 0x4>; +}; + +gpio8_dbclk: gpio8_dbclk at 4a009818 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009818 0x4>; +}; + +mmc1_clk32k: mmc1_clk32k at 4a009328 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009328 0x4>; +}; + +mmc2_clk32k: mmc2_clk32k at 4a009330 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009330 0x4>; +}; + +mmc3_clk32k: mmc3_clk32k at 4a009820 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009820 0x4>; +}; + +mmc4_clk32k: mmc4_clk32k at 4a009828 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a009828 0x4>; +}; + +sata_ref_clk: sata_ref_clk at 4a009388 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_clkin1>; + bit-shift = <8>; + reg = <0x4a009388 0x4>; +}; + +usb_otg_ss1_refclk960m: usb_otg_ss1_refclk960m at 4a0093f0 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&dpll_usb_clkdcoldo>; + bit-shift = <8>; + reg = <0x4a0093f0 0x4>; +}; + +usb_otg_ss2_refclk960m: usb_otg_ss2_refclk960m at 4a009340 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&dpll_usb_clkdcoldo>; + bit-shift = <8>; + reg = <0x4a009340 0x4>; +}; + +usb_phy1_always_on_clk32k: usb_phy1_always_on_clk32k at 4a008640 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a008640 0x4>; +}; + +usb_phy2_always_on_clk32k: usb_phy2_always_on_clk32k at 4a008688 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a008688 0x4>; +}; + +usb_phy3_always_on_clk32k: usb_phy3_always_on_clk32k at 4a008698 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_32k_ck>; + bit-shift = <8>; + reg = <0x4a008698 0x4>; +}; + +atl_dpll_clk_mux: atl_dpll_clk_mux at 4a008c00 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_32k_ck>, <&video1_clkin_ck>, <&video2_clkin_ck>, <&hdmi_clkin_ck>; + bit-shift = <24>; + reg = <0x4a008c00 0x4>; + bit-mask = <0x3>; +}; + +atl_gfclk_mux: atl_gfclk_mux at 4a008c00 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&l3_iclk_div>, <&dpll_abe_m2_ck>, <&atl_dpll_clk_mux>; + bit-shift = <26>; + reg = <0x4a008c00 0x4>; + bit-mask = <0x3>; +}; + +dcan1_sys_clk_mux: dcan1_sys_clk_mux at 4ae07888 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clkin1>, <&sys_clkin2>; + bit-shift = <24>; + reg = <0x4ae07888 0x4>; + bit-mask = <0x1>; +}; + +gmac_gmii_ref_clk_div: gmac_gmii_ref_clk_div at 4a0093d0 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_gmac_m2_ck>; + bit-shift = <24>; + reg = <0x4a0093d0 0x4>; + table = < 2 0 >; + bit-mask = <0x1>; +}; + +gmac_rft_clk_mux: gmac_rft_clk_mux at 4a0093d0 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&video1_clkin_ck>, <&video2_clkin_ck>, <&dpll_abe_m2_ck>, <&hdmi_clkin_ck>, <&l3_iclk_div>; + bit-shift = <25>; + reg = <0x4a0093d0 0x4>; + bit-mask = <0x7>; +}; + +gpu_core_gclk_mux: gpu_core_gclk_mux at 4a009220 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&dpll_core_h14x2_ck>, <&dpll_per_h14x2_ck>, <&dpll_gpu_m2_ck>; + bit-shift = <24>; + reg = <0x4a009220 0x4>; + bit-mask = <0x3>; +}; + +gpu_hyd_gclk_mux: gpu_hyd_gclk_mux at 4a009220 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&dpll_core_h14x2_ck>, <&dpll_per_h14x2_ck>, <&dpll_gpu_m2_ck>; + bit-shift = <26>; + reg = <0x4a009220 0x4>; + bit-mask = <0x3>; +}; + +ipu1_gfclk_mux: ipu1_gfclk_mux at 4a005520 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&dpll_abe_m2x2_ck>, <&dpll_core_h22x2_ck>; + bit-shift = <24>; + reg = <0x4a005520 0x4>; + bit-mask = <0x1>; +}; + +l3instr_ts_gclk_div: l3instr_ts_gclk_div at 4a008e50 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&wkupaon_iclk_mux>; + bit-shift = <24>; + reg = <0x4a008e50 0x4>; + table = < 8 0 >, < 16 1 >, < 32 2 >; + bit-mask = <0x3>; +}; + +mcasp1_ahclkr_mux: mcasp1_ahclkr_mux at 4a005550 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; + bit-shift = <28>; + reg = <0x4a005550 0x4>; + bit-mask = <0xf>; +}; + +mcasp1_ahclkx_mux: mcasp1_ahclkx_mux at 4a005550 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; + bit-shift = <24>; + reg = <0x4a005550 0x4>; + bit-mask = <0xf>; +}; + +mcasp1_aux_gfclk_mux: mcasp1_aux_gfclk_mux at 4a005550 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>; + bit-shift = <22>; + reg = <0x4a005550 0x4>; + bit-mask = <0x3>; +}; + +mcasp2_ahclkr_mux: mcasp2_ahclkr_mux at 4a009860 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; + bit-shift = <28>; + reg = <0x4a009860 0x4>; + bit-mask = <0xf>; +}; + +mcasp2_ahclkx_mux: mcasp2_ahclkx_mux at 4a009860 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; + bit-shift = <28>; + reg = <0x4a009860 0x4>; + bit-mask = <0xf>; +}; + +mcasp2_aux_gfclk_mux: mcasp2_aux_gfclk_mux at 4a009860 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>; + bit-shift = <22>; + reg = <0x4a009860 0x4>; + bit-mask = <0x3>; +}; + +mcasp3_ahclkx_mux: mcasp3_ahclkx_mux at 4a009868 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; + bit-shift = <24>; + reg = <0x4a009868 0x4>; + bit-mask = <0xf>; +}; + +mcasp3_aux_gfclk_mux: mcasp3_aux_gfclk_mux at 4a009868 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>; + bit-shift = <22>; + reg = <0x4a009868 0x4>; + bit-mask = <0x3>; +}; + +mcasp4_ahclkx_mux: mcasp4_ahclkx_mux at 4a009898 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; + bit-shift = <24>; + reg = <0x4a009898 0x4>; + bit-mask = <0xf>; +}; + +mcasp4_aux_gfclk_mux: mcasp4_aux_gfclk_mux at 4a009898 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>; + bit-shift = <22>; + reg = <0x4a009898 0x4>; + bit-mask = <0x3>; +}; + +mcasp5_ahclkx_mux: mcasp5_ahclkx_mux at 4a009878 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; + bit-shift = <24>; + reg = <0x4a009878 0x4>; + bit-mask = <0xf>; +}; + +mcasp5_aux_gfclk_mux: mcasp5_aux_gfclk_mux at 4a009878 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>; + bit-shift = <22>; + reg = <0x4a009878 0x4>; + bit-mask = <0x3>; +}; + +mcasp6_ahclkx_mux: mcasp6_ahclkx_mux at 4a009904 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; + bit-shift = <24>; + reg = <0x4a009904 0x4>; + bit-mask = <0xf>; +}; + +mcasp6_aux_gfclk_mux: mcasp6_aux_gfclk_mux at 4a009904 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>; + bit-shift = <22>; + reg = <0x4a009904 0x4>; + bit-mask = <0x3>; +}; + +mcasp7_ahclkx_mux: mcasp7_ahclkx_mux at 4a009908 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; + bit-shift = <24>; + reg = <0x4a009908 0x4>; + bit-mask = <0xf>; +}; + +mcasp7_aux_gfclk_mux: mcasp7_aux_gfclk_mux at 4a009908 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>; + bit-shift = <22>; + reg = <0x4a009908 0x4>; + bit-mask = <0x3>; +}; + +mcasp8_ahclk_mux: mcasp8_ahclk_mux at 4a009890 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&abe_24m_fclk>, <&abe_sys_clk_div>, <&func_24m_clk>, <&atlclkin3_ck>, <&atl_clkin2_ck>, <&atl_clkin1_ck>, <&atl_clkin0_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&mlb_clk>, <&mlbp_clk>; + bit-shift = <22>; + reg = <0x4a009890 0x4>; + bit-mask = <0x3>; +}; + +mcasp8_aux_gfclk_mux: mcasp8_aux_gfclk_mux at 4a009890 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&per_abe_x1_gfclk2_div>, <&video1_clk2_div>, <&video2_clk2_div>, <&hdmi_clk2_div>; + bit-shift = <24>; + reg = <0x4a009890 0x4>; + bit-mask = <0xf>; +}; + +mmc1_fclk_mux: mmc1_fclk_mux at 4a009328 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_128m_clk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a009328 0x4>; + bit-mask = <0x1>; +}; + +mmc1_fclk_div: mmc1_fclk_div at 4a009328 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&mmc1_fclk_mux>; + bit-shift = <25>; + reg = <0x4a009328 0x4>; + bit-mask = <0x3>; + index-power-of-two; +}; + +mmc2_fclk_mux: mmc2_fclk_mux at 4a009330 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_128m_clk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a009330 0x4>; + bit-mask = <0x1>; +}; + +mmc2_fclk_div: mmc2_fclk_div at 4a009330 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&mmc2_fclk_mux>; + bit-shift = <25>; + reg = <0x4a009330 0x4>; + bit-mask = <0x3>; + index-power-of-two; +}; + +mmc3_gfclk_mux: mmc3_gfclk_mux at 4a009820 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a009820 0x4>; + bit-mask = <0x1>; +}; + +mmc3_gfclk_div: mmc3_gfclk_div at 4a009820 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&mmc3_gfclk_mux>; + bit-shift = <25>; + reg = <0x4a009820 0x4>; + bit-mask = <0x3>; + index-power-of-two; +}; + +mmc4_gfclk_mux: mmc4_gfclk_mux at 4a009828 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a009828 0x4>; + bit-mask = <0x1>; +}; + +mmc4_gfclk_div: mmc4_gfclk_div at 4a009828 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&mmc4_gfclk_mux>; + bit-shift = <25>; + reg = <0x4a009828 0x4>; + bit-mask = <0x3>; + index-power-of-two; +}; + +qspi_gfclk_mux: qspi_gfclk_mux at 4a009838 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_128m_clk>, <&dpll_per_h13x2_ck>; + bit-shift = <24>; + reg = <0x4a009838 0x4>; + bit-mask = <0x1>; +}; + +qspi_gfclk_div: qspi_gfclk_div at 4a009838 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&qspi_gfclk_mux>; + bit-shift = <25>; + reg = <0x4a009838 0x4>; + bit-mask = <0x3>; + index-power-of-two; +}; + +timer10_gfclk_mux: timer10_gfclk_mux at 4a009728 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4a009728 0x4>; + bit-mask = <0xf>; +}; + +timer11_gfclk_mux: timer11_gfclk_mux at 4a009730 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4a009730 0x4>; + bit-mask = <0xf>; +}; + +timer13_gfclk_mux: timer13_gfclk_mux at 4a0097c8 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4a0097c8 0x4>; + bit-mask = <0xf>; +}; + +timer14_gfclk_mux: timer14_gfclk_mux at 4a0097d0 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4a0097d0 0x4>; + bit-mask = <0xf>; +}; + +timer15_gfclk_mux: timer15_gfclk_mux at 4a0097d8 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4a0097d8 0x4>; + bit-mask = <0xf>; +}; + +timer16_gfclk_mux: timer16_gfclk_mux at 4a009830 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4a009830 0x4>; + bit-mask = <0xf>; +}; + +timer1_gfclk_mux: timer1_gfclk_mux at 4ae07840 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4ae07840 0x4>; + bit-mask = <0xf>; +}; + +timer2_gfclk_mux: timer2_gfclk_mux at 4a009738 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4a009738 0x4>; + bit-mask = <0xf>; +}; + +timer3_gfclk_mux: timer3_gfclk_mux at 4a009740 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4a009740 0x4>; + bit-mask = <0xf>; +}; + +timer4_gfclk_mux: timer4_gfclk_mux at 4a009748 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4a009748 0x4>; + bit-mask = <0xf>; +}; + +timer5_gfclk_mux: timer5_gfclk_mux at 4a005558 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>, <&clkoutmux0_clk_mux>; + bit-shift = <24>; + reg = <0x4a005558 0x4>; + bit-mask = <0xf>; +}; + +timer6_gfclk_mux: timer6_gfclk_mux at 4a005560 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>, <&clkoutmux0_clk_mux>; + bit-shift = <24>; + reg = <0x4a005560 0x4>; + bit-mask = <0xf>; +}; + +timer7_gfclk_mux: timer7_gfclk_mux at 4a005568 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>, <&clkoutmux0_clk_mux>; + bit-shift = <24>; + reg = <0x4a005568 0x4>; + bit-mask = <0xf>; +}; + +timer8_gfclk_mux: timer8_gfclk_mux at 4a005570 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>, <&clkoutmux0_clk_mux>; + bit-shift = <24>; + reg = <0x4a005570 0x4>; + bit-mask = <0xf>; +}; + +timer9_gfclk_mux: timer9_gfclk_mux at 4a009750 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&timer_sys_clk_div>, <&sys_32k_ck>, <&sys_clkin2>, <&ref_clkin0_ck>, <&ref_clkin1_ck>, <&ref_clkin2_ck>, <&ref_clkin3_ck>, <&abe_giclk_div>, <&video1_div_clk>, <&video2_div_clk>, <&hdmi_div_clk>; + bit-shift = <24>; + reg = <0x4a009750 0x4>; + bit-mask = <0xf>; +}; + +uart10_gfclk_mux: uart10_gfclk_mux at 4ae07880 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4ae07880 0x4>; + bit-mask = <0x1>; +}; + +uart1_gfclk_mux: uart1_gfclk_mux at 4a009840 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a009840 0x4>; + bit-mask = <0x1>; +}; + +uart2_gfclk_mux: uart2_gfclk_mux at 4a009848 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a009848 0x4>; + bit-mask = <0x1>; +}; + +uart3_gfclk_mux: uart3_gfclk_mux at 4a009850 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a009850 0x4>; + bit-mask = <0x1>; +}; + +uart4_gfclk_mux: uart4_gfclk_mux at 4a009858 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a009858 0x4>; + bit-mask = <0x1>; +}; + +uart5_gfclk_mux: uart5_gfclk_mux at 4a009870 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a009870 0x4>; + bit-mask = <0x1>; +}; + +uart6_gfclk_mux: uart6_gfclk_mux at 4a005580 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a005580 0x4>; + bit-mask = <0x1>; +}; + +uart7_gfclk_mux: uart7_gfclk_mux at 4a0098d0 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a0098d0 0x4>; + bit-mask = <0x1>; +}; + +uart8_gfclk_mux: uart8_gfclk_mux at 4a0098e0 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a0098e0 0x4>; + bit-mask = <0x1>; +}; + +uart9_gfclk_mux: uart9_gfclk_mux at 4a0098e8 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&func_48m_fclk>, <&dpll_per_m2x2_ck>; + bit-shift = <24>; + reg = <0x4a0098e8 0x4>; + bit-mask = <0x1>; +}; + +vip1_gclk_mux: vip1_gclk_mux at 4a009020 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&l3_iclk_div>, <&dpll_core_h23x2_ck>; + bit-shift = <24>; + reg = <0x4a009020 0x4>; + bit-mask = <0x1>; +}; + +vip2_gclk_mux: vip2_gclk_mux at 4a009028 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&l3_iclk_div>, <&dpll_core_h23x2_ck>; + bit-shift = <24>; + reg = <0x4a009028 0x4>; + bit-mask = <0x1>; +}; + +vip3_gclk_mux: vip3_gclk_mux at 4a009030 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&l3_iclk_div>, <&dpll_core_h23x2_ck>; + bit-shift = <24>; + reg = <0x4a009030 0x4>; + bit-mask = <0x1>; +};
Signature · 1 line
1.7.9.5
PATCH v6 13/45 ARM: dts: clk: Add apll related clocks
In reply to Tero KristoFrom: Keerthy <[email protected]>
The patch adds a mux node to choose the parent of apll_pcie_ck node.
--- arch/arm/boot/dts/dra7xx-clocks.dtsi | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
arch/arm/boot/dts/dra7xx-clocks.dtsi +12 -4
@@ -324,12 +324,20 @@ dpll_pcie_ref_m2ldo_ck: dpll_pcie_ref_m2ldo_ck at 4a008210 { ti,autoidle-low; }; +apll_pcie_in_clk_mux: apll_pcie_in_clk_mux at 4ae06118 { + compatible = "mux-clock"; + clocks = <&dpll_pcie_ref_ck>, <&pciesref_acs_clk_ck>; + #clock-cells = <0>; + reg = <0x4a00821c 0x4>; + bit-mask = <0x80>; +}; + apll_pcie_ck: apll_pcie_ck at 4a008200 { #clock-cells = <0>; - compatible = "ti,omap4-dpll-clock"; - clocks = <&dpll_pcie_ref_ck>, <&dpll_pcie_ref_ck>; - reg = <0x4a008200 0x4>, <0x4a008204 0x4>, <0x4a008208 0x4>, <0x4a00820c 0x4>; - reg-names = "control", "idlest", "autoidle", "mult-div1"; + compatible = "ti,dra7-apll-clock"; + clocks = <&apll_pcie_in_clk_mux>, <&dpll_pcie_ref_ck>; + reg = <0x4a00821c 0x4>, <0x4a008220 0x4>; + reg-names = "control", "idlest"; }; apll_pcie_clkvcoldo: apll_pcie_clkvcoldo {
Signature · 1 line
1.7.9.5
PATCH v6 14/45 ARM: dts: DRA7: Change apll_pcie_m2_ck to fixed factor clock
In reply to Tero KristoFrom: Keerthy <[email protected]>
This patch changes apll_pcie_m2_ck to fixed factor clock as there are no configurable divider associated to m2.
--- arch/arm/boot/dts/dra7xx-clocks.dtsi | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
arch/arm/boot/dts/dra7xx-clocks.dtsi +3 -6
@@ -358,13 +358,10 @@ apll_pcie_clkvcoldo_div: apll_pcie_clkvcoldo_div { apll_pcie_m2_ck: apll_pcie_m2_ck at 4a008224 { #clock-cells = <0>; - compatible = "ti,divider-clock"; + compatible = "fixed-factor-clock"; clocks = <&apll_pcie_ck>; - ti,autoidle-shift = <8>; - reg = <0x4a008224 0x4>; - bit-mask = <0x7f>; - index-starts-at-one; - ti,autoidle-low; + clock-mult = <1>; + clock-div = <1>; }; sys_clk1_dclk_div: sys_clk1_dclk_div at 4ae061c8 {
Signature · 1 line
1.7.9.5
PATCH v6 15/45 ARM: dts: DRA7: Add PCIe related clock nodes
In reply to Tero KristoFrom: Keerthy <[email protected]>
This patch adds optfclk_pciephy_clk and optfclk_pciephy_div_clk which are used by PCIe phy. It also adds a mux clock to choose the source of optfclk_pciephy_div_clk clock.
--- arch/arm/boot/dts/dra7xx-clocks.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
arch/arm/boot/dts/dra7xx-clocks.dtsi +24 -0
@@ -2061,3 +2061,27 @@ vip3_gclk_mux: vip3_gclk_mux at 4a009030 { reg = <0x4a009030 0x4>; bit-mask = <0x1>; }; + +optfclk_pciephy_div: optfclk_pciephy_div at 4a00821c { + compatible = "divider-clock"; + clocks = <&apll_pcie_ck>; + #clock-cells = <0>; + reg = <0x4a00821c 0x4>; + bit-mask = <0x100>; +}; + +optfclk_pciephy_clk: optfclk_pciephy_clk at 4a0093b0 { + compatible = "gate-clock"; + clocks = <&apll_pcie_ck>; + #clock-cells = <0>; + reg = <0x4a0093b0 0x4>; + bit-shift = <9>; +}; + +optfclk_pciephy_div_clk: optfclk_pciephy_div_clk at 4a0093b0 { + compatible = "gate-clock"; + clocks = <&optfclk_pciephy_div>; + #clock-cells = <0>; + reg = <0x4a0093b0 0x4>; + bit-shift = <10>; +};
Signature · 1 line
1.7.9.5
PATCH v6 16/45 CLK: TI: DRA7: Add APLL support
In reply to Tero KristoFrom: Keerthy <[email protected]>
The patch adds support for DRA7 PCIe APLL. The APLL sources the optional functional clocks for PCIe module.
APLL stands for Analog PLL. This is different when comapred with DPLL meaning Digital PLL, the phase detection is done using an analog circuit.
--- .../devicetree/bindings/clock/ti/apll.txt | 33 +++ drivers/clk/ti/Makefile | 2 +- drivers/clk/ti/apll.c | 212 ++++++++++++++++++++ 3 files changed, 246 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/clock/ti/apll.txt create mode 100644 drivers/clk/ti/apll.c
Documentation/devicetree/bindings/clock/ti/apll.txt new file +33 -0
@@ -0,0 +1,33 @@ +Binding for Texas Instruments APLL clock. + +This binding uses the common clock binding[1]. It assumes a +register-mapped APLL with usually two selectable input clocks +(reference clock and bypass clock), with analog phase locked +loop logic for multiplying the input clock to a desired output +clock. This clock also typically supports different operation +modes (locked, low power stop etc.) APLL mostly behaves like +a subtype of a DPLL [2], although a simplified one at that. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt +[2] Documentation/devicetree/bindings/clock/ti/dpll.txt + +Required properties: +- compatible : shall be "ti,dra7-apll-clock" +- #clock-cells : from common clock binding; shall be set to 0. +- clocks : link phandles of parent clocks (clk-ref and clk-bypass) +- reg : address and length of the register set for controlling the APLL. + It contains the information of registers in the same order as described by + reg-names. +- reg-names: array of the register names for controlling the device, sorted + in the same order as the reg property. + "control" - contains the control register base address + "idlest" - contains the idlest register base address + +Examples: + apll_pcie_ck: apll_pcie_ck at 4a008200 { + #clock-cells = <0>; + clocks = <&apll_pcie_in_clk_mux>, <&dpll_pcie_ref_ck>; + reg = <0x4a00821c 0x4>, <0x4a008220 0x4>; + reg-names = "control", "idlest"; + compatible = "ti,dra7-apll-clock"; + };
drivers/clk/ti/Makefile +1 -1
@@ -1,5 +1,5 @@ ifneq ($(CONFIG_OF),) obj-y += clk.o dpll.o autoidle.o gate.o \ - clockdomain.o clk-44xx.o \ + clockdomain.o apll.o clk-44xx.o \ clk-54xx.o endif
drivers/clk/ti/apll.c new file +212 -0
212 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v6 17/45 CLK: TI: add dra7 clock init file
In reply to Tero Kristoclk-7xx.c now contains the clock init functionality for dra7, including DT clock registration and adding of static clkdev entries.
--- drivers/clk/ti/Makefile | 2 +- drivers/clk/ti/clk-7xx.c | 308 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 309 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/ti/clk-7xx.c
drivers/clk/ti/Makefile +1 -1
@@ -1,5 +1,5 @@ ifneq ($(CONFIG_OF),) obj-y += clk.o dpll.o autoidle.o gate.o \ clockdomain.o apll.o clk-44xx.o \ - clk-54xx.o + clk-54xx.o clk-7xx.o endif
drivers/clk/ti/clk-7xx.c new file +308 -0
308 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v6 18/45 CLK: DT: add support for set-rate-parent flag
In reply to Tero KristoAdding set-rate-parent to clock node now allows a node to forward clk_set_rate request to its parent clock.
--- drivers/clk/clk-divider.c | 6 +++++- drivers/clk/clk-fixed-factor.c | 6 +++++- drivers/clk/clk-gate.c | 8 ++++++-- drivers/clk/clk-mux.c | 6 +++++- 4 files changed, 21 insertions(+), 5 deletions(-)
drivers/clk/clk-divider.c +5 -1
@@ -388,6 +388,7 @@ void of_divider_clk_setup(struct device_node *node)u32 mask =0 ;u32 shift =0 ;struct clk_div_table *table; +u32 flags =0 ;of_property_read_string (node,"clock-output-names" , &clk_name);
@@ -422,11 +423,14 @@ void of_divider_clk_setup(struct device_node *node)if (of_property_read_bool (node,"hiword-mask" )) clk_divider_flags |=CLK_DIVIDER_HIWORD_MASK ; +if (of_property_read_bool (node,"set-rate-parent" )) + flags |=CLK_SET_RATE_PARENT ; + table =of_clk_get_div_table (node);if (IS_ERR (table))return ; - clk =_register_divider (NULL , clk_name, parent_name,0 , reg, shift, + clk =_register_divider (NULL , clk_name, parent_name, flags, reg, shift, mask, clk_divider_flags, table,NULL );if (!IS_ERR (clk))
drivers/clk/clk-fixed-factor.c +5 -1
@@ -107,6 +107,7 @@ void __init of_fixed_factor_clk_setup(struct device_node *node)const char *clk_name = node->name;const char *parent_name;u32 div, mult; +u32 flags =0 ;if (of_property_read_u32 (node,"clock-div" , &div)) { pr_err("%s Fixed factor clock <%s> must have a clock-div property\n",
@@ -123,7 +124,10 @@ void __init of_fixed_factor_clk_setup(struct device_node *node)of_property_read_string (node,"clock-output-names" , &clk_name); parent_name =of_clk_get_parent_name (node,0 ); - clk =clk_register_fixed_factor (NULL , clk_name, parent_name,0 , +if (of_property_read_bool (node,"set-rate-parent" )) + flags |=CLK_SET_RATE_PARENT ; + + clk =clk_register_fixed_factor (NULL , clk_name, parent_name, flags, mult, div);if (!IS_ERR (clk))of_clk_add_provider (node, of_clk_src_simple_get, clk);
drivers/clk/clk-gate.c +6 -2
@@ -176,6 +176,7 @@ void of_gate_clk_setup(struct device_node *node)const char *parent_name;u8 clk_gate_flags =0 ;u32 bit_idx =0 ; +u32 flags =0 ;of_property_read_string (node,"clock-output-names" , &clk_name);
@@ -199,8 +200,11 @@ void of_gate_clk_setup(struct device_node *node)if (of_property_read_bool (node,"hiword-mask" )) clk_gate_flags |=CLK_GATE_HIWORD_MASK ; - clk =clk_register_gate (NULL , clk_name, parent_name,0 , reg, bit_idx, - clk_gate_flags,NULL ); +if (of_property_read_bool (node,"set-rate-parent" )) + flags |=CLK_SET_RATE_PARENT ; + + clk =clk_register_gate (NULL , clk_name, parent_name, flags, reg, + bit_idx, clk_gate_flags,NULL );if (!IS_ERR (clk))of_clk_add_provider (node, of_clk_src_simple_get, clk);
drivers/clk/clk-mux.c +5 -1
@@ -184,6 +184,7 @@ void of_mux_clk_setup(struct device_node *node)u8 clk_mux_flags =0 ;u32 mask =0 ;u32 shift =0 ; +u32 flags =0 ;of_property_read_string (node,"clock-output-names" , &clk_name);
@@ -223,8 +224,11 @@ void of_mux_clk_setup(struct device_node *node)if (of_property_read_bool (node,"hiword-mask" )) clk_mux_flags |=CLK_MUX_HIWORD_MASK ; +if (of_property_read_bool (node,"set-rate-parent" )) + flags |=CLK_SET_RATE_PARENT ; + clk =clk_register_mux_table (NULL , clk_name, parent_names, num_parents, -0 , reg, shift, mask, clk_mux_flags,NULL ,NULL ); + flags, reg, shift, mask, clk_mux_flags,NULL ,NULL );if (!IS_ERR (clk))of_clk_add_provider (node, of_clk_src_simple_get, clk);
Signature · 1 line
1.7.9.5
PATCH v6 19/45 ARM: dts: am33xx clock data
In reply to Tero KristoThis patch creates a unique node for each clock in the AM33xx power, reset and clock manager (PRCM).
--- arch/arm/boot/dts/am33xx-clocks.dtsi | 653 ++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/am33xx.dtsi | 7 + 2 files changed, 660 insertions(+) create mode 100644 arch/arm/boot/dts/am33xx-clocks.dtsi
arch/arm/boot/dts/am33xx-clocks.dtsi new file +653 -0
@@ -0,0 +1,653 @@ +/* + * Device Tree Source for AM33xx clock data + * + * Copyright (C) 2013 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +clk_32768_ck: clk_32768_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; +}; + +clk_rc32k_ck: clk_rc32k_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32000>; +}; + +virt_19200000_ck: virt_19200000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <19200000>; +}; + +virt_24000000_ck: virt_24000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; +}; + +virt_25000000_ck: virt_25000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <25000000>; +}; + +virt_26000000_ck: virt_26000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <26000000>; +}; + +sys_clkin_ck: sys_clkin_ck at 44e10040 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>; + bit-shift = <22>; + reg = <0x44e10040 0x4>; + bit-mask = <0x3>; +}; + +tclkin_ck: tclkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <12000000>; +}; + +dpll_core_ck: dpll_core_ck at 44e00490 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-core-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44e00490 0x4>, <0x44e0045c 0x4>, <0x44e00468 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_core_x2_ck: dpll_core_x2_ck { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-x2-clock"; + clocks = <&dpll_core_ck>; +}; + +dpll_core_m4_ck: dpll_core_m4_ck at 44e00480 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_core_x2_ck>; + reg = <0x44e00480 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; +}; + +dpll_core_m5_ck: dpll_core_m5_ck at 44e00484 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_core_x2_ck>; + reg = <0x44e00484 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; +}; + +dpll_core_m6_ck: dpll_core_m6_ck at 44e004d8 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_core_x2_ck>; + reg = <0x44e004d8 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; +}; + +dpll_mpu_ck: dpll_mpu_ck at 44e00488 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44e00488 0x4>, <0x44e00420 0x4>, <0x44e0042c 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_mpu_m2_ck: dpll_mpu_m2_ck at 44e004a8 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_mpu_ck>; + reg = <0x44e004a8 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; +}; + +dpll_ddr_ck: dpll_ddr_ck at 44e00494 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-no-gate-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44e00494 0x4>, <0x44e00434 0x4>, <0x44e00440 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_ddr_m2_ck: dpll_ddr_m2_ck at 44e004a0 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_ddr_ck>; + reg = <0x44e004a0 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; +}; + +dpll_ddr_m2_div2_ck: dpll_ddr_m2_div2_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_ddr_m2_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +dpll_disp_ck: dpll_disp_ck at 44e00498 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-no-gate-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44e00498 0x4>, <0x44e00448 0x4>, <0x44e00454 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_disp_m2_ck: dpll_disp_m2_ck at 44e004a4 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_disp_ck>; + reg = <0x44e004a4 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + set-rate-parent; +}; + +dpll_per_ck: dpll_per_ck at 44e0048c { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-no-gate-j-type-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44e0048c 0x4>, <0x44e00470 0x4>, <0x44e0049c 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_per_m2_ck: dpll_per_m2_ck at 44e004ac { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&dpll_per_ck>; + reg = <0x44e004ac 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; +}; + +dpll_per_m2_div4_wkupdm_ck: dpll_per_m2_div4_wkupdm_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <4>; +}; + +dpll_per_m2_div4_ck: dpll_per_m2_div4_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <4>; +}; + +adc_tsc_fck: adc_tsc_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +cefuse_fck: cefuse_fck at 44e00a20 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_clkin_ck>; + bit-shift = <1>; + reg = <0x44e00a20 0x4>; +}; + +clk_24mhz: clk_24mhz { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <8>; +}; + +clkdiv32k_ck: clkdiv32k_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&clk_24mhz>; + clock-mult = <1>; + clock-div = <732>; +}; + +clkdiv32k_ick: clkdiv32k_ick at 44e0014c { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkdiv32k_ck>; + reg = <0x44e0014c 0x4>; + bit-shift = <1>; +}; + +dcan0_fck: dcan0_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dcan1_fck: dcan1_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +l3_gclk: l3_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +pruss_ocp_gclk: pruss_ocp_gclk at 44e00530 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&l3_gclk>, <&dpll_disp_m2_ck>; + reg = <0x44e00530 0x4>; + bit-mask = <0x1>; +}; + +mcasp0_fck: mcasp0_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +mcasp1_fck: mcasp1_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +mmu_fck: mmu_fck at 44e00914 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&dpll_core_m4_ck>; + bit-shift = <1>; + reg = <0x44e00914 0x4>; +}; + +smartreflex0_fck: smartreflex0_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +smartreflex1_fck: smartreflex1_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +sha0_fck: sha0_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +aes0_fck: aes0_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +timer1_fck: timer1_fck at 44e00528 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clkin_ck>, <&clkdiv32k_ick>, <&tclkin_ck>, <&clk_rc32k_ck>, <&clk_32768_ck>; + reg = <0x44e00528 0x4>; + bit-mask = <0x7>; +}; + +timer2_fck: timer2_fck at 44e00508 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44e00508 0x4>; + bit-mask = <0x3>; +}; + +timer3_fck: timer3_fck at 44e0050c { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44e0050c 0x4>; + bit-mask = <0x3>; +}; + +timer4_fck: timer4_fck at 44e00510 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44e00510 0x4>; + bit-mask = <0x3>; +}; + +timer5_fck: timer5_fck at 44e00518 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44e00518 0x4>; + bit-mask = <0x3>; +}; + +timer6_fck: timer6_fck at 44e0051c { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44e0051c 0x4>; + bit-mask = <0x3>; +}; + +timer7_fck: timer7_fck at 44e00504 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44e00504 0x4>; + bit-mask = <0x3>; +}; + +usbotg_fck: usbotg_fck at 44e0047c { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&dpll_per_ck>; + bit-shift = <8>; + reg = <0x44e0047c 0x4>; +}; + +dpll_core_m4_div2_ck: dpll_core_m4_div2_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +ieee5000_fck: ieee5000_fck at 44e000e4 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&dpll_core_m4_div2_ck>; + bit-shift = <1>; + reg = <0x44e000e4 0x4>; +}; + +wdt1_fck: wdt1_fck at 44e00538 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&clk_rc32k_ck>, <&clkdiv32k_ick>; + reg = <0x44e00538 0x4>; + bit-mask = <0x3>; +}; + +l4_rtc_gclk: l4_rtc_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +l4hs_gclk: l4hs_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +l3s_gclk: l3s_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_div2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +l4fw_gclk: l4fw_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_div2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +l4ls_gclk: l4ls_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_div2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +sysclk_div_ck: sysclk_div_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +cpsw_125mhz_gclk: cpsw_125mhz_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m5_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +cpsw_cpts_rft_clk: cpsw_cpts_rft_clk at 44e00520 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&dpll_core_m5_ck>, <&dpll_core_m4_ck>; + reg = <0x44e00520 0x4>; + bit-mask = <0x1>; +}; + +gpio0_dbclk_mux_ck: gpio0_dbclk_mux_ck at 44e0053c { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&clk_rc32k_ck>, <&clk_32768_ck>, <&clkdiv32k_ick>; + reg = <0x44e0053c 0x4>; + bit-mask = <0x3>; +}; + +gpio0_dbclk: gpio0_dbclk at 44e00408 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&gpio0_dbclk_mux_ck>; + bit-shift = <18>; + reg = <0x44e00408 0x4>; +}; + +gpio1_dbclk: gpio1_dbclk at 44e000ac { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkdiv32k_ick>; + bit-shift = <18>; + reg = <0x44e000ac 0x4>; +}; + +gpio2_dbclk: gpio2_dbclk at 44e000b0 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkdiv32k_ick>; + bit-shift = <18>; + reg = <0x44e000b0 0x4>; +}; + +gpio3_dbclk: gpio3_dbclk at 44e000b4 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkdiv32k_ick>; + bit-shift = <18>; + reg = <0x44e000b4 0x4>; +}; + +lcd_gclk: lcd_gclk at 44e00534 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&dpll_disp_m2_ck>, <&dpll_core_m5_ck>, <&dpll_per_m2_ck>; + reg = <0x44e00534 0x4>; + bit-mask = <0x3>; + set-rate-parent; +}; + +mmc_clk: mmc_clk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +gfx_fclk_clksel_ck: gfx_fclk_clksel_ck at 44e0052c { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&dpll_core_m4_ck>, <&dpll_per_m2_ck>; + bit-shift = <1>; + reg = <0x44e0052c 0x4>; + bit-mask = <0x1>; +}; + +gfx_fck_div_ck: gfx_fck_div_ck at 44e0052c { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&gfx_fclk_clksel_ck>; + reg = <0x44e0052c 0x4>; + table = < 1 0 >, < 2 1 >; + bit-mask = <0x1>; +}; + +sysclkout_pre_ck: sysclkout_pre_ck at 44e00700 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&clk_32768_ck>, <&l3_gclk>, <&dpll_ddr_m2_ck>, <&dpll_per_m2_ck>, <&lcd_gclk>; + reg = <0x44e00700 0x4>; + bit-mask = <0x7>; +}; + +clkout2_div_ck: clkout2_div_ck at 44e00700 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&sysclkout_pre_ck>; + bit-shift = <3>; + reg = <0x44e00700 0x4>; + table = < 1 0 >, < 2 1 >, < 3 2 >, < 4 3 >, < 5 4 >, < 6 5 >, < 7 6 >, < 8 7 >; + bit-mask = <0x7>; +}; + +dbg_sysclk_ck: dbg_sysclk_ck at 44e00414 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_clkin_ck>; + bit-shift = <19>; + reg = <0x44e00414 0x4>; +}; + +dbg_clka_ck: dbg_clka_ck at 44e00414 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&dpll_core_m4_ck>; + bit-shift = <30>; + reg = <0x44e00414 0x4>; +}; + +stm_pmd_clock_mux_ck: stm_pmd_clock_mux_ck at 44e00414 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&dbg_sysclk_ck>, <&dbg_clka_ck>; + bit-shift = <22>; + reg = <0x44e00414 0x4>; + bit-mask = <0x3>; +}; + +trace_pmd_clk_mux_ck: trace_pmd_clk_mux_ck at 44e00414 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&dbg_sysclk_ck>, <&dbg_clka_ck>; + bit-shift = <20>; + reg = <0x44e00414 0x4>; + bit-mask = <0x3>; +}; + +stm_clk_div_ck: stm_clk_div_ck at 44e00414 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&stm_pmd_clock_mux_ck>; + bit-shift = <27>; + reg = <0x44e00414 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +trace_clk_div_ck: trace_clk_div_ck at 44e00414 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&trace_pmd_clk_mux_ck>; + bit-shift = <24>; + reg = <0x44e00414 0x4>; + bit-mask = <0x7>; + index-power-of-two; +}; + +clkout2_ck: clkout2_ck at 44e00700 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkout2_div_ck>; + bit-shift = <7>; + reg = <0x44e00700 0x4>; +}; + +ehrpwm0_tbclk: ehrpwm0_tbclk at 44e10664 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&dpll_per_m2_ck>; + bit-shift = <0>; + reg = <0x44e10664 0x4>; +}; + +ehrpwm1_tbclk: ehrpwm1_tbclk at 44e10664 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&dpll_per_m2_ck>; + bit-shift = <1>; + reg = <0x44e10664 0x4>; +}; + +ehrpwm2_tbclk: ehrpwm2_tbclk at 44e10664 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&dpll_per_m2_ck>; + bit-shift = <2>; + reg = <0x44e10664 0x4>; +};
arch/arm/boot/dts/am33xx.dtsi +7 -0
@@ -531,4 +531,11 @@ status = "disabled"; }; }; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + /include/ "am33xx-clocks.dtsi" + }; };
Signature · 1 line
1.7.9.5
PATCH v6 20/45 CLK: TI: add am33xx clock init file
In reply to Tero Kristoclk-33xx.c now contains the clock init functionality for am33xx, including DT clock registration and adding of static clkdev entries.
This patch also moves the omap2_clk_enable_init_clocks declaration to the driver include, as this is needed by the am33xx clock init code.
--- arch/arm/mach-omap2/clock.h | 1 - drivers/clk/ti/clk-33xx.c | 162 +++++++++++++++++++++++++++++++++++++++++++ include/linux/clk/ti.h | 1 + 3 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/ti/clk-33xx.c
arch/arm/mach-omap2/clock.h +0 -1
@@ -247,7 +247,6 @@ void omap2_clk_dflt_find_idlest(struct clk_hw_omap *clk,void __iomem **idlest_reg, u8 *idlest_bit, u8 *idlest_val);int omap2_clk_enable_autoidle_all (void ); -void omap2_clk_enable_init_clocks (const char **clk_names,u8 num_clocks);int omap2_clk_switch_mpurate_at_boot (const char *mpurate_ck_name); void omap2_clk_print_new_rates(const char *hfclkin_ck_name, const char *core_ck_name,
drivers/clk/ti/clk-33xx.c new file +162 -0
162 lines not on this page · raw message
include/linux/clk/ti.h +1 -0
@@ -208,6 +208,7 @@ unsigned long omap3_clkoutx2_recalc(struct clk_hw *hw,int omap2_clkops_enable_clkdm (struct clk_hw *hw);void omap2_clkops_disable_clkdm (struct clk_hw *hw);int omap2_clk_disable_autoidle_all (void ); +void omap2_clk_enable_init_clocks (const char **clk_names,u8 num_clocks);int omap3_dpll4_set_rate (struct clk_hw *clk,unsigned long rate,unsigned long parent_rate);int omap2_dflt_clk_enable (struct clk_hw *hw);
Signature · 1 line
1.7.9.5
PATCH v6 21/45 ARM: AM33xx: remove old clock data and link in new clock init code
In reply to Tero KristoAM33xx clocks have now been moved to DT, thus remove the old data file and use the new init code under OMAP clock driver.
--- arch/arm/mach-omap2/Makefile | 1 - arch/arm/mach-omap2/cclock33xx_data.c | 1059 --------------------------------- drivers/clk/ti/Makefile | 2 +- 3 files changed, 1 insertion(+), 1061 deletions(-) delete mode 100644 arch/arm/mach-omap2/cclock33xx_data.c
arch/arm/mach-omap2/Makefile +0 -1
@@ -187,7 +187,6 @@ obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o obj-$(CONFIG_SOC_AM33XX) += $(clock-common) dpll3xxx.o -obj-$(CONFIG_SOC_AM33XX) += cclock33xx_data.o obj-$(CONFIG_SOC_OMAP5) += $(clock-common) obj-$(CONFIG_SOC_OMAP5) += dpll3xxx.o dpll44xx.o
arch/arm/mach-omap2/cclock33xx_data.c deleted +0 -1059
1,059 lines not on this page · raw message
drivers/clk/ti/Makefile +1 -1
@@ -1,5 +1,5 @@ ifneq ($(CONFIG_OF),) obj-y += clk.o dpll.o autoidle.o gate.o \ clockdomain.o apll.o clk-44xx.o \ - clk-54xx.o clk-7xx.o + clk-54xx.o clk-7xx.o clk-33xx.o endif
Signature · 1 line
1.7.9.5
PATCH v6 22/45 CLK: TI: add interface clock support for OMAP3
In reply to Tero KristoOMAP3 has interface clocks in addition to functional clocks, which require special handling for the autoidle and idle status register offsets mainly.
--- .../devicetree/bindings/clock/ti/interface.txt | 53 +++++++++ arch/arm/mach-omap2/clock.h | 6 - drivers/clk/ti/Makefile | 3 +- drivers/clk/ti/interface.c | 124 ++++++++++++++++++++ include/linux/clk/ti.h | 7 ++ 5 files changed, 186 insertions(+), 7 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/ti/interface.txt create mode 100644 drivers/clk/ti/interface.c
Documentation/devicetree/bindings/clock/ti/interface.txt new file +53 -0
@@ -0,0 +1,53 @@ +Binding for Texas Instruments interface clock. + +This binding uses the common clock binding[1]. This clock is +quite much similar to the basic gate-clock [2], however, +it supports a number of additional features, including +companion clock finding (match corresponding functional gate +clock) and hardware autoidle enable / disable. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt +[2] Documentation/devicetree/bindings/clock/gate-clock.txt + +Required properties: +- compatible : shall be one of: + "ti,omap3-interface-clock" - basic OMAP3 interface clock + "ti,omap3-no-wait-interface-clock" - interface clock which has no hardware + capability for waiting clock to be ready + "ti,omap3-hsotgusb-interface-clock" - interface clock with USB specific HW + handling + "ti,omap3-dss-interface-clock" - interface clock with DSS specific HW handling + "ti,omap3-ssi-interface-clock" - interface clock with SSI specific HW handling + "ti,am35xx-interface-clock" - interface clock with AM35xx specific HW handling +- #clock-cells : from common clock binding; shall be set to 0 +- clocks : link to phandle of parent clock +- reg : base address for the control register + +Optional properties: +- ti,enable-bit : bit shift for the bit enabling/disabling the clock + (default 0) + +Examples: + aes1_ick: aes1_ick at 48004a14 { + #clock-cells = <0>; + compatible = "ti,omap3-interface-clock"; + clocks = <&security_l4_ick2>; + reg = <0x48004a14 0x4>; + ti,enable-bit = <3>; + }; + + cam_ick: cam_ick at 48004f10 { + #clock-cells = <0>; + compatible = "ti,omap3-no-wait-interface-clock"; + clocks = <&l4_ick>; + reg = <0x48004f10 0x4>; + ti,enable-bit = <0>; + }; + + ssi_ick_3430es2: ssi_ick_3430es2 at 48004a10 { + #clock-cells = <0>; + compatible = "ti,omap3-ssi-interface-clock"; + clocks = <&ssi_l4_ick>; + reg = <0x48004a10 0x4>; + ti,enable-bit = <0>; + };
arch/arm/mach-omap2/clock.h +0 -6
@@ -266,14 +266,8 @@ extern const struct clksel_rate gfx_l3_rates[];extern const struct clksel_rate dsp_ick_rates[];extern struct clk dummy_ck; -extern const struct clk_hw_omap_ops clkhwops_iclk_wait; -extern const struct clk_hw_omap_ops clkhwops_iclk;extern const struct clk_hw_omap_ops clkhwops_omap3430es2_ssi_wait; -extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_ssi_wait; -extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_dss_usbhost_wait; -extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_hsotgusb_wait;extern const struct clk_hw_omap_ops clkhwops_omap3430es2_hsotgusb_wait; -extern const struct clk_hw_omap_ops clkhwops_am35xx_ipss_wait;extern const struct clk_hw_omap_ops clkhwops_apll54;extern const struct clk_hw_omap_ops clkhwops_apll96;extern const struct clk_hw_omap_ops clkhwops_omap2xxx_dpll;
drivers/clk/ti/Makefile +2 -1
@@ -1,5 +1,6 @@ ifneq ($(CONFIG_OF),) obj-y += clk.o dpll.o autoidle.o gate.o \ clockdomain.o apll.o clk-44xx.o \ - clk-54xx.o clk-7xx.o clk-33xx.o + clk-54xx.o clk-7xx.o clk-33xx.o \ + interface.o endif
drivers/clk/ti/interface.c new file +124 -0
124 lines not on this page · raw message
include/linux/clk/ti.h +7 -0
@@ -231,5 +231,12 @@ extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx;extern const struct clk_hw_omap_ops clkhwops_wait;extern const struct clk_hw_omap_ops clkhwops_omap3430es2_dss_usbhost_wait;extern const struct clk_hw_omap_ops clkhwops_am35xx_ipss_module_wait; +extern const struct clk_hw_omap_ops clkhwops_am35xx_ipss_wait; + +extern const struct clk_hw_omap_ops clkhwops_iclk_wait; +extern const struct clk_hw_omap_ops clkhwops_iclk; +extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_ssi_wait; +extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_dss_usbhost_wait; +extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_hsotgusb_wait;#endif
Signature · 1 line
1.7.9.5
PATCH v6 23/45 ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm
In reply to Tero KristoIf the main clock for a hwmod is of basic clock type, it is illegal to type cast this to clk_hw_omap and will result in bogus data. Fixed by checking the clock flags before attempting the type cast.
--- arch/arm/mach-omap2/omap_hwmod.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/mach-omap2/omap_hwmod.c +2 -0
@@ -656,6 +656,8 @@ static struct clockdomain *_get_clkdm(struct omap_hwmod *oh)if (oh->clkdm) {return oh->clkdm; }else if (oh->_clk) { +if (__clk_get_flags (oh->_clk) &CLK_IS_BASIC ) +return NULL ; clk =to_clk_hw_omap (__clk_get_hw (oh->_clk));return clk->clkdm; }
Signature · 1 line
1.7.9.5
PATCH v6 24/45 ARM: OMAP3: hwmod: initialize clkdm from clkdm_name
In reply to Tero KristoDT clocks are mostly missing clkdm info now, and this causes an issue with counter32k which makes its slave idlemode wrong and prevents core idle.
Fixed by initializing the hwmod clkdm pointers for omap3 also which makes sure the clkdm flag matching logic works properly.
This patch also changes the return value for _init_clkdm to 0 for incorrect clkdm_name, as this a warning, not a fatal error.
--- arch/arm/mach-omap2/omap_hwmod.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/omap_hwmod.c +2 -1
@@ -1544,7 +1544,7 @@ static int _init_clkdm(struct omap_hwmod *oh)if (!oh->clkdm) {pr_warning ("omap_hwmod: %s: could not associate to clkdm %s\n" , oh->name, oh->clkdm_name); -return -EINVAL ; +return 0 ; } pr_debug("omap_hwmod: %s: associated to clkdm %s\n",
@@ -4115,6 +4115,7 @@ void __init omap_hwmod_init(void) soc_ops.assert_hardreset = _omap2_assert_hardreset; soc_ops.deassert_hardreset = _omap2_deassert_hardreset; soc_ops.is_hardreset_asserted = _omap2_is_hardreset_asserted; + soc_ops.init_clkdm = _init_clkdm; }else if (cpu_is_omap44xx () ||soc_is_omap54xx () ||soc_is_dra7xx ()) { soc_ops.enable_module = _omap4_enable_module; soc_ops.disable_module = _omap4_disable_module;
Signature · 1 line
1.7.9.5
PATCH v6 25/45 ARM: dts: omap3 clock data
In reply to Tero KristoThis patch creates a unique node for each clock in the OMAP3 power, reset and clock manager (PRCM).
TODO: add still missing am35xx only clock nodes
--- arch/arm/boot/dts/omap3.dtsi | 7 + arch/arm/boot/dts/omap3430es1-clocks.dtsi | 158 ++ arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi | 222 +++ arch/arm/boot/dts/omap34xx.dtsi | 111 +- .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 196 +++ arch/arm/boot/dts/omap36xx-clocks.dtsi | 80 ++ .../boot/dts/omap36xx-omap3430es2plus-clocks.dtsi | 175 +++ arch/arm/boot/dts/omap36xx.dtsi | 112 +- arch/arm/boot/dts/omap3xxx-clocks.dtsi | 1513 ++++++++++++++++++++ 9 files changed, 2572 insertions(+), 2 deletions(-) create mode 100644 arch/arm/boot/dts/omap3430es1-clocks.dtsi create mode 100644 arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi create mode 100644 arch/arm/boot/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi create mode 100644 arch/arm/boot/dts/omap36xx-clocks.dtsi create mode 100644 arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi create mode 100644 arch/arm/boot/dts/omap3xxx-clocks.dtsi
arch/arm/boot/dts/omap3.dtsi +7 -0
@@ -533,4 +533,11 @@ ram-bits = <12>; }; }; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + /include/ "omap3xxx-clocks.dtsi" + }; };
arch/arm/boot/dts/omap3430es1-clocks.dtsi new file +158 -0
158 lines not on this page · raw message
arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi new file +222 -0
222 lines not on this page · raw message
arch/arm/boot/dts/omap34xx.dtsi +110 -1
115 lines not on this page · raw message
arch/arm/boot/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi new file +196 -0
196 lines not on this page · raw message
arch/arm/boot/dts/omap36xx-clocks.dtsi new file +80 -0
80 lines not on this page · raw message
arch/arm/boot/dts/omap36xx-omap3430es2plus-clocks.dtsi new file +175 -0
175 lines not on this page · raw message
arch/arm/boot/dts/omap36xx.dtsi +111 -1
116 lines not on this page · raw message
arch/arm/boot/dts/omap3xxx-clocks.dtsi new file +1513 -0
1,513 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v6 26/45 CLK: TI: add omap3 clock init file
In reply to Tero Kristoclk-3xxx.c now contains the clock init functionality for omap3, including DT clock registration and adding of static clkdev entries.
--- arch/arm/mach-omap2/clock3xxx.h | 1 - drivers/clk/ti/Makefile | 2 +- drivers/clk/ti/clk-3xxx.c | 388 +++++++++++++++++++++++++++++++++++++++ include/linux/clk/ti.h | 1 + 4 files changed, 390 insertions(+), 2 deletions(-) create mode 100644 drivers/clk/ti/clk-3xxx.c
arch/arm/mach-omap2/clock3xxx.h +0 -1
@@ -11,7 +11,6 @@int omap3xxx_clk_init (void );int omap3_core_dpll_m2_set_rate (struct clk_hw *clk,unsigned long rate,unsigned long parent_rate); -void omap3_clk_lock_dpll5 (void );extern struct clk *sdrc_ick_p;extern struct clk *arm_fck_p;
drivers/clk/ti/Makefile +1 -1
@@ -2,5 +2,5 @@ ifneq ($(CONFIG_OF),) obj-y += clk.o dpll.o autoidle.o gate.o \ clockdomain.o apll.o clk-44xx.o \ clk-54xx.o clk-7xx.o clk-33xx.o \ - interface.o + interface.o clk-3xxx.o endif
drivers/clk/ti/clk-3xxx.c new file +388 -0
388 lines not on this page · raw message
include/linux/clk/ti.h +1 -0
@@ -214,6 +214,7 @@ int omap3_dpll4_set_rate(struct clk_hw *clk, unsigned long rate,int omap2_dflt_clk_enable (struct clk_hw *hw);void omap2_dflt_clk_disable (struct clk_hw *hw);int omap2_dflt_clk_is_enabled (struct clk_hw *hw); +void omap3_clk_lock_dpll5 (void );void omap_dt_clocks_register (struct omap_dt_clk *oclks);#ifdef CONFIG_OF
Signature · 1 line
1.7.9.5
PATCH v6 27/45 ARM: dts: AM35xx clock data
In reply to Tero KristoThis patch creates a unique node for each AM35xx specific clock in the AM35xx power, reset and clock manager (PRCM). Most of the AM35xx clock data is shared with OMAP3xxx, this patch only creates the delta.
--- arch/arm/boot/dts/am35xx-clocks.dtsi | 101 ++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 arch/arm/boot/dts/am35xx-clocks.dtsi
arch/arm/boot/dts/am35xx-clocks.dtsi new file +101 -0
@@ -0,0 +1,101 @@ +/* + * Device Tree Source for AM35xx clock data + * + * Copyright (C) 2013 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +ipss_ick: ipss_ick at 48004a10 { + #clock-cells = <0>; + compatible = "ti,am35xx-interface-clock"; + clocks = <&core_l3_ick>; + reg = <0x48004a10 0x4>; + ti,enable-bit = <4>; +}; + +rmii_ck: rmii_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <50000000>; +}; + +pclk_ck: pclk_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <27000000>; +}; + +emac_ick: emac_ick at 4800259c { + #clock-cells = <0>; + compatible = "ti,am35xx-gate-clock"; + clocks = <&ipss_ick>; + reg = <0x4800259c 0x4>; + ti,enable-bit = <1>; +}; + +emac_fck: emac_fck at 4800259c { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&rmii_ck>; + reg = <0x4800259c 0x4>; + bit-shift = <9>; +}; + +vpfe_ick: vpfe_ick at 4800259c { + #clock-cells = <0>; + compatible = "ti,am35xx-gate-clock"; + clocks = <&ipss_ick>; + reg = <0x4800259c 0x4>; + ti,enable-bit = <2>; +}; + +vpfe_fck: vpfe_fck at 4800259c { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&pclk_ck>; + reg = <0x4800259c 0x4>; + bit-shift = <10>; +}; + +hsotgusb_ick: hsotgusb_ick at 4800259c { + #clock-cells = <0>; + compatible = "ti,am35xx-gate-clock"; + clocks = <&ipss_ick>; + reg = <0x4800259c 0x4>; + ti,enable-bit = <0>; +}; + +hsotgusb_fck_am35xx: hsotgusb_fck_am35xx at 4800259c { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&sys_ck>; + reg = <0x4800259c 0x4>; + bit-shift = <8>; +}; + +hecc_ck: hecc_ck at 4800259c { + #clock-cells = <0>; + compatible = "ti,am35xx-gate-clock"; + clocks = <&sys_ck>; + reg = <0x4800259c 0x4>; + ti,enable-bit = <3>; +}; + +uart4_ick_am35xx: uart4_ick_am35xx at 48004a10 { + #clock-cells = <0>; + compatible = "ti,omap3-interface-clock"; + clocks = <&core_l4_ick>; + reg = <0x48004a10 0x4>; + ti,enable-bit = <23>; +}; + +uart4_fck_am35xx: uart4_fck_am35xx at 48004a00 { + #clock-cells = <0>; + compatible = "ti,gate-clock"; + clocks = <&core_48m_fck>; + reg = <0x48004a00 0x4>; + ti,enable-bit = <23>; +};
Signature · 1 line
1.7.9.5
PATCH v6 28/45 ARM: dts: AM35xx: use DT clock data
In reply to Tero KristoAM35xx now uses the clock data from device tree. Most of the data is shared with OMAP3xxx, but as there is some delta, a new base .dtsi file is also created for the SoC.
--- arch/arm/boot/dts/am3517-evm.dts | 2 +- arch/arm/boot/dts/am3517.dtsi | 116 +++++++++++++++++++++++++++++++ arch/arm/boot/dts/am3517_mt_ventoux.dts | 2 +- 3 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 arch/arm/boot/dts/am3517.dtsi
arch/arm/boot/dts/am3517-evm.dts +1 -1
@@ -7,7 +7,7 @@ */ /dts-v1/; -#include "omap34xx.dtsi" +#include "am3517.dtsi" / { model = "TI AM3517 EVM (AM3517/05)";
arch/arm/boot/dts/am3517.dtsi new file +116 -0
116 lines not on this page · raw message
arch/arm/boot/dts/am3517_mt_ventoux.dts +1 -1
@@ -7,7 +7,7 @@ */ /dts-v1/; -#include "omap34xx.dtsi" +#include "am3517.dtsi" / { model = "TeeJet Mt.Ventoux";
Signature · 1 line
1.7.9.5
PATCH v6 29/45 ARM: OMAP3: use DT clock init if DT data is available
In reply to Tero KristoOMAP3 platforms support both DT and non-DT boot at the moment, make the clock init work according to the used setup.
--- arch/arm/mach-omap2/clock3xxx.h | 4 ++++ arch/arm/mach-omap2/io.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/clock3xxx.h +4 -0
@@ -9,6 +9,10 @@#define __ARCH_ARM_MACH_OMAP2_CLOCK3XXX_Hint omap3xxx_clk_init (void ); +int omap3430_clk_init (void ); +int omap3630_clk_init (void ); +int ti81xx_clk_init (void ); +int am35xx_clk_init (void );int omap3_core_dpll_m2_set_rate (struct clk_hw *clk,unsigned long rate,unsigned long parent_rate);
arch/arm/mach-omap2/io.c +12 -1
@@ -488,21 +488,29 @@ void __init omap3_init_early(void)void __init omap3430_init_early (void ) {omap3_init_early (); +if (of_have_populated_dt ()) + omap_clk_init = omap3430_clk_init; }void __init omap35xx_init_early (void ) {omap3_init_early (); +if (of_have_populated_dt ()) + omap_clk_init = omap3430_clk_init; }void __init omap3630_init_early (void ) {omap3_init_early (); +if (of_have_populated_dt ()) + omap_clk_init = omap3630_clk_init; }void __init am35xx_init_early (void ) {omap3_init_early (); +if (of_have_populated_dt ()) + omap_clk_init = am35xx_clk_init; }void __init ti81xx_init_early (void )
@@ -520,7 +528,10 @@ void __init ti81xx_init_early(void)omap3xxx_clockdomains_init ();omap3xxx_hwmod_init ();omap_hwmod_init_postsetup (); - omap_clk_init = omap3xxx_clk_init; +if (of_have_populated_dt ()) + omap_clk_init = ti81xx_clk_init; +else + omap_clk_init = omap3xxx_clk_init; }void __init omap3_init_late (void )
Signature · 1 line
1.7.9.5
PATCH v6 30/45 ARM: dts: am43xx clock data
In reply to Tero KristoThis patch creates a unique node for each clock in the AM43xx power, reset and clock manager (PRCM).
--- arch/arm/boot/dts/am43xx-clocks.dtsi | 681 ++++++++++++++++++++++++++++++++++ 1 file changed, 681 insertions(+) create mode 100644 arch/arm/boot/dts/am43xx-clocks.dtsi
arch/arm/boot/dts/am43xx-clocks.dtsi new file +681 -0
@@ -0,0 +1,681 @@ +/* + * Device Tree Source for AM43xx clock data + * + * Copyright (C) 2013 Texas Instruments, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +clk_32768_ck: clk_32768_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; +}; + +clk_rc32k_ck: clk_rc32k_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; +}; + +virt_19200000_ck: virt_19200000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <19200000>; +}; + +virt_24000000_ck: virt_24000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <24000000>; +}; + +virt_25000000_ck: virt_25000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <25000000>; +}; + +virt_26000000_ck: virt_26000000_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <26000000>; +}; + +sys_clkin_ck: sys_clkin_ck at 44e10040 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&virt_19200000_ck>, <&virt_24000000_ck>, <&virt_25000000_ck>, <&virt_26000000_ck>; + bit-shift = <22>; + reg = <0x44e10040 0x4>; + bit-mask = <0x3>; +}; + +tclkin_ck: tclkin_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <26000000>; +}; + +dpll_core_ck: dpll_core_ck at 44df2d20 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-core-lock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44df2d20 0x4>, <0x44df2d24 0x4>, <0x44df2d2c 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_core_x2_ck: dpll_core_x2_ck { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-x2-clock"; + clocks = <&dpll_core_ck>; +}; + +dpll_core_m4_ck: dpll_core_m4_ck at 44df2d38 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x44df2d38 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_core_m5_ck: dpll_core_m5_ck at 44df2d3c { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x44df2d3c 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_core_m6_ck: dpll_core_m6_ck at 44df2d40 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_core_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x44df2d40 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_mpu_ck: dpll_mpu_ck at 44df2d60 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44df2d60 0x4>, <0x44df2d64 0x4>, <0x44df2d6c 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_mpu_m2_ck: dpll_mpu_m2_ck at 44df2d70 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_mpu_ck>; + ti,autoidle-shift = <8>; + reg = <0x44df2d70 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_ddr_ck: dpll_ddr_ck at 44df2da0 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44df2da0 0x4>, <0x44df2da4 0x4>, <0x44df2dac 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_ddr_m2_ck: dpll_ddr_m2_ck at 44df2db0 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_ddr_ck>; + ti,autoidle-shift = <8>; + reg = <0x44df2db0 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_disp_ck: dpll_disp_ck at 44df2e20 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44df2e20 0x4>, <0x44df2e24 0x4>, <0x44df2e2c 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_disp_m2_ck: dpll_disp_m2_ck at 44df2e30 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_disp_ck>; + ti,autoidle-shift = <8>; + reg = <0x44df2e30 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_per_ck: dpll_per_ck at 44df2de0 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-j-type-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44df2de0 0x4>, <0x44df2de4 0x4>, <0x44df2dec 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_per_m2_ck: dpll_per_m2_ck at 44df2df0 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_per_ck>; + ti,autoidle-shift = <8>; + reg = <0x44df2df0 0x4>; + bit-mask = <0x7f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_per_m2_div4_wkupdm_ck: dpll_per_m2_div4_wkupdm_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <4>; +}; + +dpll_per_m2_div4_ck: dpll_per_m2_div4_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <4>; +}; + +adc_tsc_fck: adc_tsc_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +clk_24mhz: clk_24mhz { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <8>; +}; + +clkdiv32k_ck: clkdiv32k_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&clk_24mhz>; + clock-mult = <1>; + clock-div = <732>; +}; + +clkdiv32k_ick: clkdiv32k_ick at 44df2a38 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkdiv32k_ck>; + bit-shift = <8>; + reg = <0x44df2a38 0x4>; +}; + +dcan0_fck: dcan0_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dcan1_fck: dcan1_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +sysclk_div: sysclk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +pruss_ocp_gclk: pruss_ocp_gclk at 44df4248 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sysclk_div>, <&dpll_disp_m2_ck>; + reg = <0x44df4248 0x4>; + bit-mask = <0x1>; +}; + +mcasp0_fck: mcasp0_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +mcasp1_fck: mcasp1_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +smartreflex0_fck: smartreflex0_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +smartreflex1_fck: smartreflex1_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +sha0_fck: sha0_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +aes0_fck: aes0_fck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +clk_32k_tpm_ck: clk_32k_tpm_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; +}; + +timer1_fck: timer1_fck at 44df4200 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sys_clkin_ck>, <&clkdiv32k_ick>, <&tclkin_ck>, <&clk_rc32k_ck>, <&clk_32768_ck>, <&clk_32k_tpm_ck>; + reg = <0x44df4200 0x4>; + bit-mask = <0x7>; +}; + +timer2_fck: timer2_fck at 44df4204 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44df4204 0x4>; + bit-mask = <0x3>; +}; + +timer3_fck: timer3_fck at 44df4208 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44df4208 0x4>; + bit-mask = <0x3>; +}; + +timer4_fck: timer4_fck at 44df420c { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44df420c 0x4>; + bit-mask = <0x3>; +}; + +timer5_fck: timer5_fck at 44df4210 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44df4210 0x4>; + bit-mask = <0x3>; +}; + +timer6_fck: timer6_fck at 44df4214 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44df4214 0x4>; + bit-mask = <0x3>; +}; + +timer7_fck: timer7_fck at 44df4218 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>; + reg = <0x44df4218 0x4>; + bit-mask = <0x3>; +}; + +wdt1_fck: wdt1_fck at 44df422c { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&clk_rc32k_ck>, <&clkdiv32k_ick>; + reg = <0x44df422c 0x4>; + bit-mask = <0x1>; +}; + +l3_gclk: l3_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dpll_core_m4_div2_ck: dpll_core_m4_div2_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sysclk_div>; + clock-mult = <1>; + clock-div = <2>; +}; + +l4hs_gclk: l4hs_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +l3s_gclk: l3s_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_div2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +l4ls_gclk: l4ls_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m4_div2_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +cpsw_125mhz_gclk: cpsw_125mhz_gclk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m5_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +cpsw_cpts_rft_clk: cpsw_cpts_rft_clk at 44df4238 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sysclk_div>, <&dpll_core_m5_ck>, <&dpll_disp_m2_ck>; + reg = <0x44df4238 0x4>; + bit-mask = <0x3>; +}; + +clk_32k_mosc_ck: clk_32k_mosc_ck { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; +}; + +gpio0_dbclk_mux_ck: gpio0_dbclk_mux_ck at 44df4240 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&clk_rc32k_ck>, <&clk_32768_ck>, <&clkdiv32k_ick>, <&clk_32k_mosc_ck>, <&clk_32k_tpm_ck>; + reg = <0x44df4240 0x4>; + bit-mask = <0x7>; +}; + +gpio0_dbclk: gpio0_dbclk at 44df2b68 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&gpio0_dbclk_mux_ck>; + bit-shift = <8>; + reg = <0x44df2b68 0x4>; +}; + +gpio1_dbclk: gpio1_dbclk at 44df8c78 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkdiv32k_ick>; + bit-shift = <8>; + reg = <0x44df8c78 0x4>; +}; + +gpio2_dbclk: gpio2_dbclk at 44df8c80 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkdiv32k_ick>; + bit-shift = <8>; + reg = <0x44df8c80 0x4>; +}; + +gpio3_dbclk: gpio3_dbclk at 44df8c88 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkdiv32k_ick>; + bit-shift = <8>; + reg = <0x44df8c88 0x4>; +}; + +gpio4_dbclk: gpio4_dbclk at 44df8c90 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkdiv32k_ick>; + bit-shift = <8>; + reg = <0x44df8c90 0x4>; +}; + +gpio5_dbclk: gpio5_dbclk at 44df8c98 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&clkdiv32k_ick>; + bit-shift = <8>; + reg = <0x44df8c98 0x4>; +}; + +mmc_clk: mmc_clk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +gfx_fclk_clksel_ck: gfx_fclk_clksel_ck at 44df423c { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&sysclk_div>, <&dpll_per_m2_ck>; + bit-shift = <1>; + reg = <0x44df423c 0x4>; + bit-mask = <0x1>; +}; + +gfx_fck_div_ck: gfx_fck_div_ck at 44df423c { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&gfx_fclk_clksel_ck>; + reg = <0x44df423c 0x4>; + bit-mask = <0x1>; +}; + +disp_clk: disp_clk at 44df4244 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&dpll_disp_m2_ck>, <&dpll_core_m5_ck>, <&dpll_per_m2_ck>; + reg = <0x44df4244 0x4>; + bit-mask = <0x3>; +}; + +dpll_extdev_ck: dpll_extdev_ck at 44df2e60 { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x44df2e60 0x4>, <0x44df2e64 0x4>, <0x44df2e6c 0x4>; + reg-names = "control", "idlest", "mult-div1"; +}; + +dpll_extdev_m2_ck: dpll_extdev_m2_ck at 44df2e70 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_extdev_ck>; + ti,autoidle-shift = <8>; + reg = <0x44df2e70 0x4>; + bit-mask = <0x7f>; + index-starts-at-one; + ti,autoidle-low; +}; + +mux_synctimer32k_ck: mux_synctimer32k_ck at 44df4230 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&clk_32768_ck>, <&clk_32k_tpm_ck>, <&clkdiv32k_ick>; + reg = <0x44df4230 0x4>; + bit-mask = <0x3>; +}; + +synctimer_32kclk: synctimer_32kclk at 44df2a30 { + #clock-cells = <0>; + compatible = "gate-clock"; + clocks = <&mux_synctimer32k_ck>; + bit-shift = <8>; + reg = <0x44df2a30 0x4>; +}; + +timer8_fck: timer8_fck at 44df421c { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>, <&clk_32k_tpm_ck>; + reg = <0x44df421c 0x4>; + bit-mask = <0x3>; +}; + +timer9_fck: timer9_fck at 44df4220 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>, <&clk_32k_tpm_ck>; + reg = <0x44df4220 0x4>; + bit-mask = <0x3>; +}; + +timer10_fck: timer10_fck at 44df4224 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>, <&clk_32k_tpm_ck>; + reg = <0x44df4224 0x4>; + bit-mask = <0x3>; +}; + +timer11_fck: timer11_fck at 44df4228 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&tclkin_ck>, <&sys_clkin_ck>, <&clkdiv32k_ick>, <&clk_32k_tpm_ck>; + reg = <0x44df4228 0x4>; + bit-mask = <0x3>; +}; + +cpsw_50m_clkdiv: cpsw_50m_clkdiv { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_core_m5_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +cpsw_5m_clkdiv: cpsw_5m_clkdiv { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&cpsw_50m_clkdiv>; + clock-mult = <1>; + clock-div = <10>; +}; + +dpll_ddr_x2_ck: dpll_ddr_x2_ck { + #clock-cells = <0>; + compatible = "ti,omap4-dpll-x2-clock"; + clocks = <&dpll_ddr_ck>; +}; + +dpll_ddr_m4_ck: dpll_ddr_m4_ck at 44df2db8 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_ddr_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x44df2db8 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; +}; + +dpll_per_clkdcoldo: dpll_per_clkdcoldo { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_ck>; + clock-mult = <1>; + clock-div = <1>; +}; + +dll_aging_clk_div: dll_aging_clk_div at 44df4250 { + #clock-cells = <0>; + compatible = "divider-clock"; + clocks = <&sys_clkin_ck>; + reg = <0x44df4250 0x4>; + table = < 8 0 >, < 16 1 >, < 32 2 >; + bit-mask = <0x3>; +}; + +div_core_25m_ck: div_core_25m_ck { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sysclk_div>; + clock-mult = <1>; + clock-div = <8>; +}; + +func_12m_clk: func_12m_clk { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&dpll_per_m2_ck>; + clock-mult = <1>; + clock-div = <16>; +}; + +vtp_clk_div: vtp_clk_div { + #clock-cells = <0>; + compatible = "fixed-factor-clock"; + clocks = <&sys_clkin_ck>; + clock-mult = <1>; + clock-div = <2>; +}; + +usbphy_32khz_clkmux: usbphy_32khz_clkmux at 44df4260 { + #clock-cells = <0>; + compatible = "mux-clock"; + clocks = <&clk_32768_ck>, <&clk_32k_tpm_ck>; + reg = <0x44df4260 0x4>; + bit-mask = <0x1>; +};
Signature · 1 line
1.7.9.5
PATCH v6 31/45 ARM: OMAP2+: Add support to parse 'main_clk' info from DT
In reply to Tero KristoFrom: Rajendra Nayak <[email protected]>
With clocks for OMAP moving to DT, its now possible to pass the 'main_clk' data for each device from DT instead of having it in hwmod.
--- arch/arm/mach-omap2/omap_hwmod.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +21 -13
@@ -730,14 +730,18 @@ static int _del_initiator_dep(struct omap_hwmod *oh, struct omap_hwmod *init_oh)* functional clock pointer) if a main_clk is present. Returns 0 on * success or -EINVAL on error. */ -static int _init_main_clk (struct omap_hwmod *oh) +static int _init_main_clk (struct omap_hwmod *oh,struct device_node *np) {int ret =0 ; -if (!oh->main_clk) +if (!oh->main_clk && !of_get_property (np,"clocks" ,NULL ))return 0 ; - oh->_clk =clk_get (NULL , oh->main_clk); +if (oh->main_clk) + oh->_clk =clk_get (NULL , oh->main_clk); +else + oh->_clk =of_clk_get_by_name (np,"fck" ); +if (IS_ERR (oh->_clk)) {pr_warning ("omap_hwmod: %s: cannot clk_get main_clk %s\n" , oh->name, oh->main_clk);
@@ -1563,7 +1567,8 @@ static int _init_clkdm(struct omap_hwmod *oh)* Resolves all clock names embedded in the hwmod. Returns 0 on * success, or a negative error code on failure. */ -static int _init_clocks (struct omap_hwmod *oh,void *data) +static int _init_clocks (struct omap_hwmod *oh,void *data, +struct device_node *np) {int ret =0 ;
@@ -1575,7 +1580,7 @@ static int _init_clocks(struct omap_hwmod *oh, void *data)if (soc_ops.init_clkdm) ret |= soc_ops.init_clkdm (oh); - ret |=_init_main_clk (oh); + ret |=_init_main_clk (oh, np); ret |=_init_interface_clks (oh); ret |=_init_opt_clks (oh);
@@ -2363,11 +2368,11 @@ static struct device_node *of_dev_hwmod_lookup(struct device_node *np,* are part of the device's address space can be ioremapped properly. * No return value. */ -static void __init _init_mpu_rt_base (struct omap_hwmod *oh,void *data) +static void __init _init_mpu_rt_base (struct omap_hwmod *oh,void *data, +struct device_node *np) {struct omap_hwmod_addr_space *mem;void __iomem *va_start =NULL ; -struct device_node *np;if (!oh)return ;
@@ -2383,12 +2388,10 @@ static void __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data) oh->name);/* Extract the IO space from device tree blob */ -if (!of_have_populated_dt ()) +if (!np)return ; - np =of_dev_hwmod_lookup (of_find_node_by_name (NULL ,"ocp" ), oh); -if (np) - va_start =of_iomap (np, oh->mpu_rt_idx); + va_start =of_iomap (np,0 ); }else { va_start =ioremap (mem->pa_start, mem->pa_end - mem->pa_start); }
@@ -2420,14 +2423,19 @@ static void __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data)static int __init _init (struct omap_hwmod *oh,void *data) {int r; +struct device_node *np =NULL ;if (oh->_state != _HWMOD_STATE_REGISTERED)return 0 ; +/* If booting with DT, parse the DT node for IO space/clocks etc */ +if (of_have_populated_dt ()) + np =of_dev_hwmod_lookup (of_find_node_by_name (NULL ,"ocp" ), oh); +if (oh->class->sysc) -_init_mpu_rt_base (oh,NULL ); +_init_mpu_rt_base (oh,NULL , np); - r =_init_clocks (oh,NULL ); + r =_init_clocks (oh,NULL , np);if (r <0 ) {WARN (1 ,"omap_hwmod: %s: couldn't init clocks\n" , oh->name);return -EINVAL ;
Signature · 1 line
1.7.9.5
PATCH v6 32/45 ARM: OMAP2+: Add support to parse optional clk info from DT
In reply to Tero KristoFrom: Rajendra Nayak <[email protected]>
With clocks for OMAP moving to DT, its now possible to pass all optional clock data for each device from DT instead of having it in hwmod.
--- arch/arm/mach-omap2/omap_hwmod.c | 66 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +64 -2
@@ -807,6 +807,65 @@ static int _init_interface_clks(struct omap_hwmod *oh)return ret; } +static const char **_parse_opt_clks_dt (struct omap_hwmod *oh, +struct device_node *np, +int *opt_clks_cnt) +{ +int i, clks_cnt; +const char *clk_name; +const char **opt_clk_names; + + clks_cnt =of_property_count_strings (np,"clock-names" ); +if (!clks_cnt) +return NULL ; + + opt_clk_names =kzalloc (sizeof (char *)*clks_cnt,GFP_KERNEL ); +if (!opt_clk_names) +return NULL ; + +for (i =0 ; i < clks_cnt; i++) { +of_property_read_string_index (np,"clock-names" , i, &clk_name); +if (!strcmp (clk_name,"fck" )) +continue ; + opt_clks_cnt++; + opt_clk_names[i] = clk_name; + } +return opt_clk_names; +} + +static int _init_opt_clks_dt (struct omap_hwmod *oh,struct device_node *np) +{ +struct clk *c; +int i, opt_clks_cnt =0 ; +int ret =0 ; +const char **opt_clk_names; + + opt_clk_names =_parse_opt_clks_dt (oh, np, &opt_clks_cnt); +if (!opt_clk_names) +return -EINVAL ; + + oh->opt_clks =kzalloc (sizeof (struct omap_hwmod_opt_clk *) + * opt_clks_cnt,GFP_KERNEL ); +if (!oh->opt_clks) +return -ENOMEM ; + + oh->opt_clks_cnt = opt_clks_cnt; + +for (i =0 ; i < oh->opt_clks_cnt; i++) { + c =of_clk_get_by_name (np, opt_clk_names[i]); +if (IS_ERR (c)) { +pr_warn ("omap_hwmod: %s: cannot clk_get opt_clk %s\n" , + oh->name, opt_clk_names[i]); + ret = -EINVAL ; + } + oh->opt_clks[i]._clk = c; + oh->opt_clks[i].role = opt_clk_names[i]; + oh->opt_clks_cnt++; +clk_prepare (oh->opt_clks[i]._clk); + } +return ret; +} +/** * _init_opt_clk - get a struct clk * for the the hwmod's optional clocks * @oh: struct omap_hwmod *
@@ -814,13 +873,16 @@ static int _init_interface_clks(struct omap_hwmod *oh)* Called from _init_clocks(). Populates the @oh omap_hwmod_opt_clk * clock pointers. Returns 0 on success or -EINVAL on error. */ -static int _init_opt_clks (struct omap_hwmod *oh) +static int _init_opt_clks (struct omap_hwmod *oh,struct device_node *np) {struct omap_hwmod_opt_clk *oc;struct clk *c;int i;int ret =0 ; +if (of_get_property (np,"clocks" ,NULL )) +return _init_opt_clks_dt (oh, np); +for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i >0 ; i--, oc++) { c =clk_get (NULL , oc->clk);if (IS_ERR (c)) {
@@ -1582,7 +1644,7 @@ static int _init_clocks(struct omap_hwmod *oh, void *data, ret |=_init_main_clk (oh, np); ret |=_init_interface_clks (oh); - ret |=_init_opt_clks (oh); + ret |=_init_opt_clks (oh, np);if (!ret) oh->_state = _HWMOD_STATE_CLKS_INITED;
Signature · 1 line
1.7.9.5
PATCH v6 33/45 ARM: OMAP2+: hwmod: fix opt_clk handling with DT
In reply to Tero KristoRajendra's patch had a bug which caused opt clocks to fail initialize completely, causing boot warnings with devices that depend on them.
--- arch/arm/mach-omap2/omap_hwmod.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/omap_hwmod.c +2 -3
@@ -827,8 +827,7 @@ static const char **_parse_opt_clks_dt(struct omap_hwmod *oh,of_property_read_string_index (np,"clock-names" , i, &clk_name);if (!strcmp (clk_name,"fck" ))continue ; - opt_clks_cnt++; - opt_clk_names[i] = clk_name; + opt_clk_names[(*opt_clks_cnt)++] = clk_name; }return opt_clk_names; }
@@ -851,7 +850,7 @@ static int _init_opt_clks_dt(struct omap_hwmod *oh, struct device_node *np) oh->opt_clks_cnt = opt_clks_cnt; -for (i =0 ; i < oh->opt_clks_cnt; i++) { +for (i =0 ; i < opt_clks_cnt; i++) { c =of_clk_get_by_name (np, opt_clk_names[i]);if (IS_ERR (c)) { pr_warn("omap_hwmod: %s: cannot clk_get opt_clk %s\n",
Signature · 1 line
1.7.9.5
PATCH v6 34/45 ARM: OMAP2+: timer: fix boot crash with DT only boot and DT clocks
In reply to Tero KristoTimer failed to init properly with DT clock data, as it still tried to use clock info from hwmod. Changed init order slightly so that timer hwmod is initialized earlier, which also makes sure the timer clock is initialized and can be referenced from the driver.
--- arch/arm/mach-omap2/timer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/timer.c +6 -2
@@ -276,8 +276,13 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,if (!timer->io_base)return -ENXIO ; +omap_hwmod_setup_one (oh_name); +/* After the dmtimer is using hwmod these clocks won't be needed */ - timer->fclk =clk_get (NULL ,omap_hwmod_get_main_clk (oh)); +if (oh->_clk) + timer->fclk = oh->_clk; +else + timer->fclk =clk_get (NULL ,omap_hwmod_get_main_clk (oh));if (IS_ERR (timer->fclk))return PTR_ERR (timer->fclk);
@@ -297,7 +302,6 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,clk_put (src); -omap_hwmod_setup_one (oh_name);omap_hwmod_enable (oh);__omap_dm_timer_init_regs (timer);
Signature · 1 line
1.7.9.5
PATCH v6 35/45 ARM: OMAP4: dts: Add main and optional clock data into DT
In reply to Tero KristoFrom: Rajendra Nayak <[email protected]>
With support to parse clock data from DT, move all main and optional clock information from hwmod to DT.
We still retain clocks in hwmod for devices which do not have a DT node.
--- arch/arm/boot/dts/omap4.dtsi | 100 +++++++++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 109 ---------------------------- 2 files changed, 100 insertions(+), 109 deletions(-)
arch/arm/boot/dts/omap4.dtsi +100 -0
@@ -107,6 +107,8 @@ compatible = "ti,omap-counter32k"; reg = <0x4a304000 0x20>; ti,hwmods = "counter_32k"; + clocks = <&sys_32k_ck>; + clock-names = "fck"; }; omap4_pmx_core: pinmux at 4a100040 {
@@ -136,6 +138,8 @@ #dma-cells = <1>; #dma-channels = <32>; #dma-requests = <127>; + clocks = <&l3_div_ck>; + clock-names = "fck"; }; gpio1: gpio at 4a310000 {
@@ -143,6 +147,8 @@ reg = <0x4a310000 0x200>; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio1"; + clocks = <&l4_wkup_clk_mux_ck>, <&gpio1_dbclk>; + clock-names = "fck", "dbclk"; ti,gpio-always-on; gpio-controller; #gpio-cells = <2>;
@@ -155,6 +161,8 @@ reg = <0x48055000 0x200>; interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio2"; + clocks = <&l4_div_ck>, <&gpio2_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -166,6 +174,8 @@ reg = <0x48057000 0x200>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio3"; + clocks = <&l4_div_ck>, <&gpio3_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -177,6 +187,8 @@ reg = <0x48059000 0x200>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio4"; + clocks = <&l4_div_ck>, <&gpio4_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -188,6 +200,8 @@ reg = <0x4805b000 0x200>; interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio5"; + clocks = <&l4_div_ck>, <&gpio5_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -199,6 +213,8 @@ reg = <0x4805d000 0x200>; interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio6"; + clocks = <&l4_div_ck>, <&gpio6_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -221,6 +237,8 @@ reg = <0x4806a000 0x100>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart1"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -229,6 +247,8 @@ reg = <0x4806c000 0x100>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart2"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -237,6 +257,8 @@ reg = <0x48020000 0x100>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart3"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -245,6 +267,8 @@ reg = <0x4806e000 0x100>; interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart4"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -255,6 +279,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c1"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; }; i2c2: i2c at 48072000 {
@@ -264,6 +290,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c2"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; }; i2c3: i2c at 48060000 {
@@ -273,6 +301,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c3"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; }; i2c4: i2c at 48350000 {
@@ -282,6 +312,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c4"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; }; mcspi1: spi at 48098000 {
@@ -291,6 +323,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi1"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <4>; dmas = <&sdma 35>, <&sdma 36>,
@@ -311,6 +345,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi2"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <2>; dmas = <&sdma 43>, <&sdma 44>,
@@ -326,6 +362,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi3"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <2>; dmas = <&sdma 15>, <&sdma 16>; dma-names = "tx0", "rx0";
@@ -338,6 +376,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi4"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <1>; dmas = <&sdma 70>, <&sdma 71>; dma-names = "tx0", "rx0";
@@ -348,6 +388,8 @@ reg = <0x4809c000 0x400>; interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc1"; + clocks = <&hsmmc1_fclk>; + clock-names = "fck"; ti,dual-volt; ti,needs-special-reset; dmas = <&sdma 61>, <&sdma 62>;
@@ -359,6 +401,8 @@ reg = <0x480b4000 0x400>; interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc2"; + clocks = <&hsmmc2_fclk>; + clock-names = "fck"; ti,needs-special-reset; dmas = <&sdma 47>, <&sdma 48>; dma-names = "tx", "rx";
@@ -369,6 +413,8 @@ reg = <0x480ad000 0x400>; interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc3"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,needs-special-reset; dmas = <&sdma 77>, <&sdma 78>; dma-names = "tx", "rx";
@@ -379,6 +425,8 @@ reg = <0x480d1000 0x400>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc4"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,needs-special-reset; dmas = <&sdma 57>, <&sdma 58>; dma-names = "tx", "rx";
@@ -389,6 +437,8 @@ reg = <0x480d5000 0x400>; interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc5"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,needs-special-reset; dmas = <&sdma 59>, <&sdma 60>; dma-names = "tx", "rx";
@@ -399,6 +449,8 @@ reg = <0x4a314000 0x80>; interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "wd_timer2"; + clocks = <&sys_32k_ck>; + clock-names = "fck"; }; mcpdm: mcpdm at 40132000 {
@@ -408,6 +460,8 @@ reg-names = "mpu", "dma"; interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mcpdm"; + clocks = <&pad_clks_ck>; + clock-names = "fck"; dmas = <&sdma 65>, <&sdma 66>; dma-names = "up_link", "dn_link";
@@ -420,6 +474,8 @@ reg-names = "mpu", "dma"; interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "dmic"; + clocks = <&func_dmic_abe_gfclk>; + clock-names = "fck"; dmas = <&sdma 67>; dma-names = "up_link"; };
@@ -433,6 +489,8 @@ interrupt-names = "common"; ti,buffer-size = <128>; ti,hwmods = "mcbsp1"; + clocks = <&func_mcbsp1_gfclk>, <&pad_clks_ck>, <&mcbsp1_sync_mux_ck>; + clock-names = "fck", "pad_fck", "prcm_fck"; dmas = <&sdma 33>, <&sdma 34>; dma-names = "tx", "rx";
@@ -447,6 +505,8 @@ interrupt-names = "common"; ti,buffer-size = <128>; ti,hwmods = "mcbsp2"; + clocks = <&func_mcbsp2_gfclk>, <&pad_clks_ck>, <&mcbsp2_sync_mux_ck>; + clock-names = "fck", "pad_fck", "prcm_fck"; dmas = <&sdma 17>, <&sdma 18>; dma-names = "tx", "rx";
@@ -461,6 +521,8 @@ interrupt-names = "common"; ti,buffer-size = <128>; ti,hwmods = "mcbsp3"; + clocks = <&func_mcbsp3_gfclk>, <&pad_clks_ck>, <&mcbsp3_sync_mux_ck>; + clock-names = "fck", "pad_fck", "prcm_fck"; dmas = <&sdma 19>, <&sdma 20>; dma-names = "tx", "rx";
@@ -474,6 +536,8 @@ interrupt-names = "common"; ti,buffer-size = <128>; ti,hwmods = "mcbsp4"; + clocks = <&per_mcbsp4_gfclk>, <&pad_clks_ck>, <&mcbsp4_sync_mux_ck>; + clock-names = "fck", "pad_fck", "prcm_fck"; dmas = <&sdma 31>, <&sdma 32>; dma-names = "tx", "rx";
@@ -485,6 +549,8 @@ interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; reg-names = "mpu"; ti,hwmods = "kbd"; + clocks = <&sys_32k_ck>; + clock-names = "fck"; }; emif1: emif at 4c000000 {
@@ -492,6 +558,8 @@ reg = <0x4c000000 0x100>; interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "emif1"; + clocks = <&ddrphy_ck>; + clock-names = "fck"; phy-type = <1>; hw-caps-read-idle-ctrl; hw-caps-ll-interface;
@@ -503,6 +571,8 @@ reg = <0x4d000000 0x100>; interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "emif2"; + clocks = <&ddrphy_ck>; + clock-names = "fck"; phy-type = <1>; hw-caps-read-idle-ctrl; hw-caps-ll-interface;
@@ -516,6 +586,8 @@ #size-cells = <1>; ranges; ti,hwmods = "ocp2scp_usb_phy"; + clocks = <&ocp2scp_usb_phy_phy_48m>; + clock-names = "fck"; usb2_phy: usb2phy at 4a0ad080 { compatible = "ti,omap-usb2"; reg = <0x4a0ad080 0x58>;
@@ -528,6 +600,8 @@ reg = <0x4a318000 0x80>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer1"; + clocks = <&dmt1_clk_mux>; + clock-names = "fck"; ti,timer-alwon; };
@@ -536,6 +610,8 @@ reg = <0x48032000 0x80>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer2"; + clocks = <&cm2_dm2_mux>; + clock-names = "fck"; }; timer3: timer at 48034000 {
@@ -543,6 +619,8 @@ reg = <0x48034000 0x80>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer3"; + clocks = <&cm2_dm3_mux>; + clock-names = "fck"; }; timer4: timer at 48036000 {
@@ -550,6 +628,8 @@ reg = <0x48036000 0x80>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer4"; + clocks = <&cm2_dm4_mux>; + clock-names = "fck"; }; timer5: timer at 40138000 {
@@ -558,6 +638,8 @@ <0x49038000 0x80>; interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer5"; + clocks = <&timer5_sync_mux>; + clock-names = "fck"; ti,timer-dsp; };
@@ -567,6 +649,8 @@ <0x4903a000 0x80>; interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer6"; + clocks = <&timer6_sync_mux>; + clock-names = "fck"; ti,timer-dsp; };
@@ -576,6 +660,8 @@ <0x4903c000 0x80>; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer7"; + clocks = <&timer7_sync_mux>; + clock-names = "fck"; ti,timer-dsp; };
@@ -585,6 +671,8 @@ <0x4903e000 0x80>; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer8"; + clocks = <&timer8_sync_mux>; + clock-names = "fck"; ti,timer-pwm; ti,timer-dsp; };
@@ -594,6 +682,8 @@ reg = <0x4803e000 0x80>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer9"; + clocks = <&cm2_dm9_mux>; + clock-names = "fck"; ti,timer-pwm; };
@@ -602,6 +692,8 @@ reg = <0x48086000 0x80>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer10"; + clocks = <&cm2_dm10_mux>; + clock-names = "fck"; ti,timer-pwm; };
@@ -610,6 +702,8 @@ reg = <0x48088000 0x80>; interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer11"; + clocks = <&cm2_dm11_mux>; + clock-names = "fck"; ti,timer-pwm; };
@@ -618,12 +712,16 @@ reg = <0x4a062000 0x1000>; interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "usb_tll_hs"; + clocks = <&usb_tll_hs_ick>; + clock-names = "fck"; }; usbhshost: usbhshost at 4a064000 { compatible = "ti,usbhs-host"; reg = <0x4a064000 0x800>; ti,hwmods = "usb_host_hs"; + clocks = <&usb_host_hs_fck>; + clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; ranges;
@@ -657,6 +755,8 @@ interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "mc", "dma"; ti,hwmods = "usb_otg_hs"; + clocks = <&usb_otg_hs_ick>, <&usb_otg_hs_xclk>; + clock-names = "fck", "xclk"; usb-phy = <&usb2_phy>; multipoint = <1>; num-eps = <16>;
arch/arm/mach-omap2/omap_hwmod_44xx_data.c +0 -109
517 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v6 36/45 ARM: dts: omap3: Add main and optional clock data into DT
In reply to Tero KristoWith support to partse clock data from DT, move all main and optional clock information from hwmod to DT.
We still retain clocks in hwmod for devices which do not have a DT node.
Also, this patch does not remove the clock info from hwmod yet, to retain legacy boot mode support.
--- arch/arm/boot/dts/omap3.dtsi | 82 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)
arch/arm/boot/dts/omap3.dtsi +82 -0
@@ -80,6 +80,8 @@ compatible = "ti,omap-counter32k"; reg = <0x48320000 0x20>; ti,hwmods = "counter_32k"; + clocks = <&wkup_32k_fck>; + clock-names = "fck"; }; intc: interrupt-controller at 48200000 {
@@ -100,6 +102,8 @@ #dma-cells = <1>; #dma-channels = <32>; #dma-requests = <96>; + clocks = <&core_l3_ick>; + clock-names = "fck"; }; omap3_pmx_core: pinmux at 48002030 {
@@ -125,6 +129,8 @@ reg = <0x48310000 0x200>; interrupts = <29>; ti,hwmods = "gpio1"; + clocks = <&gpio1_ick>, <&gpio1_dbck>; + clock-names = "fck", "dbclk"; ti,gpio-always-on; gpio-controller; #gpio-cells = <2>;
@@ -137,6 +143,8 @@ reg = <0x49050000 0x200>; interrupts = <30>; ti,hwmods = "gpio2"; + clocks = <&gpio2_ick>, <&gpio2_dbck>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -148,6 +156,8 @@ reg = <0x49052000 0x200>; interrupts = <31>; ti,hwmods = "gpio3"; + clocks = <&gpio3_ick>, <&gpio3_dbck>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -159,6 +169,8 @@ reg = <0x49054000 0x200>; interrupts = <32>; ti,hwmods = "gpio4"; + clocks = <&gpio4_ick>, <&gpio4_dbck>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -170,6 +182,8 @@ reg = <0x49056000 0x200>; interrupts = <33>; ti,hwmods = "gpio5"; + clocks = <&gpio5_ick>, <&gpio5_dbck>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -181,6 +195,8 @@ reg = <0x49058000 0x200>; interrupts = <34>; ti,hwmods = "gpio6"; + clocks = <&gpio6_ick>, <&gpio6_dbck>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -190,18 +206,24 @@ uart1: serial at 4806a000 { compatible = "ti,omap3-uart"; ti,hwmods = "uart1"; + clocks = <&uart1_fck>; + clock-names = "fck"; clock-frequency = <48000000>; }; uart2: serial at 4806c000 { compatible = "ti,omap3-uart"; ti,hwmods = "uart2"; + clocks = <&uart2_fck>; + clock-names = "fck"; clock-frequency = <48000000>; }; uart3: serial at 49020000 { compatible = "ti,omap3-uart"; ti,hwmods = "uart3"; + clocks = <&uart3_fck>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -210,6 +232,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c1"; + clocks = <&i2c1_fck>; + clock-names = "fck"; }; i2c2: i2c at 48072000 {
@@ -217,6 +241,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c2"; + clocks = <&i2c2_fck>; + clock-names = "fck"; }; i2c3: i2c at 48060000 {
@@ -224,6 +250,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c3"; + clocks = <&i2c3_fck>; + clock-names = "fck"; }; mcspi1: spi at 48098000 {
@@ -231,6 +259,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi1"; + clocks = <&mcspi1_fck>; + clock-names = "fck"; ti,spi-num-cs = <4>; dmas = <&sdma 35>, <&sdma 36>,
@@ -249,6 +279,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi2"; + clocks = <&mcspi2_fck>; + clock-names = "fck"; ti,spi-num-cs = <2>; dmas = <&sdma 43>, <&sdma 44>,
@@ -262,6 +294,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi3"; + clocks = <&mcspi3_fck>; + clock-names = "fck"; ti,spi-num-cs = <2>; dmas = <&sdma 15>, <&sdma 16>,
@@ -275,6 +309,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi4"; + clocks = <&mcspi4_fck>; + clock-names = "fck"; ti,spi-num-cs = <1>; dmas = <&sdma 70>, <&sdma 71>; dma-names = "tx0", "rx0";
@@ -283,6 +319,8 @@ mmc1: mmc at 4809c000 { compatible = "ti,omap3-hsmmc"; ti,hwmods = "mmc1"; + clocks = <&mmchs1_fck>, <&omap_32k_fck>; + clock-names = "fck", "dbck"; ti,dual-volt; dmas = <&sdma 61>, <&sdma 62>; dma-names = "tx", "rx";
@@ -291,6 +329,8 @@ mmc2: mmc at 480b4000 { compatible = "ti,omap3-hsmmc"; ti,hwmods = "mmc2"; + clocks = <&mmchs2_fck>, <&omap_32k_fck>; + clock-names = "fck", "dbck"; dmas = <&sdma 47>, <&sdma 48>; dma-names = "tx", "rx"; };
@@ -298,6 +338,8 @@ mmc3: mmc at 480ad000 { compatible = "ti,omap3-hsmmc"; ti,hwmods = "mmc3"; + clocks = <&mmchs3_fck>, <&omap_32k_fck>; + clock-names = "fck", "dbck"; dmas = <&sdma 77>, <&sdma 78>; dma-names = "tx", "rx"; };
@@ -305,6 +347,8 @@ wdt2: wdt at 48314000 { compatible = "ti,omap3-wdt"; ti,hwmods = "wd_timer2"; + clocks = <&wdt2_fck>; + clock-names = "fck"; }; mcbsp1: mcbsp at 48074000 {
@@ -317,6 +361,8 @@ interrupt-names = "common", "tx", "rx"; ti,buffer-size = <128>; ti,hwmods = "mcbsp1"; + clocks = <&mcbsp1_fck>, <&mcbsp_clks>, <&core_96m_fck>; + clock-names = "fck", "pad_fck", "prcm_fck"; dmas = <&sdma 31>, <&sdma 32>; dma-names = "tx", "rx";
@@ -366,6 +412,8 @@ interrupt-names = "common", "tx", "rx"; ti,buffer-size = <128>; ti,hwmods = "mcbsp4"; + clocks = <&mcbsp4_fck>, <&mcbsp_clks>, <&per_96m_fck>; + clock-names = "fck", "pad_fck", "prcm_fck"; dmas = <&sdma 19>, <&sdma 20>; dma-names = "tx", "rx";
@@ -381,6 +429,8 @@ interrupt-names = "common", "tx", "rx"; ti,buffer-size = <128>; ti,hwmods = "mcbsp5"; + clocks = <&mcbsp5_fck>, <&mcbsp_clks>, <&core_96m_fck>; + clock-names = "fck", "pad_fck", "prcm_fck"; dmas = <&sdma 21>, <&sdma 22>; dma-names = "tx", "rx";
@@ -391,6 +441,8 @@ reg = <0x48318000 0x400>; interrupts = <37>; ti,hwmods = "timer1"; + clocks = <&gpt1_fck>; + clock-names = "fck"; ti,timer-alwon; };
@@ -399,6 +451,8 @@ reg = <0x49032000 0x400>; interrupts = <38>; ti,hwmods = "timer2"; + clocks = <&gpt2_fck>; + clock-names = "fck"; }; timer3: timer at 49034000 {
@@ -406,6 +460,8 @@ reg = <0x49034000 0x400>; interrupts = <39>; ti,hwmods = "timer3"; + clocks = <&gpt3_fck>; + clock-names = "fck"; }; timer4: timer at 49036000 {
@@ -413,6 +469,8 @@ reg = <0x49036000 0x400>; interrupts = <40>; ti,hwmods = "timer4"; + clocks = <&gpt4_fck>; + clock-names = "fck"; }; timer5: timer at 49038000 {
@@ -420,6 +478,8 @@ reg = <0x49038000 0x400>; interrupts = <41>; ti,hwmods = "timer5"; + clocks = <&gpt5_fck>; + clock-names = "fck"; ti,timer-dsp; };
@@ -428,6 +488,8 @@ reg = <0x4903a000 0x400>; interrupts = <42>; ti,hwmods = "timer6"; + clocks = <&gpt6_fck>; + clock-names = "fck"; ti,timer-dsp; };
@@ -436,6 +498,8 @@ reg = <0x4903c000 0x400>; interrupts = <43>; ti,hwmods = "timer7"; + clocks = <&gpt7_fck>; + clock-names = "fck"; ti,timer-dsp; };
@@ -444,6 +508,8 @@ reg = <0x4903e000 0x400>; interrupts = <44>; ti,hwmods = "timer8"; + clocks = <&gpt8_fck>; + clock-names = "fck"; ti,timer-pwm; ti,timer-dsp; };
@@ -453,6 +519,8 @@ reg = <0x49040000 0x400>; interrupts = <45>; ti,hwmods = "timer9"; + clocks = <&gpt9_fck>; + clock-names = "fck"; ti,timer-pwm; };
@@ -461,6 +529,8 @@ reg = <0x48086000 0x400>; interrupts = <46>; ti,hwmods = "timer10"; + clocks = <&gpt10_fck>; + clock-names = "fck"; ti,timer-pwm; };
@@ -469,6 +539,8 @@ reg = <0x48088000 0x400>; interrupts = <47>; ti,hwmods = "timer11"; + clocks = <&gpt11_fck>; + clock-names = "fck"; ti,timer-pwm; };
@@ -477,6 +549,8 @@ reg = <0x48304000 0x400>; interrupts = <95>; ti,hwmods = "timer12"; + clocks = <&gpt12_fck>; + clock-names = "fck"; ti,timer-alwon; ti,timer-secure; };
@@ -486,12 +560,16 @@ reg = <0x48062000 0x1000>; interrupts = <78>; ti,hwmods = "usb_tll_hs"; + clocks = <&usbtll_fck>; + clock-names = "fck"; }; usbhshost: usbhshost at 48064000 { compatible = "ti,usbhs-host"; reg = <0x48064000 0x400>; ti,hwmods = "usb_host_hs"; + clocks = <&usbhost_48m_fck>, <&usbhost_120m_fck>; + clock-names = "fck", "ehci_logic_fck"; #address-cells = <1>; #size-cells = <1>; ranges;
@@ -514,6 +592,8 @@ gpmc: gpmc at 6e000000 { compatible = "ti,omap3430-gpmc"; ti,hwmods = "gpmc"; + clocks = <&gpmc_fck>; + clock-names = "fck"; reg = <0x6e000000 0x02d0>; interrupts = <20>; gpmc,num-cs = <8>;
@@ -528,6 +608,8 @@ interrupts = <92>, <93>; interrupt-names = "mc", "dma"; ti,hwmods = "usb_otg_hs"; + clocks = <&hsotgusb_ick>; + clock-names = "fck"; multipoint = <1>; num-eps = <16>; ram-bits = <12>;
Signature · 1 line
1.7.9.5
PATCH v6 37/45 ARM: OMAP3: hwmod_data: remove main and optional clock info from hwmod
In reply to Tero KristoWith support to parse clock data from DT, remove the main and optional clock information from hwmod.
We still retain clocks in hwmod for devices which do not have a DT node.
NOTE: This patch should only be merged once non-DT boot support for OMAP3 is no longer needed.
--- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 119 ---------------------------- 1 file changed, 119 deletions(-)
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +0 -119
@@ -200,7 +200,6 @@ static struct omap_timer_capability_dev_attr capability_dsp_pwm_dev_attr = {static struct omap_hwmod omap3xxx_timer1_hwmod = { .name ="timer1" , .mpu_irqs = omap2_timer1_mpu_irqs, - .main_clk ="gpt1_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -219,7 +218,6 @@ static struct omap_hwmod omap3xxx_timer1_hwmod = {static struct omap_hwmod omap3xxx_timer2_hwmod = { .name ="timer2" , .mpu_irqs = omap2_timer2_mpu_irqs, - .main_clk ="gpt2_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -237,7 +235,6 @@ static struct omap_hwmod omap3xxx_timer2_hwmod = {static struct omap_hwmod omap3xxx_timer3_hwmod = { .name ="timer3" , .mpu_irqs = omap2_timer3_mpu_irqs, - .main_clk ="gpt3_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -255,7 +252,6 @@ static struct omap_hwmod omap3xxx_timer3_hwmod = {static struct omap_hwmod omap3xxx_timer4_hwmod = { .name ="timer4" , .mpu_irqs = omap2_timer4_mpu_irqs, - .main_clk ="gpt4_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -273,7 +269,6 @@ static struct omap_hwmod omap3xxx_timer4_hwmod = {static struct omap_hwmod omap3xxx_timer5_hwmod = { .name ="timer5" , .mpu_irqs = omap2_timer5_mpu_irqs, - .main_clk ="gpt5_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -292,7 +287,6 @@ static struct omap_hwmod omap3xxx_timer5_hwmod = {static struct omap_hwmod omap3xxx_timer6_hwmod = { .name ="timer6" , .mpu_irqs = omap2_timer6_mpu_irqs, - .main_clk ="gpt6_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -311,7 +305,6 @@ static struct omap_hwmod omap3xxx_timer6_hwmod = {static struct omap_hwmod omap3xxx_timer7_hwmod = { .name ="timer7" , .mpu_irqs = omap2_timer7_mpu_irqs, - .main_clk ="gpt7_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -330,7 +323,6 @@ static struct omap_hwmod omap3xxx_timer7_hwmod = {static struct omap_hwmod omap3xxx_timer8_hwmod = { .name ="timer8" , .mpu_irqs = omap2_timer8_mpu_irqs, - .main_clk ="gpt8_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -349,7 +341,6 @@ static struct omap_hwmod omap3xxx_timer8_hwmod = {static struct omap_hwmod omap3xxx_timer9_hwmod = { .name ="timer9" , .mpu_irqs = omap2_timer9_mpu_irqs, - .main_clk ="gpt9_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -368,7 +359,6 @@ static struct omap_hwmod omap3xxx_timer9_hwmod = {static struct omap_hwmod omap3xxx_timer10_hwmod = { .name ="timer10" , .mpu_irqs = omap2_timer10_mpu_irqs, - .main_clk ="gpt10_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -387,7 +377,6 @@ static struct omap_hwmod omap3xxx_timer10_hwmod = {static struct omap_hwmod omap3xxx_timer11_hwmod = { .name ="timer11" , .mpu_irqs = omap2_timer11_mpu_irqs, - .main_clk ="gpt11_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -411,7 +400,6 @@ static struct omap_hwmod_irq_info omap3xxx_timer12_mpu_irqs[] = {static struct omap_hwmod omap3xxx_timer12_hwmod = { .name ="timer12" , .mpu_irqs = omap3xxx_timer12_mpu_irqs, - .main_clk ="gpt12_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -467,7 +455,6 @@ static struct omap_hwmod_class omap3xxx_wd_timer_hwmod_class = {static struct omap_hwmod omap3xxx_wd_timer2_hwmod = { .name ="wd_timer2" , .class = &omap3xxx_wd_timer_hwmod_class, - .main_clk ="wdt2_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -489,7 +476,6 @@ static struct omap_hwmod omap3xxx_uart1_hwmod = { .name = "uart1", .mpu_irqs = omap2_uart1_mpu_irqs, .sdma_reqs = omap2_uart1_sdma_reqs, - .main_clk = "uart1_fck", .flags = DEBUG_TI81XXUART1_FLAGS | HWMOD_SWSUP_SIDLE_ACT, .prcm = { .omap2 = {
@@ -508,7 +494,6 @@ static struct omap_hwmod omap3xxx_uart2_hwmod = { .name = "uart2", .mpu_irqs = omap2_uart2_mpu_irqs, .sdma_reqs = omap2_uart2_sdma_reqs, - .main_clk = "uart2_fck", .flags = DEBUG_TI81XXUART2_FLAGS | HWMOD_SWSUP_SIDLE_ACT, .prcm = { .omap2 = {
@@ -527,7 +512,6 @@ static struct omap_hwmod omap3xxx_uart3_hwmod = { .name = "uart3", .mpu_irqs = omap2_uart3_mpu_irqs, .sdma_reqs = omap2_uart3_sdma_reqs, - .main_clk = "uart3_fck", .flags = DEBUG_OMAP3UART3_FLAGS | DEBUG_TI81XXUART3_FLAGS | HWMOD_SWSUP_SIDLE_ACT, .prcm = {
@@ -807,7 +791,6 @@ static struct omap_hwmod omap3xxx_i2c1_hwmod = { .flags = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT, .mpu_irqs = omap2_i2c1_mpu_irqs, .sdma_reqs = omap2_i2c1_sdma_reqs, - .main_clk = "i2c1_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -832,7 +815,6 @@ static struct omap_hwmod omap3xxx_i2c2_hwmod = { .flags = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT, .mpu_irqs = omap2_i2c2_mpu_irqs, .sdma_reqs = omap2_i2c2_sdma_reqs, - .main_clk = "i2c2_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -868,7 +850,6 @@ static struct omap_hwmod omap3xxx_i2c3_hwmod = { .flags = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT, .mpu_irqs = i2c3_mpu_irqs, .sdma_reqs = i2c3_sdma_reqs, - .main_clk = "i2c3_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -911,17 +892,11 @@ static struct omap_gpio_dev_attr gpio_dev_attr = { };/* gpio1 */ -static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio1_dbck" , }, -};static struct omap_hwmod omap3xxx_gpio1_hwmod = { .name ="gpio1" , .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , .mpu_irqs = omap2_gpio1_irqs, - .main_clk ="gpio1_ick" , - .opt_clks = gpio1_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio1_opt_clks), .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -936,17 +911,11 @@ static struct omap_hwmod omap3xxx_gpio1_hwmod = { };/* gpio2 */ -static struct omap_hwmod_opt_clk gpio2_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio2_dbck" , }, -};static struct omap_hwmod omap3xxx_gpio2_hwmod = { .name ="gpio2" , .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , .mpu_irqs = omap2_gpio2_irqs, - .main_clk ="gpio2_ick" , - .opt_clks = gpio2_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio2_opt_clks), .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -961,17 +930,11 @@ static struct omap_hwmod omap3xxx_gpio2_hwmod = { };/* gpio3 */ -static struct omap_hwmod_opt_clk gpio3_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio3_dbck" , }, -};static struct omap_hwmod omap3xxx_gpio3_hwmod = { .name ="gpio3" , .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , .mpu_irqs = omap2_gpio3_irqs, - .main_clk ="gpio3_ick" , - .opt_clks = gpio3_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio3_opt_clks), .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -986,17 +949,11 @@ static struct omap_hwmod omap3xxx_gpio3_hwmod = { };/* gpio4 */ -static struct omap_hwmod_opt_clk gpio4_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio4_dbck" , }, -};static struct omap_hwmod omap3xxx_gpio4_hwmod = { .name ="gpio4" , .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , .mpu_irqs = omap2_gpio4_irqs, - .main_clk ="gpio4_ick" , - .opt_clks = gpio4_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio4_opt_clks), .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -1016,17 +973,11 @@ static struct omap_hwmod_irq_info omap3xxx_gpio5_irqs[] = { { .irq = -1 }, }; -static struct omap_hwmod_opt_clk gpio5_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio5_dbck" , }, -};static struct omap_hwmod omap3xxx_gpio5_hwmod = { .name ="gpio5" , .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , .mpu_irqs = omap3xxx_gpio5_irqs, - .main_clk ="gpio5_ick" , - .opt_clks = gpio5_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio5_opt_clks), .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -1046,17 +997,11 @@ static struct omap_hwmod_irq_info omap3xxx_gpio6_irqs[] = { { .irq = -1 }, }; -static struct omap_hwmod_opt_clk gpio6_opt_clks[] = { - { .role ="dbclk" , .clk ="gpio6_dbck" , }, -};static struct omap_hwmod omap3xxx_gpio6_hwmod = { .name ="gpio6" , .flags =HWMOD_CONTROL_OPT_CLKS_IN_RESET , .mpu_irqs = omap3xxx_gpio6_irqs, - .main_clk ="gpio6_ick" , - .opt_clks = gpio6_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (gpio6_opt_clks), .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -1100,7 +1045,6 @@ static struct omap_hwmod omap3xxx_dma_system_hwmod = { .name = "dma", .class = &omap3xxx_dma_hwmod_class, .mpu_irqs = omap2_dma_system_irqs, - .main_clk = "core_l3_ick", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -1135,15 +1079,7 @@ static struct omap_hwmod_class omap3xxx_mcbsp_hwmod_class = { };/* McBSP functional clock mapping */ -static struct omap_hwmod_opt_clk mcbsp15_opt_clks[] = { - { .role ="pad_fck" , .clk ="mcbsp_clks" }, - { .role ="prcm_fck" , .clk ="core_96m_fck" }, -}; -static struct omap_hwmod_opt_clk mcbsp234_opt_clks[] = { - { .role ="pad_fck" , .clk ="mcbsp_clks" }, - { .role ="prcm_fck" , .clk ="per_96m_fck" }, -};/* mcbsp1 */ static struct omap_hwmod_irq_info omap3xxx_mcbsp1_irqs[] = {
@@ -1158,7 +1094,6 @@ static struct omap_hwmod omap3xxx_mcbsp1_hwmod = { .class = &omap3xxx_mcbsp_hwmod_class, .mpu_irqs = omap3xxx_mcbsp1_irqs, .sdma_reqs = omap2_mcbsp1_sdma_reqs, - .main_clk = "mcbsp1_fck", .prcm = { .omap2 = { .prcm_reg_id = 1,
@@ -1168,8 +1103,6 @@ static struct omap_hwmod omap3xxx_mcbsp1_hwmod = { .idlest_idle_bit = OMAP3430_ST_MCBSP1_SHIFT, }, }, - .opt_clks = mcbsp15_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(mcbsp15_opt_clks), };/* mcbsp2 */
@@ -1189,7 +1122,6 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = { .class = &omap3xxx_mcbsp_hwmod_class, .mpu_irqs = omap3xxx_mcbsp2_irqs, .sdma_reqs = omap2_mcbsp2_sdma_reqs, - .main_clk = "mcbsp2_fck", .prcm = { .omap2 = { .prcm_reg_id = 1,
@@ -1199,8 +1131,6 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = { .idlest_idle_bit = OMAP3430_ST_MCBSP2_SHIFT, }, }, - .opt_clks = mcbsp234_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(mcbsp234_opt_clks), .dev_attr = &omap34xx_mcbsp2_dev_attr, };
@@ -1221,7 +1151,6 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = { .class = &omap3xxx_mcbsp_hwmod_class, .mpu_irqs = omap3xxx_mcbsp3_irqs, .sdma_reqs = omap2_mcbsp3_sdma_reqs, - .main_clk = "mcbsp3_fck", .prcm = { .omap2 = { .prcm_reg_id = 1,
@@ -1231,8 +1160,6 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = { .idlest_idle_bit = OMAP3430_ST_MCBSP3_SHIFT, }, }, - .opt_clks = mcbsp234_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(mcbsp234_opt_clks), .dev_attr = &omap34xx_mcbsp3_dev_attr, };
@@ -1255,7 +1182,6 @@ static struct omap_hwmod omap3xxx_mcbsp4_hwmod = { .class = &omap3xxx_mcbsp_hwmod_class, .mpu_irqs = omap3xxx_mcbsp4_irqs, .sdma_reqs = omap3xxx_mcbsp4_sdma_chs, - .main_clk = "mcbsp4_fck", .prcm = { .omap2 = { .prcm_reg_id = 1,
@@ -1265,8 +1191,6 @@ static struct omap_hwmod omap3xxx_mcbsp4_hwmod = { .idlest_idle_bit = OMAP3430_ST_MCBSP4_SHIFT, }, }, - .opt_clks = mcbsp234_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(mcbsp234_opt_clks), };/* mcbsp5 */
@@ -1288,7 +1212,6 @@ static struct omap_hwmod omap3xxx_mcbsp5_hwmod = { .class = &omap3xxx_mcbsp_hwmod_class, .mpu_irqs = omap3xxx_mcbsp5_irqs, .sdma_reqs = omap3xxx_mcbsp5_sdma_chs, - .main_clk = "mcbsp5_fck", .prcm = { .omap2 = { .prcm_reg_id = 1,
@@ -1298,8 +1221,6 @@ static struct omap_hwmod omap3xxx_mcbsp5_hwmod = { .idlest_idle_bit = OMAP3430_ST_MCBSP5_SHIFT, }, }, - .opt_clks = mcbsp15_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(mcbsp15_opt_clks), };/* 'mcbsp sidetone' class */
@@ -1324,7 +1245,6 @@ static struct omap_hwmod omap3xxx_mcbsp2_sidetone_hwmod = { .name = "mcbsp2_sidetone", .class = &omap3xxx_mcbsp_sidetone_hwmod_class, .mpu_irqs = omap3xxx_mcbsp2_sidetone_irqs, - .main_clk = "mcbsp2_fck", .prcm = { .omap2 = { .prcm_reg_id = 1,
@@ -1346,7 +1266,6 @@ static struct omap_hwmod omap3xxx_mcbsp3_sidetone_hwmod = { .name = "mcbsp3_sidetone", .class = &omap3xxx_mcbsp_sidetone_hwmod_class, .mpu_irqs = omap3xxx_mcbsp3_sidetone_irqs, - .main_clk = "mcbsp3_fck", .prcm = { .omap2 = { .prcm_reg_id = 1,
@@ -1571,7 +1490,6 @@ static struct omap_hwmod omap34xx_mcspi1 = { .name = "mcspi1", .mpu_irqs = omap2_mcspi1_mpu_irqs, .sdma_reqs = omap2_mcspi1_sdma_reqs, - .main_clk = "mcspi1_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -1594,7 +1512,6 @@ static struct omap_hwmod omap34xx_mcspi2 = { .name = "mcspi2", .mpu_irqs = omap2_mcspi2_mpu_irqs, .sdma_reqs = omap2_mcspi2_sdma_reqs, - .main_clk = "mcspi2_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -1630,7 +1547,6 @@ static struct omap_hwmod omap34xx_mcspi3 = { .name = "mcspi3", .mpu_irqs = omap34xx_mcspi3_mpu_irqs, .sdma_reqs = omap34xx_mcspi3_sdma_reqs, - .main_clk = "mcspi3_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -1664,7 +1580,6 @@ static struct omap_hwmod omap34xx_mcspi4 = { .name = "mcspi4", .mpu_irqs = omap34xx_mcspi4_mpu_irqs, .sdma_reqs = omap34xx_mcspi4_sdma_reqs, - .main_clk = "mcspi4_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -1707,7 +1622,6 @@ static struct omap_hwmod_irq_info omap3xxx_usbhsotg_mpu_irqs[] = {static struct omap_hwmod omap3xxx_usbhsotg_hwmod = { .name ="usb_otg_hs" , .mpu_irqs = omap3xxx_usbhsotg_mpu_irqs, - .main_clk ="hsotgusb_ick" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -1782,9 +1696,6 @@ static struct omap_hwmod_dma_info omap34xx_mmc1_sdma_reqs[] = { { .dma_req = -1 } }; -static struct omap_hwmod_opt_clk omap34xx_mmc1_opt_clks[] = { - { .role ="dbck" , .clk ="omap_32k_fck" , }, -};static struct omap_mmc_dev_attr mmc1_dev_attr = { .flags =OMAP_HSMMC_SUPPORTS_DUAL_VOLT ,
@@ -1800,9 +1711,6 @@ static struct omap_hwmod omap3xxx_pre_es3_mmc1_hwmod = { .name = "mmc1", .mpu_irqs = omap34xx_mmc1_mpu_irqs, .sdma_reqs = omap34xx_mmc1_sdma_reqs, - .opt_clks = omap34xx_mmc1_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(omap34xx_mmc1_opt_clks), - .main_clk = "mmchs1_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -1820,9 +1728,6 @@ static struct omap_hwmod omap3xxx_es3plus_mmc1_hwmod = { .name = "mmc1", .mpu_irqs = omap34xx_mmc1_mpu_irqs, .sdma_reqs = omap34xx_mmc1_sdma_reqs, - .opt_clks = omap34xx_mmc1_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(omap34xx_mmc1_opt_clks), - .main_clk = "mmchs1_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -1849,9 +1754,6 @@ static struct omap_hwmod_dma_info omap34xx_mmc2_sdma_reqs[] = { { .dma_req = -1 } }; -static struct omap_hwmod_opt_clk omap34xx_mmc2_opt_clks[] = { - { .role ="dbck" , .clk ="omap_32k_fck" , }, -};/* See 35xx errata 2.1.1.128 in SPRZ278F */ static struct omap_mmc_dev_attr mmc2_pre_es3_dev_attr = {
@@ -1862,9 +1764,6 @@ static struct omap_hwmod omap3xxx_pre_es3_mmc2_hwmod = { .name = "mmc2", .mpu_irqs = omap34xx_mmc2_mpu_irqs, .sdma_reqs = omap34xx_mmc2_sdma_reqs, - .opt_clks = omap34xx_mmc2_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(omap34xx_mmc2_opt_clks), - .main_clk = "mmchs2_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -1882,9 +1781,6 @@ static struct omap_hwmod omap3xxx_es3plus_mmc2_hwmod = { .name = "mmc2", .mpu_irqs = omap34xx_mmc2_mpu_irqs, .sdma_reqs = omap34xx_mmc2_sdma_reqs, - .opt_clks = omap34xx_mmc2_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(omap34xx_mmc2_opt_clks), - .main_clk = "mmchs2_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -1910,17 +1806,11 @@ static struct omap_hwmod_dma_info omap34xx_mmc3_sdma_reqs[] = { { .dma_req = -1 } }; -static struct omap_hwmod_opt_clk omap34xx_mmc3_opt_clks[] = { - { .role ="dbck" , .clk ="omap_32k_fck" , }, -};static struct omap_hwmod omap3xxx_mmc3_hwmod = { .name ="mmc3" , .mpu_irqs = omap34xx_mmc3_mpu_irqs, .sdma_reqs = omap34xx_mmc3_sdma_reqs, - .opt_clks = omap34xx_mmc3_opt_clks, - .opt_clks_cnt =ARRAY_SIZE (omap34xx_mmc3_opt_clks), - .main_clk ="mmchs3_fck" , .prcm = { .omap2 = { .prcm_reg_id =1 ,
@@ -1954,9 +1844,6 @@ static struct omap_hwmod_class omap3xxx_usb_host_hs_hwmod_class = { .sysc = &omap3xxx_usb_host_hs_sysc, }; -static struct omap_hwmod_opt_clk omap3xxx_usb_host_hs_opt_clks[] = { - { .role ="ehci_logic_fck" , .clk ="usbhost_120m_fck" , }, -};static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = { { .name ="ohci-irq" , .irq =76 +OMAP_INTC_START , },
@@ -1969,7 +1856,6 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = { .class = &omap3xxx_usb_host_hs_hwmod_class, .clkdm_name = "l3_init_clkdm", .mpu_irqs = omap3xxx_usb_host_hs_irqs, - .main_clk = "usbhost_48m_fck", .prcm = { .omap2 = { .module_offs = OMAP3430ES2_USBHOST_MOD,
@@ -1980,8 +1866,6 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = { .idlest_stdby_bit = OMAP3430ES2_ST_USBHOST_STDBY_SHIFT, }, }, - .opt_clks = omap3xxx_usb_host_hs_opt_clks, - .opt_clks_cnt = ARRAY_SIZE(omap3xxx_usb_host_hs_opt_clks),/* * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock
@@ -2062,7 +1946,6 @@ static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = { .class = &omap3xxx_usb_tll_hs_hwmod_class, .clkdm_name = "l3_init_clkdm", .mpu_irqs = omap3xxx_usb_tll_hs_irqs, - .main_clk = "usbtll_fck", .prcm = { .omap2 = { .module_offs = CORE_MOD,
@@ -2139,7 +2022,6 @@ static struct omap_hwmod omap3xxx_counter_32k_hwmod = { .class = &omap3xxx_counter_hwmod_class, .clkdm_name = "wkup_clkdm", .flags = HWMOD_SWSUP_SIDLE, - .main_clk = "wkup_32k_fck", .prcm = { .omap2 = { .module_offs = WKUP_MOD,
@@ -2181,7 +2063,6 @@ static struct omap_hwmod omap3xxx_gpmc_hwmod = { .class = &omap3xxx_gpmc_hwmod_class, .clkdm_name = "core_l3_clkdm", .mpu_irqs = omap3xxx_gpmc_irqs, - .main_clk = "gpmc_fck",/* * XXX HWMOD_INIT_NO_RESET should not be needed for this IP * block. It is not being added due to any known bugs with
Signature · 1 line
1.7.9.5
PATCH v6 38/45 ARM: OMAP2+: omap_device: use dev pointer to optimize code
In reply to Tero KristoFrom: Nishanth Menon <[email protected]>
_add_clkdev uses &od->pdev->dev for all reference of device struct.
Simplify the usage with a variable.
--- arch/arm/mach-omap2/omap_device.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
arch/arm/mach-omap2/omap_device.c +7 -9
@@ -47,31 +47,29 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias, {struct clk *r;struct clk_lookup *l; +struct device *dev = &od->pdev->dev;if (!clk_alias || !clk_name)return ; -dev_dbg (&od->pdev->dev,"Creating %s -> %s\n" , clk_alias, clk_name); +dev_dbg (dev,"Creating %s -> %s\n" , clk_alias, clk_name); - r =clk_get_sys (dev_name (&od->pdev->dev), clk_alias); + r =clk_get_sys (dev_name (dev), clk_alias);if (!IS_ERR (r)) { -dev_warn (&od->pdev->dev, -"alias %s already exists\n" , clk_alias); +dev_warn (dev,"alias %s already exists\n" , clk_alias);clk_put (r);return ; } r =clk_get (NULL , clk_name);if (IS_ERR (r)) { -dev_err (&od->pdev->dev, -"clk_get for %s failed\n" , clk_name); +dev_err (dev,"clk_get for %s failed\n" , clk_name);return ; } - l =clkdev_alloc (r, clk_alias,dev_name (&od->pdev->dev)); + l =clkdev_alloc (r, clk_alias,dev_name (dev));if (!l) { -dev_err (&od->pdev->dev, -"clkdev_alloc for %s failed\n" , clk_alias); +dev_err (dev,"clkdev_alloc for %s failed\n" , clk_alias);return ; }
Signature · 1 line
1.7.9.5
PATCH v6 39/45 ARM: OMAP2+: omap_device: no need to add a clock dev for aliases
In reply to Tero KristoFrom: Nishanth Menon <[email protected]>
When we create aliases, we have an handy clk_add_alias which can be used instead of creating new nodes in the clock tree.
--- arch/arm/mach-omap2/omap_device.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-)
arch/arm/mach-omap2/omap_device.c +5 -14
@@ -45,8 +45,8 @@static void _add_clkdev (struct omap_device *od,const char *clk_alias,const char *clk_name) { +int ret;struct clk *r; -struct clk_lookup *l;struct device *dev = &od->pdev->dev;if (!clk_alias || !clk_name)
@@ -61,19 +61,10 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias,return ; } - r =clk_get (NULL , clk_name); -if (IS_ERR (r)) { -dev_err (dev,"clk_get for %s failed\n" , clk_name); -return ; - } - - l =clkdev_alloc (r, clk_alias,dev_name (dev)); -if (!l) { -dev_err (dev,"clkdev_alloc for %s failed\n" , clk_alias); -return ; - } - -clkdev_add (l); + ret =clk_add_alias (clk_alias,dev_name (dev), (char *)clk_name, dev); +if (ret) +dev_err (dev,"Failed to alias %s to %s: %d\n" , clk_alias, + clk_name, ret); }/**
Signature · 1 line
1.7.9.5
PATCH v6 40/45 ARM: OMAP2+: omap_device: use dt aware clk_get to lookup clk
In reply to Tero KristoFrom: Nishanth Menon <[email protected]>
clk_get does a check to find nodes on DT prior to trying clk_get_sys.
To make omap_device dt clock node aware, use clk_get instead of clk_get_sys.
As part of this, add warnings for device node entries which do not declare their own clock nodes for the expected aliases.
--- arch/arm/mach-omap2/omap_device.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/omap_device.c +8 -2
@@ -48,19 +48,25 @@ static void _add_clkdev(struct omap_device *od, const char *clk_alias,int ret;struct clk *r;struct device *dev = &od->pdev->dev; +struct device_node *node = dev->of_node;if (!clk_alias || !clk_name)return ;dev_dbg (dev,"Creating %s -> %s\n" , clk_alias, clk_name); - r =clk_get_sys (dev_name (dev), clk_alias); + r =clk_get (dev, clk_alias);if (!IS_ERR (r)) { -dev_warn (dev,"alias %s already exists\n" , clk_alias); +if (!node) +dev_warn (dev,"alias '%s' already exists\n" , clk_alias);clk_put (r);return ; } +if (node) +dev_err (dev,"FIXME: clock-name '%s' DOES NOT exist in dt!\n" , + clk_alias); + ret =clk_add_alias (clk_alias,dev_name (dev), (char *)clk_name, dev);if (ret) dev_err(dev, "Failed to alias %s to %s: %d\n", clk_alias,
Signature · 1 line
1.7.9.5
PATCH v6 41/45 ARM: dts: omap5: Add main and optional clock data into DT
In reply to Tero KristoWith support to parse clock data from DT, move all main and optional clock information from hwmod to DT.
We still retain clocks in hwmod for devices which do not have a DT node.
--- arch/arm/boot/dts/omap5.dtsi | 102 ++++++++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 119 ---------------------------- 2 files changed, 102 insertions(+), 119 deletions(-)
arch/arm/boot/dts/omap5.dtsi +102 -0
@@ -100,6 +100,8 @@ compatible = "ti,omap-counter32k"; reg = <0x4ae04000 0x40>; ti,hwmods = "counter_32k"; + clocks = <&wkupaon_iclk_mux>; + clock-names = "fck"; }; omap5_pmx_core: pinmux at 4a002840 {
@@ -129,6 +131,8 @@ #dma-cells = <1>; #dma-channels = <32>; #dma-requests = <127>; + clocks = <&l3_iclk_div>; + clock-names = "fck"; }; gpio1: gpio at 4ae10000 {
@@ -136,6 +140,8 @@ reg = <0x4ae10000 0x200>; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio1"; + clocks = <&wkupaon_iclk_mux>, <&gpio1_dbclk>; + clock-names = "fck", "dbclk"; ti,gpio-always-on; gpio-controller; #gpio-cells = <2>;
@@ -148,6 +154,8 @@ reg = <0x48055000 0x200>; interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio2"; + clocks = <&l4_root_clk_div>, <&gpio2_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -159,6 +167,8 @@ reg = <0x48057000 0x200>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio3"; + clocks = <&l4_root_clk_div>, <&gpio3_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -170,6 +180,8 @@ reg = <0x48059000 0x200>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio4"; + clocks = <&l4_root_clk_div>, <&gpio4_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -181,6 +193,8 @@ reg = <0x4805b000 0x200>; interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio5"; + clocks = <&l4_root_clk_div>, <&gpio5_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -192,6 +206,8 @@ reg = <0x4805d000 0x200>; interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio6"; + clocks = <&l4_root_clk_div>, <&gpio6_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -203,6 +219,8 @@ reg = <0x48051000 0x200>; interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio7"; + clocks = <&l4_root_clk_div>, <&gpio7_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -214,6 +232,8 @@ reg = <0x48053000 0x200>; interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio8"; + clocks = <&l4_root_clk_div>, <&gpio8_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -238,6 +258,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c1"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; }; i2c2: i2c at 48072000 {
@@ -247,6 +269,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c2"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; }; i2c3: i2c at 48060000 {
@@ -256,6 +280,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c3"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; }; i2c4: i2c at 4807a000 {
@@ -265,6 +291,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c4"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; }; i2c5: i2c at 4807c000 {
@@ -274,6 +302,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c5"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; }; mcspi1: spi at 48098000 {
@@ -283,6 +313,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi1"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <4>; dmas = <&sdma 35>, <&sdma 36>,
@@ -303,6 +335,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi2"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <2>; dmas = <&sdma 43>, <&sdma 44>,
@@ -318,6 +352,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi3"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <2>; dmas = <&sdma 15>, <&sdma 16>; dma-names = "tx0", "rx0";
@@ -330,6 +366,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi4"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <1>; dmas = <&sdma 70>, <&sdma 71>; dma-names = "tx0", "rx0";
@@ -340,6 +378,8 @@ reg = <0x4806a000 0x100>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart1"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -348,6 +388,8 @@ reg = <0x4806c000 0x100>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart2"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -356,6 +398,8 @@ reg = <0x48020000 0x100>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart3"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -364,6 +408,8 @@ reg = <0x4806e000 0x100>; interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart4"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -372,6 +418,8 @@ reg = <0x48066000 0x100>; interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart5"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -380,6 +428,8 @@ reg = <0x48068000 0x100>; interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart6"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; clock-frequency = <48000000>; };
@@ -388,6 +438,8 @@ reg = <0x4809c000 0x400>; interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc1"; + clocks = <&mmc1_fclk>, <&mmc1_32khz_clk>; + clock-names = "fck", "32khz_clk"; ti,dual-volt; ti,needs-special-reset; dmas = <&sdma 61>, <&sdma 62>;
@@ -399,6 +451,8 @@ reg = <0x480b4000 0x400>; interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc2"; + clocks = <&mmc2_fclk>; + clock-names = "fck"; ti,needs-special-reset; dmas = <&sdma 47>, <&sdma 48>; dma-names = "tx", "rx";
@@ -409,6 +463,8 @@ reg = <0x480ad000 0x400>; interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc3"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,needs-special-reset; dmas = <&sdma 77>, <&sdma 78>; dma-names = "tx", "rx";
@@ -419,6 +475,8 @@ reg = <0x480d1000 0x400>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc4"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,needs-special-reset; dmas = <&sdma 57>, <&sdma 58>; dma-names = "tx", "rx";
@@ -429,6 +487,8 @@ reg = <0x480d5000 0x400>; interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc5"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; ti,needs-special-reset; dmas = <&sdma 59>, <&sdma 60>; dma-names = "tx", "rx";
@@ -438,6 +498,8 @@ compatible = "ti,omap4-keypad"; reg = <0x4ae1c000 0x400>; ti,hwmods = "kbd"; + clocks = <&sys_32k_ck>; + clock-names = "fck"; }; mcpdm: mcpdm at 40132000 {
@@ -447,6 +509,8 @@ reg-names = "mpu", "dma"; interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mcpdm"; + clocks = <&pad_clks_ck>; + clock-names = "fck"; dmas = <&sdma 65>, <&sdma 66>; dma-names = "up_link", "dn_link";
@@ -459,6 +523,8 @@ reg-names = "mpu", "dma"; interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "dmic"; + clocks = <&dmic_gfclk>; + clock-names = "fck"; dmas = <&sdma 67>; dma-names = "up_link"; };
@@ -472,6 +538,8 @@ interrupt-names = "common"; ti,buffer-size = <128>; ti,hwmods = "mcbsp1"; + clocks = <&mcbsp1_gfclk>, <&pad_clks_ck>, <&mcbsp1_sync_mux_ck>; + clock-names = "fck", "pad_fck", "prcm_fck"; dmas = <&sdma 33>, <&sdma 34>; dma-names = "tx", "rx";
@@ -486,6 +554,8 @@ interrupt-names = "common"; ti,buffer-size = <128>; ti,hwmods = "mcbsp2"; + clocks = <&mcbsp2_gfclk>, <&pad_clks_ck>, <&mcbsp2_sync_mux_ck>; + clock-names = "fck", "pad_fck", "prcm_fck"; dmas = <&sdma 17>, <&sdma 18>; dma-names = "tx", "rx";
@@ -500,6 +570,8 @@ interrupt-names = "common"; ti,buffer-size = <128>; ti,hwmods = "mcbsp3"; + clocks = <&mcbsp3_gfclk>, <&pad_clks_ck>, <&mcbsp3_sync_mux_ck>; + clock-names = "fck", "pad_fck", "prcm_fck"; dmas = <&sdma 19>, <&sdma 20>; dma-names = "tx", "rx";
@@ -510,6 +582,8 @@ reg = <0x4ae18000 0x80>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer1"; + clocks = <&timer1_gfclk_mux>; + clock-names = "fck"; ti,timer-alwon; };
@@ -518,6 +592,8 @@ reg = <0x48032000 0x80>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer2"; + clocks = <&timer2_gfclk_mux>; + clock-names = "fck"; }; timer3: timer at 48034000 {
@@ -525,6 +601,8 @@ reg = <0x48034000 0x80>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer3"; + clocks = <&timer3_gfclk_mux>; + clock-names = "fck"; }; timer4: timer at 48036000 {
@@ -532,6 +610,8 @@ reg = <0x48036000 0x80>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer4"; + clocks = <&timer4_gfclk_mux>; + clock-names = "fck"; }; timer5: timer at 40138000 {
@@ -540,6 +620,8 @@ <0x49038000 0x80>; interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer5"; + clocks = <&timer5_gfclk_mux>; + clock-names = "fck"; ti,timer-dsp; ti,timer-pwm; };
@@ -550,6 +632,8 @@ <0x4903a000 0x80>; interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer6"; + clocks = <&timer6_gfclk_mux>; + clock-names = "fck"; ti,timer-dsp; ti,timer-pwm; };
@@ -560,6 +644,8 @@ <0x4903c000 0x80>; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer7"; + clocks = <&timer7_gfclk_mux>; + clock-names = "fck"; ti,timer-dsp; };
@@ -569,6 +655,8 @@ <0x4903e000 0x80>; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer8"; + clocks = <&timer8_gfclk_mux>; + clock-names = "fck"; ti,timer-dsp; ti,timer-pwm; };
@@ -578,6 +666,8 @@ reg = <0x4803e000 0x80>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer9"; + clocks = <&timer9_gfclk_mux>; + clock-names = "fck"; ti,timer-pwm; };
@@ -586,6 +676,8 @@ reg = <0x48086000 0x80>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer10"; + clocks = <&timer10_gfclk_mux>; + clock-names = "fck"; ti,timer-pwm; };
@@ -594,6 +686,8 @@ reg = <0x48088000 0x80>; interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer11"; + clocks = <&timer11_gfclk_mux>; + clock-names = "fck"; ti,timer-pwm; };
@@ -602,11 +696,15 @@ reg = <0x4ae14000 0x80>; interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "wd_timer2"; + clocks = <&sys_32k_ck>; + clock-names = "fck"; }; emif1: emif at 0x4c000000 { compatible = "ti,emif-4d5"; ti,hwmods = "emif1"; + clocks = <&dpll_core_h11x2_ck>; + clock-names = "fck"; phy-type = <2>; /* DDR PHY type: Intelli PHY */ reg = <0x4c000000 0x400>; interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
@@ -618,6 +716,8 @@ emif2: emif at 0x4d000000 { compatible = "ti,emif-4d5"; ti,hwmods = "emif2"; + clocks = <&dpll_core_h11x2_ck>; + clock-names = "fck"; phy-type = <2>; /* DDR PHY type: Intelli PHY */ reg = <0x4d000000 0x400>; interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
@@ -637,6 +737,8 @@ omap_dwc3 at 4a020000 { compatible = "ti,dwc3"; ti,hwmods = "usb_otg_ss"; + clocks = <&dpll_core_h13x2_ck>, <&usb_otg_ss_refclk960m>; + clock-names = "fck", "refclk960m"; reg = <0x4a020000 0x1000>; interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>;
arch/arm/mach-omap2/omap_hwmod_54xx_data.c +0 -119
557 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v6 42/45 ARM: dts: am335x: Add main and optional clock data into DT
In reply to Tero KristoWith support to parse clock data from DT, move all main and optional clock information from hwmod to DT.
We still retain clocks in hwmod for devices which do not have a DT node.
--- arch/arm/boot/dts/am33xx.dtsi | 88 ++++++++++++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 64 -------------------- 2 files changed, 88 insertions(+), 64 deletions(-)
arch/arm/boot/dts/am33xx.dtsi +88 -0
@@ -87,6 +87,8 @@ #size-cells = <1>; ranges; ti,hwmods = "l3_main"; + clocks = <&l3_gclk>; + clock-names = "fck"; intc: interrupt-controller at 48200000 { compatible = "ti,omap2-intc";
@@ -99,6 +101,8 @@ gpio0: gpio at 44e07000 { compatible = "ti,omap4-gpio"; ti,hwmods = "gpio1"; + clocks = <&dpll_core_m4_div2_ck>, <&gpio0_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -110,6 +114,8 @@ gpio1: gpio at 4804c000 { compatible = "ti,omap4-gpio"; ti,hwmods = "gpio2"; + clocks = <&l4ls_gclk>, <&gpio1_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -121,6 +127,8 @@ gpio2: gpio at 481ac000 { compatible = "ti,omap4-gpio"; ti,hwmods = "gpio3"; + clocks = <&l4ls_gclk>, <&gpio2_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -132,6 +140,8 @@ gpio3: gpio at 481ae000 { compatible = "ti,omap4-gpio"; ti,hwmods = "gpio4"; + clocks = <&l4ls_gclk>, <&gpio3_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -143,6 +153,8 @@ uart0: serial at 44e09000 { compatible = "ti,omap3-uart"; ti,hwmods = "uart1"; + clocks = <&dpll_per_m2_div4_wkupdm_ck>; + clock-names = "fck"; clock-frequency = <48000000>; reg = <0x44e09000 0x2000>; interrupts = <72>;
@@ -152,6 +164,8 @@ uart1: serial at 48022000 { compatible = "ti,omap3-uart"; ti,hwmods = "uart2"; + clocks = <&dpll_per_m2_div4_ck>; + clock-names = "fck"; clock-frequency = <48000000>; reg = <0x48022000 0x2000>; interrupts = <73>;
@@ -161,6 +175,8 @@ uart2: serial at 48024000 { compatible = "ti,omap3-uart"; ti,hwmods = "uart3"; + clocks = <&dpll_per_m2_div4_ck>; + clock-names = "fck"; clock-frequency = <48000000>; reg = <0x48024000 0x2000>; interrupts = <74>;
@@ -170,6 +186,8 @@ uart3: serial at 481a6000 { compatible = "ti,omap3-uart"; ti,hwmods = "uart4"; + clocks = <&dpll_per_m2_div4_ck>; + clock-names = "fck"; clock-frequency = <48000000>; reg = <0x481a6000 0x2000>; interrupts = <44>;
@@ -179,6 +197,8 @@ uart4: serial at 481a8000 { compatible = "ti,omap3-uart"; ti,hwmods = "uart5"; + clocks = <&dpll_per_m2_div4_ck>; + clock-names = "fck"; clock-frequency = <48000000>; reg = <0x481a8000 0x2000>; interrupts = <45>;
@@ -188,6 +208,8 @@ uart5: serial at 481aa000 { compatible = "ti,omap3-uart"; ti,hwmods = "uart6"; + clocks = <&dpll_per_m2_div4_ck>; + clock-names = "fck"; clock-frequency = <48000000>; reg = <0x481aa000 0x2000>; interrupts = <46>;
@@ -199,6 +221,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c1"; + clocks = <&dpll_per_m2_div4_wkupdm_ck>; + clock-names = "fck"; reg = <0x44e0b000 0x1000>; interrupts = <70>; status = "disabled";
@@ -209,6 +233,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c2"; + clocks = <&dpll_per_m2_div4_ck>; + clock-names = "fck"; reg = <0x4802a000 0x1000>; interrupts = <71>; status = "disabled";
@@ -219,6 +245,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c3"; + clocks = <&dpll_per_m2_div4_ck>; + clock-names = "fck"; reg = <0x4819c000 0x1000>; interrupts = <30>; status = "disabled";
@@ -227,6 +255,8 @@ wdt2: wdt at 44e35000 { compatible = "ti,omap3-wdt"; ti,hwmods = "wd_timer2"; + clocks = <&wdt1_fck>; + clock-names = "fck"; reg = <0x44e35000 0x1000>; interrupts = <91>; };
@@ -234,6 +264,8 @@ dcan0: d_can at 481cc000 { compatible = "bosch,d_can"; ti,hwmods = "d_can0"; + clocks = <&dcan0_fck>; + clock-names = "fck"; reg = <0x481cc000 0x2000 0x44e10644 0x4>; interrupts = <52>;
@@ -243,6 +275,8 @@ dcan1: d_can at 481d0000 { compatible = "bosch,d_can"; ti,hwmods = "d_can1"; + clocks = <&dcan1_fck>; + clock-names = "fck"; reg = <0x481d0000 0x2000 0x44e10644 0x4>; interrupts = <55>;
@@ -254,6 +288,8 @@ reg = <0x44e31000 0x400>; interrupts = <67>; ti,hwmods = "timer1"; + clocks = <&timer1_fck>; + clock-names = "fck"; ti,timer-alwon; };
@@ -262,6 +298,8 @@ reg = <0x48040000 0x400>; interrupts = <68>; ti,hwmods = "timer2"; + clocks = <&timer2_fck>; + clock-names = "fck"; }; timer3: timer at 48042000 {
@@ -269,6 +307,8 @@ reg = <0x48042000 0x400>; interrupts = <69>; ti,hwmods = "timer3"; + clocks = <&timer3_fck>; + clock-names = "fck"; }; timer4: timer at 48044000 {
@@ -276,6 +316,8 @@ reg = <0x48044000 0x400>; interrupts = <92>; ti,hwmods = "timer4"; + clocks = <&timer4_fck>; + clock-names = "fck"; ti,timer-pwm; };
@@ -284,6 +326,8 @@ reg = <0x48046000 0x400>; interrupts = <93>; ti,hwmods = "timer5"; + clocks = <&timer5_fck>; + clock-names = "fck"; ti,timer-pwm; };
@@ -292,6 +336,8 @@ reg = <0x48048000 0x400>; interrupts = <94>; ti,hwmods = "timer6"; + clocks = <&timer6_fck>; + clock-names = "fck"; ti,timer-pwm; };
@@ -300,6 +346,8 @@ reg = <0x4804a000 0x400>; interrupts = <95>; ti,hwmods = "timer7"; + clocks = <&timer7_fck>; + clock-names = "fck"; ti,timer-pwm; };
@@ -309,6 +357,8 @@ interrupts = <75 76>; ti,hwmods = "rtc"; + clocks = <&clk_32768_ck>; + clock-names = "fck"; }; spi0: spi at 48030000 {
@@ -319,6 +369,8 @@ interrupts = <65>; ti,spi-num-cs = <2>; ti,hwmods = "spi0"; + clocks = <&dpll_per_m2_div4_ck>; + clock-names = "fck"; status = "disabled"; };
@@ -330,6 +382,8 @@ interrupts = <125>; ti,spi-num-cs = <2>; ti,hwmods = "spi1"; + clocks = <&dpll_per_m2_div4_ck>; + clock-names = "fck"; status = "disabled"; };
@@ -348,12 +402,16 @@ port1-mode = <3>; power = <250>; ti,hwmods = "usb_otg_hs"; + clocks = <&usbotg_fck>; + clock-names = "fck"; }; epwmss0: epwmss at 48300000 { compatible = "ti,am33xx-pwmss"; reg = <0x48300000 0x10>; ti,hwmods = "epwmss0"; + clocks = <&l4ls_gclk>; + clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; status = "disabled";
@@ -366,6 +424,8 @@ #pwm-cells = <3>; reg = <0x48300100 0x80>; ti,hwmods = "ecap0"; + clocks = <&l4ls_gclk>; + clock-names = "fck"; status = "disabled"; };
@@ -374,6 +434,8 @@ #pwm-cells = <3>; reg = <0x48300200 0x80>; ti,hwmods = "ehrpwm0"; + clocks = <&l4ls_gclk>; + clock-names = "fck"; status = "disabled"; }; };
@@ -382,6 +444,8 @@ compatible = "ti,am33xx-pwmss"; reg = <0x48302000 0x10>; ti,hwmods = "epwmss1"; + clocks = <&l4ls_gclk>; + clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; status = "disabled";
@@ -394,6 +458,8 @@ #pwm-cells = <3>; reg = <0x48302100 0x80>; ti,hwmods = "ecap1"; + clocks = <&l4ls_gclk>; + clock-names = "fck"; status = "disabled"; };
@@ -402,6 +468,8 @@ #pwm-cells = <3>; reg = <0x48302200 0x80>; ti,hwmods = "ehrpwm1"; + clocks = <&l4ls_gclk>; + clock-names = "fck"; status = "disabled"; }; };
@@ -410,6 +478,8 @@ compatible = "ti,am33xx-pwmss"; reg = <0x48304000 0x10>; ti,hwmods = "epwmss2"; + clocks = <&l4ls_gclk>; + clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; status = "disabled";
@@ -422,6 +492,8 @@ #pwm-cells = <3>; reg = <0x48304100 0x80>; ti,hwmods = "ecap2"; + clocks = <&l4ls_gclk>; + clock-names = "fck"; status = "disabled"; };
@@ -430,6 +502,8 @@ #pwm-cells = <3>; reg = <0x48304200 0x80>; ti,hwmods = "ehrpwm2"; + clocks = <&l4ls_gclk>; + clock-names = "fck"; status = "disabled"; }; };
@@ -437,6 +511,8 @@ mac: ethernet at 4a100000 { compatible = "ti,cpsw"; ti,hwmods = "cpgmac0"; + clocks = <&cpsw_125mhz_gclk>; + clock-names = "fck"; cpdma_channels = <8>; ale_entries = <1024>; bd_ram_size = <0x2000>;
@@ -466,6 +542,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "davinci_mdio"; + clocks = <&cpsw_125mhz_gclk>; + clock-names = "fck"; bus_freq = <1000000>; reg = <0x4a101000 0x100>; };
@@ -485,6 +563,8 @@ compatible = "ti,am3352-ocmcram"; reg = <0x40300000 0x10000>; ti,hwmods = "ocmcram"; + clocks = <&l3_gclk>; + clock-names = "fck"; }; wkup_m3: wkup_m3 at 44d00000 {
@@ -492,6 +572,8 @@ reg = <0x44d00000 0x4000 /* M3 UMEM */ 0x44d80000 0x2000>; /* M3 DMEM */ ti,hwmods = "wkup_m3"; + clocks = <&dpll_core_m4_div2_ck>; + clock-names = "fck"; }; elm: elm at 48080000 {
@@ -499,6 +581,8 @@ reg = <0x48080000 0x2000>; interrupts = <4>; ti,hwmods = "elm"; + clocks = <&l4ls_gclk>; + clock-names = "fck"; status = "disabled"; };
@@ -508,6 +592,8 @@ interrupt-parent = <&intc>; interrupts = <16>; ti,hwmods = "adc_tsc"; + clocks = <&adc_tsc_fck>; + clock-names = "fck"; status = "disabled"; tsc {
@@ -522,6 +608,8 @@ gpmc: gpmc at 50000000 { compatible = "ti,am3352-gpmc"; ti,hwmods = "gpmc"; + clocks = <&l3s_gclk>; + clock-names = "fck"; reg = <0x50000000 0x2000>; interrupts = <100>; gpmc,num-cs = <7>;
arch/arm/mach-omap2/omap_hwmod_33xx_data.c +0 -64
370 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v6 43/45 ARM: dts: DRA7: link in clock DT data
In reply to Tero KristoClock tree DT data is now included from base dra7.dtsi file.
--- arch/arm/boot/dts/dra7.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/boot/dts/dra7.dtsi +14 -0
@@ -572,4 +572,18 @@ status = "disabled"; }; }; + + clocks { + #address-cells = <1>; + #size-cells = <1>; + ranges; + /include/ "dra7xx-clocks.dtsi" + }; + + clockdomains { + coreaon_clkdm: coreaon_clkdm { + compatible = "ti,clockdomain"; + clocks = <&dpll_usb_ck>; + }; + }; };
Signature · 1 line
1.7.9.5
PATCH v6 44/45 ARM: OMAP: DRA7: Enable clock init
In reply to Tero KristoInitializes clock data from device tree.
--- arch/arm/mach-omap2/io.c | 1 + include/linux/clk/ti.h | 1 + 2 files changed, 2 insertions(+)
arch/arm/mach-omap2/io.c +1 -0
@@ -682,6 +682,7 @@ void __init dra7xx_init_early(void)dra7xx_clockdomains_init ();dra7xx_hwmod_init ();omap_hwmod_init_postsetup (); + omap_clk_init = dra7xx_clk_init; }#endif
include/linux/clk/ti.h +1 -0
@@ -226,6 +226,7 @@ static inline void of_omap_clk_deny_autoidle_all(void) { }#endif int omap5xxx_clk_init (void ); +int dra7xx_clk_init (void );extern const struct clk_hw_omap_ops clkhwops_omap3_dpll;extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx;
Signature · 1 line
1.7.9.5
PATCH v6 45/45 ARM: dts: dra7: Add main and optional clock data into DT
In reply to Tero KristoWith support to parse clock data from DT, move all main and optional clock information from hwmod to DT.
We still retain clocks in hwmod for devices which do not have a DT node.
--- arch/arm/boot/dts/dra7.dtsi | 82 +++++++++++++++++++++++ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 101 ----------------------------- 2 files changed, 82 insertions(+), 101 deletions(-)
arch/arm/boot/dts/dra7.dtsi +82 -0
@@ -97,6 +97,8 @@ compatible = "ti,omap-counter32k"; reg = <0x4ae04000 0x40>; ti,hwmods = "counter_32k"; + clocks = <&wkupaon_iclk_mux>; + clock-names = "fck"; }; dra7_pmx_core: pinmux at 4a003400 {
@@ -118,6 +120,8 @@ #dma-cells = <1>; #dma-channels = <32>; #dma-requests = <127>; + clocks = <&l3_iclk_div>; + clock-names = "fck"; }; gpio1: gpio at 4ae10000 {
@@ -125,6 +129,8 @@ reg = <0x4ae10000 0x200>; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio1"; + clocks = <&wkupaon_iclk_mux>, <&gpio1_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -136,6 +142,8 @@ reg = <0x48055000 0x200>; interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio2"; + clocks = <&l3_iclk_div>, <&gpio2_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -147,6 +155,8 @@ reg = <0x48057000 0x200>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio3"; + clocks = <&l3_iclk_div>, <&gpio3_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -158,6 +168,8 @@ reg = <0x48059000 0x200>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio4"; + clocks = <&l3_iclk_div>, <&gpio4_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -169,6 +181,8 @@ reg = <0x4805b000 0x200>; interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio5"; + clocks = <&l3_iclk_div>, <&gpio5_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -180,6 +194,8 @@ reg = <0x4805d000 0x200>; interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio6"; + clocks = <&l3_iclk_div>, <&gpio6_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -191,6 +207,8 @@ reg = <0x48051000 0x200>; interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio7"; + clocks = <&l3_iclk_div>, <&gpio7_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -202,6 +220,8 @@ reg = <0x48053000 0x200>; interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "gpio8"; + clocks = <&l3_iclk_div>, <&gpio8_dbclk>; + clock-names = "fck", "dbclk"; gpio-controller; #gpio-cells = <2>; interrupt-controller;
@@ -213,6 +233,8 @@ reg = <0x4806a000 0x100>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart1"; + clocks = <&uart1_gfclk_mux>; + clock-names = "fck"; clock-frequency = <48000000>; status = "disabled"; };
@@ -222,6 +244,8 @@ reg = <0x4806c000 0x100>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart2"; + clocks = <&uart2_gfclk_mux>; + clock-names = "fck"; clock-frequency = <48000000>; status = "disabled"; };
@@ -231,6 +255,8 @@ reg = <0x48020000 0x100>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart3"; + clocks = <&uart3_gfclk_mux>; + clock-names = "fck"; clock-frequency = <48000000>; status = "disabled"; };
@@ -240,6 +266,8 @@ reg = <0x4806e000 0x100>; interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart4"; + clocks = <&uart4_gfclk_mux>; + clock-names = "fck"; clock-frequency = <48000000>; status = "disabled"; };
@@ -249,6 +277,8 @@ reg = <0x48066000 0x100>; interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart5"; + clocks = <&uart5_gfclk_mux>; + clock-names = "fck"; clock-frequency = <48000000>; status = "disabled"; };
@@ -258,6 +288,8 @@ reg = <0x48068000 0x100>; interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart6"; + clocks = <&uart6_gfclk_mux>; + clock-names = "fck"; clock-frequency = <48000000>; status = "disabled"; };
@@ -299,6 +331,8 @@ reg = <0x4ae18000 0x80>; interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer1"; + clocks = <&timer1_gfclk_mux>; + clock-names = "fck"; ti,timer-alwon; };
@@ -307,6 +341,8 @@ reg = <0x48032000 0x80>; interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer2"; + clocks = <&timer2_gfclk_mux>; + clock-names = "fck"; }; timer3: timer at 48034000 {
@@ -314,6 +350,8 @@ reg = <0x48034000 0x80>; interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer3"; + clocks = <&timer3_gfclk_mux>; + clock-names = "fck"; }; timer4: timer at 48036000 {
@@ -321,6 +359,8 @@ reg = <0x48036000 0x80>; interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer4"; + clocks = <&timer4_gfclk_mux>; + clock-names = "fck"; }; timer5: timer at 48820000 {
@@ -328,6 +368,8 @@ reg = <0x48820000 0x80>; interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer5"; + clocks = <&timer5_gfclk_mux>; + clock-names = "fck"; ti,timer-dsp; };
@@ -336,6 +378,8 @@ reg = <0x48822000 0x80>; interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer6"; + clocks = <&timer6_gfclk_mux>; + clock-names = "fck"; ti,timer-dsp; ti,timer-pwm; };
@@ -345,6 +389,8 @@ reg = <0x48824000 0x80>; interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer7"; + clocks = <&timer7_gfclk_mux>; + clock-names = "fck"; ti,timer-dsp; };
@@ -353,6 +399,8 @@ reg = <0x48826000 0x80>; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer8"; + clocks = <&timer8_gfclk_mux>; + clock-names = "fck"; ti,timer-dsp; ti,timer-pwm; };
@@ -362,6 +410,8 @@ reg = <0x4803e000 0x80>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer9"; + clocks = <&timer9_gfclk_mux>; + clock-names = "fck"; }; timer10: timer at 48086000 {
@@ -369,6 +419,8 @@ reg = <0x48086000 0x80>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer10"; + clocks = <&timer10_gfclk_mux>; + clock-names = "fck"; }; timer11: timer at 48088000 {
@@ -376,6 +428,8 @@ reg = <0x48088000 0x80>; interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "timer11"; + clocks = <&timer11_gfclk_mux>; + clock-names = "fck"; ti,timer-pwm; };
@@ -412,6 +466,8 @@ reg = <0x4ae14000 0x80>; interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "wd_timer2"; + clocks = <&sys_32k_ck>; + clock-names = "fck"; }; i2c1: i2c at 48070000 {
@@ -421,6 +477,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c1"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; status = "disabled"; };
@@ -431,6 +489,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c2"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; status = "disabled"; };
@@ -441,6 +501,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c3"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; status = "disabled"; };
@@ -451,6 +513,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c4"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; status = "disabled"; };
@@ -461,6 +525,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "i2c5"; + clocks = <&func_96m_fclk>; + clock-names = "fck"; status = "disabled"; };
@@ -469,6 +535,8 @@ reg = <0x4809c000 0x400>; interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc1"; + clocks = <&mmc1_fclk_div>, <&mmc1_clk32k>; + clock-names = "fck", "clk32k"; ti,dual-volt; ti,needs-special-reset; dmas = <&sdma 61>, <&sdma 62>;
@@ -481,6 +549,8 @@ reg = <0x480b4000 0x400>; interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc2"; + clocks = <&mmc2_fclk_div>, <&mmc2_clk32k>; + clock-names = "fck", "clk32k"; ti,needs-special-reset; dmas = <&sdma 47>, <&sdma 48>; dma-names = "tx", "rx";
@@ -492,6 +562,8 @@ reg = <0x480ad000 0x400>; interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc3"; + clocks = <&mmc3_gfclk_div>, <&mmc3_clk32k>; + clock-names = "fck", "clk32k"; ti,needs-special-reset; dmas = <&sdma 77>, <&sdma 78>; dma-names = "tx", "rx";
@@ -503,6 +575,8 @@ reg = <0x480d1000 0x400>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "mmc4"; + clocks = <&mmc4_gfclk_div>, <&mmc4_clk32k>; + clock-names = "fck", "clk32k"; ti,needs-special-reset; dmas = <&sdma 57>, <&sdma 58>; dma-names = "tx", "rx";
@@ -516,6 +590,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi1"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <4>; dmas = <&sdma 35>, <&sdma 36>,
@@ -537,6 +613,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi2"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <2>; dmas = <&sdma 43>, <&sdma 44>,
@@ -553,6 +631,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi3"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <2>; dmas = <&sdma 15>, <&sdma 16>; dma-names = "tx0", "rx0";
@@ -566,6 +646,8 @@ #address-cells = <1>; #size-cells = <0>; ti,hwmods = "mcspi4"; + clocks = <&func_48m_fclk>; + clock-names = "fck"; ti,spi-num-cs = <1>; dmas = <&sdma 70>, <&sdma 71>; dma-names = "tx0", "rx0";
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -101
465 lines not on this page · raw message
Signature · 1 line
1.7.9.5