From: Tero Kristo <t-kristo@ti.com>
To: tony@atomide.com, linux-omap@vger.kernel.org, paul@pwsan.com, nm@ti.com
Cc: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 15/23] ARM: OMAP2+: PRM: determine PRM base address from device tree
Date: Thu, 27 Nov 2014 17:51:46 +0200 [thread overview]
Message-ID: <1417103514-17027-16-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1417103514-17027-1-git-send-email-t-kristo@ti.com>
There is no need to provide the PRM base address through a low-level API
from the low-level IO init, as this information is available through DT.
Re-routed the parsing function to be called from the PRM drivers also to
simplify the implementation under io.c.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
arch/arm/mach-omap2/io.c | 11 ++------
arch/arm/mach-omap2/prm.h | 1 +
arch/arm/mach-omap2/prm2xxx.c | 1 +
arch/arm/mach-omap2/prm33xx.c | 1 +
arch/arm/mach-omap2/prm3xxx.c | 2 ++
arch/arm/mach-omap2/prm44xx.c | 1 +
arch/arm/mach-omap2/prm_common.c | 53 +++++++++++++++++++++++++++++++-------
7 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 8af8411..6a94345 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -386,7 +386,6 @@ void __init omap2420_init_early(void)
OMAP2_L3_IO_ADDRESS(OMAP2420_SMS_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP242X_CTRL_BASE),
NULL);
- omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP2420_PRM_BASE));
omap2xxx_check_revision();
omap2xxx_prm_init();
omap2xxx_cm_init();
@@ -415,7 +414,6 @@ void __init omap2430_init_early(void)
OMAP2_L3_IO_ADDRESS(OMAP243X_SMS_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP243X_CTRL_BASE),
NULL);
- omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP2430_PRM_BASE));
omap2xxx_check_revision();
omap2xxx_prm_init();
omap2xxx_cm_init();
@@ -448,9 +446,8 @@ void __init omap3_init_early(void)
OMAP2_L3_IO_ADDRESS(OMAP343X_SMS_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE),
NULL);
+ /* XXX: remove these two once OMAP3 is DT only */
omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE));
-
- /* XXX: remove this once OMAP3 is DT only */
omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE), NULL);
omap3xxx_check_revision();
omap3xxx_check_features();
@@ -498,6 +495,7 @@ void __init ti81xx_init_early(void)
OMAP2_L4_IO_ADDRESS(TI81XX_TAP_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(TI81XX_CTRL_BASE),
NULL);
+ /* XXX: remove these two once TI81xx is DT only */
omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE));
omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE), NULL);
omap3xxx_check_revision();
@@ -563,7 +561,6 @@ void __init am33xx_init_early(void)
AM33XX_L4_WK_IO_ADDRESS(AM33XX_TAP_BASE));
omap2_set_globals_control(AM33XX_L4_WK_IO_ADDRESS(AM33XX_CTRL_BASE),
NULL);
- omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE));
omap3xxx_check_revision();
am33xx_check_features();
am33xx_prm_init();
@@ -588,7 +585,6 @@ void __init am43xx_init_early(void)
AM33XX_L4_WK_IO_ADDRESS(AM33XX_TAP_BASE));
omap2_set_globals_control(AM33XX_L4_WK_IO_ADDRESS(AM33XX_CTRL_BASE),
NULL);
- omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE));
omap3xxx_check_revision();
am33xx_check_features();
omap44xx_prm_init();
@@ -614,7 +610,6 @@ void __init omap4430_init_early(void)
OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),
OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE));
- omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE));
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE));
omap4xxx_check_revision();
omap4xxx_check_features();
@@ -645,7 +640,6 @@ void __init omap5_init_early(void)
OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),
OMAP2_L4_IO_ADDRESS(OMAP54XX_CTRL_BASE));
- omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRM_BASE));
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
omap4_pm_init_early();
omap44xx_prm_init();
@@ -673,7 +667,6 @@ void __init dra7xx_init_early(void)
omap2_set_globals_tap(-1, OMAP2_L4_IO_ADDRESS(DRA7XX_TAP_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),
OMAP2_L4_IO_ADDRESS(DRA7XX_CTRL_BASE));
- omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRM_BASE));
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
omap4_pm_init_early();
omap44xx_prm_init();
diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h
index 6521eaa..6707333 100644
--- a/arch/arm/mach-omap2/prm.h
+++ b/arch/arm/mach-omap2/prm.h
@@ -20,6 +20,7 @@ extern void __iomem *prm_base;
extern u16 prm_features;
extern void omap2_set_globals_prm(void __iomem *prm);
int omap_prcm_init(void);
+int omap2_prm_base_init(void);
# endif
/*
diff --git a/arch/arm/mach-omap2/prm2xxx.c b/arch/arm/mach-omap2/prm2xxx.c
index bacb05e..29e203f 100644
--- a/arch/arm/mach-omap2/prm2xxx.c
+++ b/arch/arm/mach-omap2/prm2xxx.c
@@ -222,6 +222,7 @@ static struct prm_ll_data omap2xxx_prm_ll_data = {
int __init omap2xxx_prm_init(void)
{
+ omap2_prm_base_init();
return prm_register(&omap2xxx_prm_ll_data);
}
diff --git a/arch/arm/mach-omap2/prm33xx.c b/arch/arm/mach-omap2/prm33xx.c
index 02f6286..1e052aa 100644
--- a/arch/arm/mach-omap2/prm33xx.c
+++ b/arch/arm/mach-omap2/prm33xx.c
@@ -380,6 +380,7 @@ static struct prm_ll_data am33xx_prm_ll_data = {
int __init am33xx_prm_init(void)
{
+ omap2_prm_base_init();
return prm_register(&am33xx_prm_ll_data);
}
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 8993ab7..994fb8b 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -671,6 +671,8 @@ static struct prm_ll_data omap3xxx_prm_ll_data = {
int __init omap3xxx_prm_init(void)
{
+ omap2_prm_base_init();
+
if (omap3_has_io_wakeup())
prm_features |= PRM_HAS_IO_WAKEUP;
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index 2692339..016759f 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -704,6 +704,7 @@ static struct prm_ll_data omap44xx_prm_ll_data = {
int __init omap44xx_prm_init(void)
{
+ omap2_prm_base_init();
omap_prm_base_init();
if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx())
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 21e9d16..7d4a97a 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -622,11 +622,21 @@ int prm_unregister(struct prm_ll_data *pld)
return 0;
}
-static const struct omap_prcm_init_data prm_data = {
+static struct omap_prcm_init_data prm_data = {
.index = CLK_MEMMAP_INDEX_PRM,
};
-static const struct omap_prcm_init_data scrm_data = {
+static struct omap_prcm_init_data omap3_prm_data = {
+ .index = CLK_MEMMAP_INDEX_PRM,
+
+ /*
+ * IVA2 offset is negative value, must offset the cm_base address
+ * by this to get it to positive
+ */
+ .offset = -OMAP3430_IVA2_MOD,
+};
+
+static struct omap_prcm_init_data scrm_data = {
.index = CLK_MEMMAP_INDEX_SCRM,
};
@@ -634,7 +644,7 @@ static struct of_device_id omap_prcm_dt_match_table[] = {
{ .compatible = "ti,am3-prcm", .data = &prm_data },
{ .compatible = "ti,am4-prcm", .data = &prm_data },
{ .compatible = "ti,omap2-prcm", .data = &prm_data },
- { .compatible = "ti,omap3-prm", .data = &prm_data },
+ { .compatible = "ti,omap3-prm", .data = &omap3_prm_data },
{ .compatible = "ti,omap4-prm", .data = &prm_data },
{ .compatible = "ti,omap4-scrm", .data = &scrm_data },
{ .compatible = "ti,omap5-prm", .data = &prm_data },
@@ -644,6 +654,36 @@ static struct of_device_id omap_prcm_dt_match_table[] = {
};
/**
+ * omap2_prm_base_init - initialize iomappings for the PRM driver
+ *
+ * Detects and initializes the iomappings for the PRM driver, based
+ * on the DT data. Returns 0 in success, negative error value
+ * otherwise.
+ */
+int __init omap2_prm_base_init(void)
+{
+ struct device_node *np;
+ const struct of_device_id *match;
+ struct omap_prcm_init_data *data;
+ void __iomem *mem;
+
+ for_each_matching_node_and_match(np, omap_prcm_dt_match_table, &match) {
+ data = (struct omap_prcm_init_data *)match->data;
+
+ mem = of_iomap(np, 0);
+ if (!mem)
+ return -ENOMEM;
+
+ if (data->index == CLK_MEMMAP_INDEX_PRM)
+ prm_base = mem + data->offset;
+
+ data->mem = mem;
+ }
+
+ return 0;
+}
+
+/**
* omap_prcm_init - low level init for the PRCM drivers
*
* Initializes the low level clock infrastructure for PRCM drivers.
@@ -654,17 +694,12 @@ int __init omap_prcm_init(void)
struct device_node *np;
const struct of_device_id *match;
const struct omap_prcm_init_data *data;
- void __iomem *mem;
int ret;
for_each_matching_node_and_match(np, omap_prcm_dt_match_table, &match) {
data = match->data;
- mem = of_iomap(np, 0);
- if (!mem)
- return -ENOMEM;
-
- ret = omap2_clk_provider_init(np, data->index, mem);
+ ret = omap2_clk_provider_init(np, data->index, data->mem);
if (ret)
return ret;
}
--
1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: t-kristo@ti.com (Tero Kristo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 15/23] ARM: OMAP2+: PRM: determine PRM base address from device tree
Date: Thu, 27 Nov 2014 17:51:46 +0200 [thread overview]
Message-ID: <1417103514-17027-16-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1417103514-17027-1-git-send-email-t-kristo@ti.com>
There is no need to provide the PRM base address through a low-level API
from the low-level IO init, as this information is available through DT.
Re-routed the parsing function to be called from the PRM drivers also to
simplify the implementation under io.c.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
arch/arm/mach-omap2/io.c | 11 ++------
arch/arm/mach-omap2/prm.h | 1 +
arch/arm/mach-omap2/prm2xxx.c | 1 +
arch/arm/mach-omap2/prm33xx.c | 1 +
arch/arm/mach-omap2/prm3xxx.c | 2 ++
arch/arm/mach-omap2/prm44xx.c | 1 +
arch/arm/mach-omap2/prm_common.c | 53 +++++++++++++++++++++++++++++++-------
7 files changed, 52 insertions(+), 18 deletions(-)
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 8af8411..6a94345 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -386,7 +386,6 @@ void __init omap2420_init_early(void)
OMAP2_L3_IO_ADDRESS(OMAP2420_SMS_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP242X_CTRL_BASE),
NULL);
- omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP2420_PRM_BASE));
omap2xxx_check_revision();
omap2xxx_prm_init();
omap2xxx_cm_init();
@@ -415,7 +414,6 @@ void __init omap2430_init_early(void)
OMAP2_L3_IO_ADDRESS(OMAP243X_SMS_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP243X_CTRL_BASE),
NULL);
- omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP2430_PRM_BASE));
omap2xxx_check_revision();
omap2xxx_prm_init();
omap2xxx_cm_init();
@@ -448,9 +446,8 @@ void __init omap3_init_early(void)
OMAP2_L3_IO_ADDRESS(OMAP343X_SMS_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE),
NULL);
+ /* XXX: remove these two once OMAP3 is DT only */
omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP3430_PRM_BASE));
-
- /* XXX: remove this once OMAP3 is DT only */
omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP3430_CM_BASE), NULL);
omap3xxx_check_revision();
omap3xxx_check_features();
@@ -498,6 +495,7 @@ void __init ti81xx_init_early(void)
OMAP2_L4_IO_ADDRESS(TI81XX_TAP_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(TI81XX_CTRL_BASE),
NULL);
+ /* XXX: remove these two once TI81xx is DT only */
omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE));
omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE), NULL);
omap3xxx_check_revision();
@@ -563,7 +561,6 @@ void __init am33xx_init_early(void)
AM33XX_L4_WK_IO_ADDRESS(AM33XX_TAP_BASE));
omap2_set_globals_control(AM33XX_L4_WK_IO_ADDRESS(AM33XX_CTRL_BASE),
NULL);
- omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE));
omap3xxx_check_revision();
am33xx_check_features();
am33xx_prm_init();
@@ -588,7 +585,6 @@ void __init am43xx_init_early(void)
AM33XX_L4_WK_IO_ADDRESS(AM33XX_TAP_BASE));
omap2_set_globals_control(AM33XX_L4_WK_IO_ADDRESS(AM33XX_CTRL_BASE),
NULL);
- omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM43XX_PRCM_BASE));
omap3xxx_check_revision();
am33xx_check_features();
omap44xx_prm_init();
@@ -614,7 +610,6 @@ void __init omap4430_init_early(void)
OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE),
OMAP2_L4_IO_ADDRESS(OMAP443X_CTRL_BASE));
- omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP4430_PRM_BASE));
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP4430_PRCM_MPU_BASE));
omap4xxx_check_revision();
omap4xxx_check_features();
@@ -645,7 +640,6 @@ void __init omap5_init_early(void)
OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),
OMAP2_L4_IO_ADDRESS(OMAP54XX_CTRL_BASE));
- omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRM_BASE));
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
omap4_pm_init_early();
omap44xx_prm_init();
@@ -673,7 +667,6 @@ void __init dra7xx_init_early(void)
omap2_set_globals_tap(-1, OMAP2_L4_IO_ADDRESS(DRA7XX_TAP_BASE));
omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),
OMAP2_L4_IO_ADDRESS(DRA7XX_CTRL_BASE));
- omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRM_BASE));
omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
omap4_pm_init_early();
omap44xx_prm_init();
diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h
index 6521eaa..6707333 100644
--- a/arch/arm/mach-omap2/prm.h
+++ b/arch/arm/mach-omap2/prm.h
@@ -20,6 +20,7 @@ extern void __iomem *prm_base;
extern u16 prm_features;
extern void omap2_set_globals_prm(void __iomem *prm);
int omap_prcm_init(void);
+int omap2_prm_base_init(void);
# endif
/*
diff --git a/arch/arm/mach-omap2/prm2xxx.c b/arch/arm/mach-omap2/prm2xxx.c
index bacb05e..29e203f 100644
--- a/arch/arm/mach-omap2/prm2xxx.c
+++ b/arch/arm/mach-omap2/prm2xxx.c
@@ -222,6 +222,7 @@ static struct prm_ll_data omap2xxx_prm_ll_data = {
int __init omap2xxx_prm_init(void)
{
+ omap2_prm_base_init();
return prm_register(&omap2xxx_prm_ll_data);
}
diff --git a/arch/arm/mach-omap2/prm33xx.c b/arch/arm/mach-omap2/prm33xx.c
index 02f6286..1e052aa 100644
--- a/arch/arm/mach-omap2/prm33xx.c
+++ b/arch/arm/mach-omap2/prm33xx.c
@@ -380,6 +380,7 @@ static struct prm_ll_data am33xx_prm_ll_data = {
int __init am33xx_prm_init(void)
{
+ omap2_prm_base_init();
return prm_register(&am33xx_prm_ll_data);
}
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index 8993ab7..994fb8b 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -671,6 +671,8 @@ static struct prm_ll_data omap3xxx_prm_ll_data = {
int __init omap3xxx_prm_init(void)
{
+ omap2_prm_base_init();
+
if (omap3_has_io_wakeup())
prm_features |= PRM_HAS_IO_WAKEUP;
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index 2692339..016759f 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -704,6 +704,7 @@ static struct prm_ll_data omap44xx_prm_ll_data = {
int __init omap44xx_prm_init(void)
{
+ omap2_prm_base_init();
omap_prm_base_init();
if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx())
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 21e9d16..7d4a97a 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -622,11 +622,21 @@ int prm_unregister(struct prm_ll_data *pld)
return 0;
}
-static const struct omap_prcm_init_data prm_data = {
+static struct omap_prcm_init_data prm_data = {
.index = CLK_MEMMAP_INDEX_PRM,
};
-static const struct omap_prcm_init_data scrm_data = {
+static struct omap_prcm_init_data omap3_prm_data = {
+ .index = CLK_MEMMAP_INDEX_PRM,
+
+ /*
+ * IVA2 offset is negative value, must offset the cm_base address
+ * by this to get it to positive
+ */
+ .offset = -OMAP3430_IVA2_MOD,
+};
+
+static struct omap_prcm_init_data scrm_data = {
.index = CLK_MEMMAP_INDEX_SCRM,
};
@@ -634,7 +644,7 @@ static struct of_device_id omap_prcm_dt_match_table[] = {
{ .compatible = "ti,am3-prcm", .data = &prm_data },
{ .compatible = "ti,am4-prcm", .data = &prm_data },
{ .compatible = "ti,omap2-prcm", .data = &prm_data },
- { .compatible = "ti,omap3-prm", .data = &prm_data },
+ { .compatible = "ti,omap3-prm", .data = &omap3_prm_data },
{ .compatible = "ti,omap4-prm", .data = &prm_data },
{ .compatible = "ti,omap4-scrm", .data = &scrm_data },
{ .compatible = "ti,omap5-prm", .data = &prm_data },
@@ -644,6 +654,36 @@ static struct of_device_id omap_prcm_dt_match_table[] = {
};
/**
+ * omap2_prm_base_init - initialize iomappings for the PRM driver
+ *
+ * Detects and initializes the iomappings for the PRM driver, based
+ * on the DT data. Returns 0 in success, negative error value
+ * otherwise.
+ */
+int __init omap2_prm_base_init(void)
+{
+ struct device_node *np;
+ const struct of_device_id *match;
+ struct omap_prcm_init_data *data;
+ void __iomem *mem;
+
+ for_each_matching_node_and_match(np, omap_prcm_dt_match_table, &match) {
+ data = (struct omap_prcm_init_data *)match->data;
+
+ mem = of_iomap(np, 0);
+ if (!mem)
+ return -ENOMEM;
+
+ if (data->index == CLK_MEMMAP_INDEX_PRM)
+ prm_base = mem + data->offset;
+
+ data->mem = mem;
+ }
+
+ return 0;
+}
+
+/**
* omap_prcm_init - low level init for the PRCM drivers
*
* Initializes the low level clock infrastructure for PRCM drivers.
@@ -654,17 +694,12 @@ int __init omap_prcm_init(void)
struct device_node *np;
const struct of_device_id *match;
const struct omap_prcm_init_data *data;
- void __iomem *mem;
int ret;
for_each_matching_node_and_match(np, omap_prcm_dt_match_table, &match) {
data = match->data;
- mem = of_iomap(np, 0);
- if (!mem)
- return -ENOMEM;
-
- ret = omap2_clk_provider_init(np, data->index, mem);
+ ret = omap2_clk_provider_init(np, data->index, data->mem);
if (ret)
return ret;
}
--
1.7.9.5
next prev parent reply other threads:[~2014-11-27 15:52 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-27 15:51 [PATCH 00/23] ARM: OMAP2+: PRCM cleanups towards 3.19 / part2 Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 01/23] ARM: OMAP2+: clock: move clock provider infrastructure to clock driver Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2015-01-24 21:51 ` Paul Walmsley
2015-01-24 21:51 ` Paul Walmsley
2015-01-26 10:38 ` Tomi Valkeinen
2015-01-26 10:38 ` Tomi Valkeinen
2015-01-26 15:49 ` Tony Lindgren
2015-01-26 15:49 ` Tony Lindgren
2015-01-27 11:34 ` Tomi Valkeinen
2015-01-27 11:34 ` Tomi Valkeinen
2015-01-27 16:50 ` Tony Lindgren
2015-01-27 16:50 ` Tony Lindgren
2015-02-13 15:06 ` Tero Kristo
2015-02-13 15:06 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 02/23] ARM: OMAP2+: PRCM: rename of_prcm_init to omap_prcm_init Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 03/23] ARM: OMAP2+: PRCM: split PRCM module init to their own driver files Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 04/23] ARM: OMAP24xx: clock: remove unused apll code Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2015-01-07 19:06 ` Tony Lindgren
2015-01-07 19:06 ` Tony Lindgren
2014-11-27 15:51 ` [PATCH 05/23] ARM: OMAP2: CM: remove unused PLL functions Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2015-01-07 19:06 ` Tony Lindgren
2015-01-07 19:06 ` Tony Lindgren
2014-11-27 15:51 ` [PATCH 06/23] ARM: OMAP3: PRM: invert the wkst_mask for the prm_clear_mod_irqs Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 07/23] ARM: OMAP2+: PRM: add generic API for clear_mod_irqs Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 08/23] ARM: OMAP3+: PRM: remove prm_get_reset_sources declaration from headers Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2015-01-07 19:06 ` Tony Lindgren
2015-01-07 19:06 ` Tony Lindgren
2014-11-27 15:51 ` [PATCH 09/23] ARM: OMAP3+: PRM: add common APIs for prm_vp_check/clear_txdone Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 10/23] ARM: OMAP4+: PRM: move omap_prm_base_init under OMAP4 PRM driver Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 11/23] ARM: OMAP4+: CM: move omap_cm_base_init under OMAP4 CM driver Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 12/23] ARM: OMAP2+: clock: add support for static clock memmap indexes Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 13/23] ARM: OMAP2+: CM: determine CM base address from device tree Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2015-01-24 19:39 ` Paul Walmsley
2015-01-24 19:39 ` Paul Walmsley
2015-02-13 15:07 ` Tero Kristo
2015-02-13 15:07 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 14/23] ARM: OMAP4: PRM: move omap4xxx_prm_init earlier in init order Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` Tero Kristo [this message]
2014-11-27 15:51 ` [PATCH 15/23] ARM: OMAP2+: PRM: determine PRM base address from device tree Tero Kristo
2014-11-27 15:51 ` [PATCH 16/23] ARM: OMAP4: omapdss: remove legacy pad muxing support Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 16:09 ` Tomi Valkeinen
2014-11-27 16:09 ` Tomi Valkeinen
2014-11-28 7:58 ` Tero Kristo
2014-11-28 7:58 ` Tero Kristo
2015-01-24 20:06 ` Paul Walmsley
2015-01-24 20:06 ` Paul Walmsley
2014-11-27 15:51 ` [PATCH 17/23] ARM: OMAP4: control: remove support for legacy padconf APIs Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2015-01-24 20:06 ` Paul Walmsley
2015-01-24 20:06 ` Paul Walmsley
2014-11-27 15:51 ` [PATCH 18/23] ARM: OMAP2+: control: determine control module base address from DT Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 19/23] ARM: OMAP2+: PRM: move SoC specific init calls within a generic API Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 20/23] ARM: OMAP4+: PRM: determine prm_device_inst based on DT compatibility Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 21/23] ARM: OMAP2+: CM: move SoC specific init calls within a generic API Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 22/23] ARM: OMAP4+: PRM: setup prm_features from the PRM init time flags Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 15:51 ` [PATCH 23/23] ARM: OMAP4+: PRM: get rid of cpu_is_omap44xx calls from interrupt init Tero Kristo
2014-11-27 15:51 ` Tero Kristo
2014-11-27 19:15 ` [PATCH 00/23] ARM: OMAP2+: PRCM cleanups towards 3.19 / part2 Paul Walmsley
2014-11-27 19:15 ` Paul Walmsley
2014-12-01 15:58 ` Tero Kristo
2014-12-01 15:58 ` Tero Kristo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1417103514-17027-16-git-send-email-t-kristo@ti.com \
--to=t-kristo@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=nm@ti.com \
--cc=paul@pwsan.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.