diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-09 03:51:39 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-09 03:51:39 +0300 |
| commit | 85b80b6bfdbdab3f489857dd850dad5a65e49895 (patch) | |
| tree | 53519a62e13eeef800c0d1f32cfa7323b840fe47 /include | |
| parent | c6c65189f9e14338533c871845ae6897a4f87c88 (diff) | |
| parent | 29417fe80ad2fd4f62f00dcca96c7198870e5642 (diff) | |
| download | linux-85b80b6bfdbdab3f489857dd850dad5a65e49895.tar.xz | |
Merge tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc
Merge "Ux500 core changes for v3.19" from Linus Walleij:
"please pull in these Ux500 core changes for this kernel development
cycle: mainly a generic power domain implementation from Ulf Hansson
that needs to get queued up in -next and tested."
Generic power domains for the Ux500
* tag 'ux500-core-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: Add i2c devices to the VAPE PM domain
ARM: ux500: Add spi and ssp devices to the VAPE PM domain
ARM: ux500: Add sdi devices to the VAPE PM domain
ARM: ux500: Add DT node for ux500 PM domains
ARM: ux500: Enable Kconfig for the generic PM domain
ARM: ux500: Initial support for PM domains
dt: bindings: ux500: Add header for PM domains specifiers
dt: bindings: ux500: Add documentation for PM domains
ARM: u300: Convert pr_warning to pr_warn
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/arm/ux500_pm_domains.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/dt-bindings/arm/ux500_pm_domains.h b/include/dt-bindings/arm/ux500_pm_domains.h new file mode 100644 index 000000000000..398a6c0288d1 --- /dev/null +++ b/include/dt-bindings/arm/ux500_pm_domains.h @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2014 Linaro Ltd. + * + * Author: Ulf Hansson <ulf.hansson@linaro.org> + * License terms: GNU General Public License (GPL) version 2 + */ +#ifndef _DT_BINDINGS_ARM_UX500_PM_DOMAINS_H +#define _DT_BINDINGS_ARM_UX500_PM_DOMAINS_H + +#define DOMAIN_VAPE 0 + +/* Number of PM domains. */ +#define NR_DOMAINS (DOMAIN_VAPE + 1) + +#endif |