diff options
| author | Olof Johansson <olof@lixom.net> | 2017-04-19 15:58:02 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 15:58:02 +0300 |
| commit | fe8fee6901059801c3b53a0f8e28274b2dade65e (patch) | |
| tree | 06f6f18379afc35a5b12317cf0e67cc8cce0846c /include/linux | |
| parent | 1dfe46166f18e332bfb22d9d1217b533fa82a464 (diff) | |
| parent | ae3874cc931b760c08bd6617a45fec1ba97d87f8 (diff) | |
| download | linux-fe8fee6901059801c3b53a0f8e28274b2dade65e.tar.xz | |
Merge tag 'arm-soc-pmdomain' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers
ARM SOC PM domain support for 4.12
Dave Gerlach (5):
PM / Domains: Add generic data pointer to genpd data struct
PM / Domains: Do not check if simple providers have phandle cells
dt-bindings: Add TI SCI PM Domains
soc: ti: Add ti_sci_pm_domains driver
ARM: keystone: Drop PM domain support for k2g
* tag 'arm-soc-pmdomain' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: keystone: Drop PM domain support for k2g
soc: ti: Add ti_sci_pm_domains driver
dt-bindings: Add TI SCI PM Domains
PM / Domains: Do not check if simple providers have phandle cells
PM / Domains: Add generic data pointer to genpd data struct
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pm_domain.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 5339ed5bd6f9..b213d22daefd 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -117,6 +117,7 @@ struct generic_pm_domain_data { struct pm_domain_data base; struct gpd_timing_data td; struct notifier_block nb; + void *data; }; #ifdef CONFIG_PM_GENERIC_DOMAINS |