From: Loic Pallardy <loic.pallardy-ext@stericsson.com>
To: Samuel Ortiz <sameo@linux.intel.com>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Linus Walleij <linus.walleij@linaro.com>
Cc: Lee Jones <lee.jones@linaro.org>,
Loic Pallardy <loic.pallardy@gmail.com>,
LT ST-Ericsson <st-ericsson@lists.linaro.org>,
STEricsson_nomadik_linux <STEricsson_nomadik_linux@list.st.com>,
Loic Pallardy <loic.pallardy-ext@stericsson.com>,
Loic Pallardy <loic.pallardy@stericsson.com>
Subject: [PATCH 17/17] mfd: db8500-prcmu: activate dbx540-prcmu driver
Date: Wed, 5 Sep 2012 11:59:13 +0200 [thread overview]
Message-ID: <1346839153-6465-18-git-send-email-loic.pallardy-ext@stericsson.com> (raw)
In-Reply-To: <1346839153-6465-1-git-send-email-loic.pallardy-ext@stericsson.com>
db8500-prcmu clean up, removing dbx540 definition from
db8500-prcmu file.
Signed-off-by: Loic Pallardy <loic.pallardy@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/mfd/db8500-prcmu.c | 30 ++----------------------------
drivers/mfd/dbx500-prcmu.c | 6 ++++--
2 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index b39441f..164c9d5 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2988,28 +2988,6 @@ static struct mfd_cell db8500_prcmu_devs[] = {
},
};
-static struct mfd_cell db9540_prcmu_devs[] = {
- {
- .name = "dbx500-prcmu",
- .platform_data = &db8500_probe_data,
- .pdata_size = sizeof(db8500_probe_data),
- },
- {
- .name = "db8500-prcmu-regulators",
- .of_compatible = "stericsson,db8500-prcmu-regulator",
- .platform_data = &db8500_regulators,
- .pdata_size = sizeof(db8500_regulators),
- },
- {
- .name = "ab9540-i2c",
- .of_compatible = "stericsson,ab8500",
- .num_resources = ARRAY_SIZE(ab8500_resources),
- .resources = ab8500_resources,
- .id = AB8500_VERSION_AB9540,
- },
-};
-
-
/**
* prcmu_fw_init - arch init call for the Linux PRCMU fw init logic
*
@@ -3052,14 +3030,10 @@ static int __devinit db8500_prcmu_probe(struct platform_device *pdev)
}
}
- if (cpu_is_u8500v20_or_later() && !cpu_is_u9540())
+ if (cpu_is_u8500v20_or_later())
db8500_prcmu_config_esram0_deep_sleep(ESRAM0_DEEP_SLEEP_STATE_RET);
- if (cpu_is_u9540())
- err = mfd_add_devices(&pdev->dev, 0, db9540_prcmu_devs,
- ARRAY_SIZE(db9540_prcmu_devs), NULL, 0);
- else
- err = mfd_add_devices(&pdev->dev, 0, db8500_prcmu_devs,
+ err = mfd_add_devices(&pdev->dev, 0, db8500_prcmu_devs,
ARRAY_SIZE(db8500_prcmu_devs), NULL, 0);
if (err) {
diff --git a/drivers/mfd/dbx500-prcmu.c b/drivers/mfd/dbx500-prcmu.c
index 1823ab7..964804e 100644
--- a/drivers/mfd/dbx500-prcmu.c
+++ b/drivers/mfd/dbx500-prcmu.c
@@ -725,8 +725,10 @@ void __init prcmu_early_init(struct prcmu_tcdm_map *map)
{
int i, ret = 0;
struct prcmu_fops_register_data *data;
-
- data = db8500_prcmu_early_init(map);
+ if (cpu_is_ux540_family())
+ data = dbx540_prcmu_early_init(map);
+ else
+ data = db8500_prcmu_early_init(map);
if (data == NULL)
return;
--
1.7.11.1
prev parent reply other threads:[~2012-09-05 10:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-05 9:58 [PATCH 00/17] Add ST-Ericsson U9540 support Loic Pallardy
2012-09-05 9:58 ` [PATCH 01/17] arm: ux500: add u9540 pin configuration Loic Pallardy
2012-09-05 9:58 ` [PATCH 02/17] arm: ux500: add ccu9540 board support Loic Pallardy
2012-09-05 10:42 ` Arnd Bergmann
2012-09-05 11:38 ` Loic PALLARDY
2012-09-05 12:08 ` Linus Walleij
2012-09-05 12:11 ` Arnd Bergmann
2012-09-05 12:41 ` [st-ericsson] " Linus Walleij
2012-09-05 9:58 ` [PATCH 03/17] arm: ux500: Create board-specific IRQ init callback Loic Pallardy
2012-09-05 9:59 ` [PATCH 04/17] mfd: dbx500-prcmu: Introduce TCDM mapping struct Loic Pallardy
2012-09-05 9:59 ` [PATCH 05/17] mfd: dbx500-prcmu: Handle TCDM mapping Loic Pallardy
2012-09-05 9:59 ` [PATCH 06/17] arm: ux500: Add u9540 PRCMU TCDM configuration Loic Pallardy
2012-09-05 9:59 ` [PATCH 07/17] mfd: prcmu: configurable tcdm base address Loic Pallardy
2012-09-05 9:59 ` [PATCH 08/17] arm: ux500: update DB internal irq nb Loic Pallardy
2012-09-05 9:59 ` [PATCH 09/17] mfd: prcmu: add db9540 support Loic Pallardy
2012-09-05 9:59 ` [PATCH 10/17] mfd: prcmu: dbx500-prmcu creation Loic Pallardy
2012-09-05 9:59 ` [PATCH 11/17] mfd: pcrmu: create common header file for legacy mailbox Loic Pallardy
2012-09-05 9:59 ` [PATCH 12/17] mfd: prcmu: make fw_project_name generic Loic Pallardy
2012-09-05 9:59 ` [PATCH 13/17] mfd: prcmu: make legacy mailbox services configurable Loic Pallardy
2012-09-05 9:59 ` [PATCH 14/17] mfd: db8500-prcmu: use db8500 legacy services Loic Pallardy
2012-09-05 11:01 ` Arnd Bergmann
2012-09-05 9:59 ` [PATCH 15/17] mfd: dbx540-prcmu creation Loic Pallardy
2012-09-05 12:10 ` Arnd Bergmann
2012-09-05 12:39 ` [st-ericsson] " Linus Walleij
2012-09-05 12:52 ` Arnd Bergmann
2012-09-05 9:59 ` [PATCH 16/17] arm: ux500: add dbx540 prcmu platform data Loic Pallardy
2012-09-05 9:59 ` Loic Pallardy [this message]
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=1346839153-6465-18-git-send-email-loic.pallardy-ext@stericsson.com \
--to=loic.pallardy-ext@stericsson.com \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loic.pallardy@gmail.com \
--cc=loic.pallardy@stericsson.com \
--cc=sameo@linux.intel.com \
--cc=st-ericsson@lists.linaro.org \
/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 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).