diff options
author | Olof Johansson | 2017-04-19 07:58:02 -0500 |
---|---|---|
committer | Olof Johansson | 2017-04-19 07:58:02 -0500 |
commit | fe8fee6901059801c3b53a0f8e28274b2dade65e (patch) | |
tree | 06f6f18379afc35a5b12317cf0e67cc8cce0846c /include | |
parent | 1dfe46166f18e332bfb22d9d1217b533fa82a464 (diff) | |
parent | ae3874cc931b760c08bd6617a45fec1ba97d87f8 (diff) | |
download | kernel-fe8fee6901059801c3b53a0f8e28274b2dade65e.tar.gz kernel-fe8fee6901059801c3b53a0f8e28274b2dade65e.tar.xz kernel-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 'include')
-rw-r--r-- | include/dt-bindings/genpd/k2g.h | 90 | ||||
-rw-r--r-- | include/linux/pm_domain.h | 1 |
2 files changed, 91 insertions, 0 deletions
diff --git a/include/dt-bindings/genpd/k2g.h b/include/dt-bindings/genpd/k2g.h new file mode 100644 index 000000000000..fffdb604fc7d --- /dev/null +++ b/include/dt-bindings/genpd/k2g.h | |||
@@ -0,0 +1,90 @@ | |||
1 | /* | ||
2 | * TI K2G SoC Device definitions | ||
3 | * | ||
4 | * Copyright (C) 2015-2017 Texas Instruments Incorporated - https://urldefense.proofpoint.com/v2/url?u=http-3A__www.ti.com_&d=DwIBAg&c=RoP1YumCXCgaWHvlZYR8PQcxBKCX5YTpkKY057SbK10&r=XBn1JQGPwR8CsE7xpP3wPlG6DQU7qw8ym65xieNZ4hY&m=K-anSnBVCpVU_mSaI7FWz6dwIAPBePhk6w9rCref6SI&s=UvxGRJAJRKjDVjwUuXloC2gH4uWNkMelLuW2oG01DPM&e= | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | */ | ||
16 | |||
17 | #ifndef _DT_BINDINGS_GENPD_K2G_H | ||
18 | #define _DT_BINDINGS_GENPD_K2G_H | ||
19 | |||
20 | /* Documented in https://urldefense.proofpoint.com/v2/url?u=http-3A__processors.wiki.ti.com_index.php_TISCI&d=DwIBAg&c=RoP1YumCXCgaWHvlZYR8PQcxBKCX5YTpkKY057SbK10&r=XBn1JQGPwR8CsE7xpP3wPlG6DQU7qw8ym65xieNZ4hY&m=K-anSnBVCpVU_mSaI7FWz6dwIAPBePhk6w9rCref6SI&s=OUR-PBKiUWN0Bhs-J9hzlER8kpqh_V70s09xc8Zo1iA&e= */ | ||
21 | |||
22 | #define K2G_DEV_PMMC0 0x0000 | ||
23 | #define K2G_DEV_MLB0 0x0001 | ||
24 | #define K2G_DEV_DSS0 0x0002 | ||
25 | #define K2G_DEV_MCBSP0 0x0003 | ||
26 | #define K2G_DEV_MCASP0 0x0004 | ||
27 | #define K2G_DEV_MCASP1 0x0005 | ||
28 | #define K2G_DEV_MCASP2 0x0006 | ||
29 | #define K2G_DEV_DCAN0 0x0008 | ||
30 | #define K2G_DEV_DCAN1 0x0009 | ||
31 | #define K2G_DEV_EMIF0 0x000a | ||
32 | #define K2G_DEV_MMCHS0 0x000b | ||
33 | #define K2G_DEV_MMCHS1 0x000c | ||
34 | #define K2G_DEV_GPMC0 0x000d | ||
35 | #define K2G_DEV_ELM0 0x000e | ||
36 | #define K2G_DEV_SPI0 0x0010 | ||
37 | #define K2G_DEV_SPI1 0x0011 | ||
38 | #define K2G_DEV_SPI2 0x0012 | ||
39 | #define K2G_DEV_SPI3 0x0013 | ||
40 | #define K2G_DEV_ICSS0 0x0014 | ||
41 | #define K2G_DEV_ICSS1 0x0015 | ||
42 | #define K2G_DEV_USB0 0x0016 | ||
43 | #define K2G_DEV_USB1 0x0017 | ||
44 | #define K2G_DEV_NSS0 0x0018 | ||
45 | #define K2G_DEV_PCIE0 0x0019 | ||
46 | #define K2G_DEV_GPIO0 0x001b | ||
47 | #define K2G_DEV_GPIO1 0x001c | ||
48 | #define K2G_DEV_TIMER64_0 0x001d | ||
49 | #define K2G_DEV_TIMER64_1 0x001e | ||
50 | #define K2G_DEV_TIMER64_2 0x001f | ||
51 | #define K2G_DEV_TIMER64_3 0x0020 | ||
52 | #define K2G_DEV_TIMER64_4 0x0021 | ||
53 | #define K2G_DEV_TIMER64_5 0x0022 | ||
54 | #define K2G_DEV_TIMER64_6 0x0023 | ||
55 | #define K2G_DEV_MSGMGR0 0x0025 | ||
56 | #define K2G_DEV_BOOTCFG0 0x0026 | ||
57 | #define K2G_DEV_ARM_BOOTROM0 0x0027 | ||
58 | #define K2G_DEV_DSP_BOOTROM0 0x0029 | ||
59 | #define K2G_DEV_DEBUGSS0 0x002b | ||
60 | #define K2G_DEV_UART0 0x002c | ||
61 | #define K2G_DEV_UART1 0x002d | ||
62 | #define K2G_DEV_UART2 0x002e | ||
63 | #define K2G_DEV_EHRPWM0 0x002f | ||
64 | #define K2G_DEV_EHRPWM1 0x0030 | ||
65 | #define K2G_DEV_EHRPWM2 0x0031 | ||
66 | #define K2G_DEV_EHRPWM3 0x0032 | ||
67 | #define K2G_DEV_EHRPWM4 0x0033 | ||
68 | #define K2G_DEV_EHRPWM5 0x0034 | ||
69 | #define K2G_DEV_EQEP0 0x0035 | ||
70 | #define K2G_DEV_EQEP1 0x0036 | ||
71 | #define K2G_DEV_EQEP2 0x0037 | ||
72 | #define K2G_DEV_ECAP0 0x0038 | ||
73 | #define K2G_DEV_ECAP1 0x0039 | ||
74 | #define K2G_DEV_I2C0 0x003a | ||
75 | #define K2G_DEV_I2C1 0x003b | ||
76 | #define K2G_DEV_I2C2 0x003c | ||
77 | #define K2G_DEV_EDMA0 0x003f | ||
78 | #define K2G_DEV_SEMAPHORE0 0x0040 | ||
79 | #define K2G_DEV_INTC0 0x0041 | ||
80 | #define K2G_DEV_GIC0 0x0042 | ||
81 | #define K2G_DEV_QSPI0 0x0043 | ||
82 | #define K2G_DEV_ARM_64B_COUNTER0 0x0044 | ||
83 | #define K2G_DEV_TETRIS0 0x0045 | ||
84 | #define K2G_DEV_CGEM0 0x0046 | ||
85 | #define K2G_DEV_MSMC0 0x0047 | ||
86 | #define K2G_DEV_CBASS0 0x0049 | ||
87 | #define K2G_DEV_BOARD0 0x004c | ||
88 | #define K2G_DEV_EDMA1 0x004f | ||
89 | |||
90 | #endif | ||
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 { | |||
117 | struct pm_domain_data base; | 117 | struct pm_domain_data base; |
118 | struct gpd_timing_data td; | 118 | struct gpd_timing_data td; |
119 | struct notifier_block nb; | 119 | struct notifier_block nb; |
120 | void *data; | ||
120 | }; | 121 | }; |
121 | 122 | ||
122 | #ifdef CONFIG_PM_GENERIC_DOMAINS | 123 | #ifdef CONFIG_PM_GENERIC_DOMAINS |