diff options
author | Olof Johansson <olof@lixom.net> | 2017-04-19 05:58:02 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-04-19 05:58:02 -0700 |
commit | fe8fee6901059801c3b53a0f8e28274b2dade65e (patch) | |
tree | 06f6f18379afc35a5b12317cf0e67cc8cce0846c /drivers/soc/ti/Makefile | |
parent | 1dfe46166f18e332bfb22d9d1217b533fa82a464 (diff) | |
parent | ae3874cc931b760c08bd6617a45fec1ba97d87f8 (diff) | |
download | linux-stable-fe8fee6901059801c3b53a0f8e28274b2dade65e.tar.gz linux-stable-fe8fee6901059801c3b53a0f8e28274b2dade65e.tar.bz2 linux-stable-fe8fee6901059801c3b53a0f8e28274b2dade65e.zip |
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 'drivers/soc/ti/Makefile')
-rw-r--r-- | drivers/soc/ti/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/ti/Makefile b/drivers/soc/ti/Makefile index 48ff3a79634f..7d572736c86e 100644 --- a/drivers/soc/ti/Makefile +++ b/drivers/soc/ti/Makefile @@ -5,3 +5,4 @@ obj-$(CONFIG_KEYSTONE_NAVIGATOR_QMSS) += knav_qmss.o knav_qmss-y := knav_qmss_queue.o knav_qmss_acc.o obj-$(CONFIG_KEYSTONE_NAVIGATOR_DMA) += knav_dma.o obj-$(CONFIG_WKUP_M3_IPC) += wkup_m3_ipc.o +obj-$(CONFIG_TI_SCI_PM_DOMAINS) += ti_sci_pm_domains.o |