* [PATCH 1/2] ARM: EXYNOS: Move pm_domains driver to drivers/soc/samsung
@ 2016-05-10 13:52 Krzysztof Kozlowski
2016-05-10 13:52 ` [PATCH 2/2] soc: samsung: pm_domains: Prepare for supporting ARMv8 Exynos Krzysztof Kozlowski
2016-05-11 14:11 ` [PATCH 1/2] ARM: EXYNOS: Move pm_domains driver to drivers/soc/samsung Javier Martinez Canillas
0 siblings, 2 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2016-05-10 13:52 UTC (permalink / raw)
To: Kukjin Kim, Krzysztof Kozlowski, linux-arm-kernel,
linux-samsung-soc, linux-kernel
Cc: Marek Szyprowski, Javier Martinez Canillas, Bartlomiej Zolnierkiewicz
Exynos PM domains driver does not have mach-specific dependencies so it
can be safely moved out of arm/mach-exynos to drivers/soc. This in
future will allow re-using it on ARM64 boards.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
arch/arm/mach-exynos/Makefile | 1 -
drivers/soc/samsung/Makefile | 1 +
{arch/arm/mach-exynos => drivers/soc/samsung}/pm_domains.c | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename {arch/arm/mach-exynos => drivers/soc/samsung}/pm_domains.c (100%)
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index 34d29df3e006..838249d4ff5c 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_ARCH_EXYNOS) += exynos.o exynos-smc.o firmware.o
obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o sleep.o
obj-$(CONFIG_PM_SLEEP) += suspend.o
-obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
diff --git a/drivers/soc/samsung/Makefile b/drivers/soc/samsung/Makefile
index f64ac4d80564..8acba2bbbd78 100644
--- a/drivers/soc/samsung/Makefile
+++ b/drivers/soc/samsung/Makefile
@@ -1,2 +1,3 @@
+obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
obj-$(CONFIG_EXYNOS_PMU) += exynos-pmu.o exynos3250-pmu.o exynos4-pmu.o \
exynos5250-pmu.o exynos5420-pmu.o
diff --git a/arch/arm/mach-exynos/pm_domains.c b/drivers/soc/samsung/pm_domains.c
similarity index 100%
rename from arch/arm/mach-exynos/pm_domains.c
rename to drivers/soc/samsung/pm_domains.c
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] soc: samsung: pm_domains: Prepare for supporting ARMv8 Exynos
2016-05-10 13:52 [PATCH 1/2] ARM: EXYNOS: Move pm_domains driver to drivers/soc/samsung Krzysztof Kozlowski
@ 2016-05-10 13:52 ` Krzysztof Kozlowski
2016-05-11 14:13 ` Javier Martinez Canillas
2016-05-11 14:11 ` [PATCH 1/2] ARM: EXYNOS: Move pm_domains driver to drivers/soc/samsung Javier Martinez Canillas
1 sibling, 1 reply; 4+ messages in thread
From: Krzysztof Kozlowski @ 2016-05-10 13:52 UTC (permalink / raw)
To: Kukjin Kim, Krzysztof Kozlowski, linux-arm-kernel,
linux-samsung-soc, linux-kernel
Cc: Marek Szyprowski, Javier Martinez Canillas, Bartlomiej Zolnierkiewicz
The ARMv8 Exynos family (Exynos5433 and Exynos7420) uses different value
(0xf instead of 0x7) for controlling the power domain on/off registers
(both for control and for status).
Choose the value depending on the compatible. This prepares the driver
for supporting ARMv8 SoCs.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
drivers/soc/samsung/pm_domains.c | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/drivers/soc/samsung/pm_domains.c b/drivers/soc/samsung/pm_domains.c
index 875a2bab64f6..f60515eefb66 100644
--- a/drivers/soc/samsung/pm_domains.c
+++ b/drivers/soc/samsung/pm_domains.c
@@ -23,9 +23,13 @@
#include <linux/of_platform.h>
#include <linux/sched.h>
-#define INT_LOCAL_PWR_EN 0x7
#define MAX_CLK_PER_DOMAIN 4
+struct exynos_pm_domain_config {
+ /* Value for LOCAL_PWR_CFG and STATUS fields for each domain */
+ u32 local_pwr_cfg;
+};
+
/*
* Exynos specific wrapper around the generic power domain
*/
@@ -38,6 +42,7 @@ struct exynos_pm_domain {
struct clk *clk[MAX_CLK_PER_DOMAIN];
struct clk *pclk[MAX_CLK_PER_DOMAIN];
struct clk *asb_clk[MAX_CLK_PER_DOMAIN];
+ u32 local_pwr_cfg;
};
static int exynos_pd_power(struct generic_pm_domain *domain, bool power_on)
@@ -69,13 +74,13 @@ static int exynos_pd_power(struct generic_pm_domain *domain, bool power_on)
}
}
- pwr = power_on ? INT_LOCAL_PWR_EN : 0;
+ pwr = power_on ? pd->local_pwr_cfg : 0;
__raw_writel(pwr, base);
/* Wait max 1ms */
timeout = 10;
- while ((__raw_readl(base + 0x4) & INT_LOCAL_PWR_EN) != pwr) {
+ while ((__raw_readl(base + 0x4) & pd->local_pwr_cfg) != pwr) {
if (!timeout) {
op = (power_on) ? "enable" : "disable";
pr_err("Power domain %s %s failed\n", domain->name, op);
@@ -119,14 +124,30 @@ static int exynos_pd_power_off(struct generic_pm_domain *domain)
return exynos_pd_power(domain, false);
}
+static const struct exynos_pm_domain_config exynos4210_cfg __initconst = {
+ .local_pwr_cfg = 0x7,
+};
+
+static const struct of_device_id exynos_pm_domain_of_match[] __initconst = {
+ {
+ .compatible = "samsung,exynos4210-pd",
+ .data = &exynos4210_cfg,
+ },
+ { },
+};
+
static __init int exynos4_pm_init_power_domain(void)
{
struct device_node *np;
+ const struct of_device_id *match;
- for_each_compatible_node(np, NULL, "samsung,exynos4210-pd") {
+ for_each_matching_node_and_match(np, exynos_pm_domain_of_match, &match) {
+ const struct exynos_pm_domain_config *pm_domain_cfg;
struct exynos_pm_domain *pd;
int on, i;
+ pm_domain_cfg = match->data;
+
pd = kzalloc(sizeof(*pd), GFP_KERNEL);
if (!pd) {
pr_err("%s: failed to allocate memory for domain\n",
@@ -153,6 +174,7 @@ static __init int exynos4_pm_init_power_domain(void)
pd->pd.power_off = exynos_pd_power_off;
pd->pd.power_on = exynos_pd_power_on;
+ pd->local_pwr_cfg = pm_domain_cfg->local_pwr_cfg;
for (i = 0; i < MAX_CLK_PER_DOMAIN; i++) {
char clk_name[8];
@@ -185,14 +207,14 @@ static __init int exynos4_pm_init_power_domain(void)
clk_put(pd->oscclk);
no_clk:
- on = __raw_readl(pd->base + 0x4) & INT_LOCAL_PWR_EN;
+ on = __raw_readl(pd->base + 0x4) & pd->local_pwr_cfg;
pm_genpd_init(&pd->pd, NULL, !on);
of_genpd_add_provider_simple(np, &pd->pd);
}
/* Assign the child power domains to their parents */
- for_each_compatible_node(np, NULL, "samsung,exynos4210-pd") {
+ for_each_matching_node(np, exynos_pm_domain_of_match) {
struct generic_pm_domain *child_domain, *parent_domain;
struct of_phandle_args args;
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ARM: EXYNOS: Move pm_domains driver to drivers/soc/samsung
2016-05-10 13:52 [PATCH 1/2] ARM: EXYNOS: Move pm_domains driver to drivers/soc/samsung Krzysztof Kozlowski
2016-05-10 13:52 ` [PATCH 2/2] soc: samsung: pm_domains: Prepare for supporting ARMv8 Exynos Krzysztof Kozlowski
@ 2016-05-11 14:11 ` Javier Martinez Canillas
1 sibling, 0 replies; 4+ messages in thread
From: Javier Martinez Canillas @ 2016-05-11 14:11 UTC (permalink / raw)
To: Krzysztof Kozlowski, Kukjin Kim, linux-arm-kernel,
linux-samsung-soc, linux-kernel
Cc: Marek Szyprowski, Bartlomiej Zolnierkiewicz
Hello Krzysztof,
On 05/10/2016 09:52 AM, Krzysztof Kozlowski wrote:
> Exynos PM domains driver does not have mach-specific dependencies so it
> can be safely moved out of arm/mach-exynos to drivers/soc. This in
> future will allow re-using it on ARM64 boards.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] soc: samsung: pm_domains: Prepare for supporting ARMv8 Exynos
2016-05-10 13:52 ` [PATCH 2/2] soc: samsung: pm_domains: Prepare for supporting ARMv8 Exynos Krzysztof Kozlowski
@ 2016-05-11 14:13 ` Javier Martinez Canillas
0 siblings, 0 replies; 4+ messages in thread
From: Javier Martinez Canillas @ 2016-05-11 14:13 UTC (permalink / raw)
To: Krzysztof Kozlowski, Kukjin Kim, linux-arm-kernel,
linux-samsung-soc, linux-kernel
Cc: Marek Szyprowski, Bartlomiej Zolnierkiewicz
Hello Krzysztof,
On 05/10/2016 09:52 AM, Krzysztof Kozlowski wrote:
> The ARMv8 Exynos family (Exynos5433 and Exynos7420) uses different value
> (0xf instead of 0x7) for controlling the power domain on/off registers
> (both for control and for status).
>
> Choose the value depending on the compatible. This prepares the driver
> for supporting ARMv8 SoCs.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-05-11 14:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-10 13:52 [PATCH 1/2] ARM: EXYNOS: Move pm_domains driver to drivers/soc/samsung Krzysztof Kozlowski
2016-05-10 13:52 ` [PATCH 2/2] soc: samsung: pm_domains: Prepare for supporting ARMv8 Exynos Krzysztof Kozlowski
2016-05-11 14:13 ` Javier Martinez Canillas
2016-05-11 14:11 ` [PATCH 1/2] ARM: EXYNOS: Move pm_domains driver to drivers/soc/samsung Javier Martinez Canillas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).