diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-07-23 21:59:18 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-07-23 21:59:18 -0700 |
| commit | 24da741c678f865de3182194604dbddcc7fc7f3c (patch) | |
| tree | 0322f37f8e9e4e945acc100a0d1821db268fe624 /arch/arm/mach-omap2/control.c | |
| parent | 97d9a3d0967f711e271ef950f1745307720c95d5 (diff) | |
| parent | 0f3ccb24c0347cd80160810df79bfa233749074e (diff) | |
Merge branch 'dm814x-soc' into omap-for-v4.3/soc
Update dm814x changes for sparse fixes to make data structures
static.
Conflicts:
arch/arm/mach-omap2/omap_hwmod_81xx_data.c
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
| -rw-r--r-- | arch/arm/mach-omap2/control.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index f008930277ed..cf5855174c93 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c @@ -652,6 +652,7 @@ static const struct of_device_id omap_scrm_dt_match_table[] = { { .compatible = "ti,am4-scm", .data = &ctrl_data }, { .compatible = "ti,omap2-scm", .data = &omap2_ctrl_data }, { .compatible = "ti,omap3-scm", .data = &omap2_ctrl_data }, + { .compatible = "ti,dm814-scm", .data = &ctrl_data }, { .compatible = "ti,dm816-scrm", .data = &ctrl_data }, { .compatible = "ti,omap4-scm-core", .data = &ctrl_data }, { .compatible = "ti,omap5-scm-core", .data = &ctrl_data }, |