summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/control.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2015-02-24 16:22:45 +0200
committerTero Kristo <t-kristo@ti.com>2015-03-31 21:26:56 +0300
commitb8845074cfbbd1d1b46720a1b563d7b4240dac21 (patch)
treea3054f3e304854ef4a55e63de53c8729f0a14db2 /arch/arm/mach-omap2/control.c
parent72b10ac00eb1c154037e398371685d3f1d2d4793 (diff)
downloadop-kernel-dev-b8845074cfbbd1d1b46720a1b563d7b4240dac21.zip
op-kernel-dev-b8845074cfbbd1d1b46720a1b563d7b4240dac21.tar.gz
ARM: dts: omap3: add minimal l4 bus layout with control module support
This patch creates an l4_core interconnect for OMAP3, 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 renamed SCM node as the clock provider. Signed-off-by: Tero Kristo <t-kristo@ti.com> Reported-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
-rw-r--r--arch/arm/mach-omap2/control.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index eb592ea..30f5aff 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -670,7 +670,7 @@ 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-scm", .data = &omap2_ctrl_data },
- { .compatible = "ti,omap3-scrm", .data = &ctrl_data },
+ { .compatible = "ti,omap3-scm", .data = &omap2_ctrl_data },
{ .compatible = "ti,dm816-scrm", .data = &ctrl_data },
{ }
};
OpenPOWER on IntegriCloud