diff options
| author | Tero Kristo <t-kristo@ti.com> | 2015-02-12 09:38:16 +0100 |
|---|---|---|
| committer | Tero Kristo <t-kristo@ti.com> | 2015-03-31 20:26:55 +0200 |
| commit | 72b10ac00eb1c154037e398371685d3f1d2d4793 (patch) | |
| tree | 5bf36ef13445601d7436f23f9a0b589964b95786 /arch/arm/mach-omap2 | |
| parent | ARM: OMAP2+: control: add syscon support for register accesses (diff) | |
| download | linux-72b10ac00eb1c154037e398371685d3f1d2d4793.tar.xz linux-72b10ac00eb1c154037e398371685d3f1d2d4793.zip | |
ARM: dts: omap24xx: add minimal l4 bus layout with control module support
This patch creates an l4 / l4-wkup interconnects for omap2420 / omap2430
SoCs, and moves some of the generic peripherals under it. System control
module nodes are moved under this new interconnect also, and the SCM
clock layout is changed to use the new SCM node as the clock provider.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/control.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index 4970c5cb1a11..eb592ea51b78 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c @@ -661,10 +661,15 @@ static struct control_init_data ctrl_data = { .index = TI_CLKM_CTRL, }; +static const struct control_init_data omap2_ctrl_data = { + .index = TI_CLKM_CTRL, + .offset = -OMAP2_CONTROL_GENERAL, +}; + static const struct of_device_id omap_scrm_dt_match_table[] = { { .compatible = "ti,am3-scrm", .data = &ctrl_data }, { .compatible = "ti,am4-scrm", .data = &ctrl_data }, - { .compatible = "ti,omap2-scrm", .data = &ctrl_data }, + { .compatible = "ti,omap2-scm", .data = &omap2_ctrl_data }, { .compatible = "ti,omap3-scrm", .data = &ctrl_data }, { .compatible = "ti,dm816-scrm", .data = &ctrl_data }, { } |