summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/control.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2015-03-20 12:08:29 +0100
committerTero Kristo <t-kristo@ti.com>2015-03-31 20:26:56 +0200
commite3bc5358e0977b95652625f9329ba68f1ebb1a42 (patch)
tree874df83b5e10f10e9d7fe682859af275d0d35ad9 /arch/arm/mach-omap2/control.c
parentARM: dts: omap3: add minimal l4 bus layout with control module support (diff)
downloadlinux-e3bc5358e0977b95652625f9329ba68f1ebb1a42.tar.xz
linux-e3bc5358e0977b95652625f9329ba68f1ebb1a42.zip
ARM: dts: am33xx: add minimal l4 bus layout with control module support
This patch creates an l4_wkup interconnect for AM33xx, 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>
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 30f5aff7645f..477e2c8f26a6 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -667,7 +667,7 @@ static const struct control_init_data omap2_ctrl_data = {
};
static const struct of_device_id omap_scrm_dt_match_table[] = {
- { .compatible = "ti,am3-scrm", .data = &ctrl_data },
+ { .compatible = "ti,am3-scm", .data = &ctrl_data },
{ .compatible = "ti,am4-scrm", .data = &ctrl_data },
{ .compatible = "ti,omap2-scm", .data = &omap2_ctrl_data },
{ .compatible = "ti,omap3-scm", .data = &omap2_ctrl_data },