diff options
author | Tony Lindgren <tony@atomide.com> | 2019-12-30 10:17:51 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2019-12-30 10:17:51 -0800 |
commit | 9fc85a7124b5ff9ec24ad391f9994f89ae611313 (patch) | |
tree | cd4cb1b097a6ed502bd679a8b59ce00b55cae923 /arch/arm/mach-omap2/pdata-quirks.c | |
parent | ARM: OMAP5: hwmod-data: remove OMAP5 IOMMU hwmod data (diff) | |
parent | ARM: OMAP2+: Drop legacy platform data for sdma (diff) | |
download | linux-dev-9fc85a7124b5ff9ec24ad391f9994f89ae611313.tar.xz linux-dev-9fc85a7124b5ff9ec24ad391f9994f89ae611313.zip |
Merge branch 'omap-for-v5.6/sdma' into omap-for-v5.6/ti-sysc-drop-pdata
Diffstat (limited to 'arch/arm/mach-omap2/pdata-quirks.c')
-rw-r--r-- | arch/arm/mach-omap2/pdata-quirks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index e95c224ffc4d..922ee10a1630 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -514,6 +514,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = { /* Common auxdata */ OF_DEV_AUXDATA("ti,sysc", 0, NULL, &ti_sysc_pdata), OF_DEV_AUXDATA("pinctrl-single", 0, NULL, &pcs_pdata), + OF_DEV_AUXDATA("ti,omap-sdma", 0, NULL, &dma_plat_info), { /* sentinel */ }, }; |