From patchwork Wed Sep 5 09:59:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 1408191 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id E555540220 for ; Wed, 5 Sep 2012 10:10:09 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9CTq-0008LL-28; Wed, 05 Sep 2012 10:05:07 +0000 Received: from eu1sys200aog112.obsmtp.com ([207.126.144.133]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9CPL-0005CC-4b for linux-arm-kernel@lists.infradead.org; Wed, 05 Sep 2012 10:00:29 +0000 Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob112.postini.com ([207.126.147.11]) with SMTP ID DSNKUEcikwdOup7LKLqqmFM9SBO0aW3bHct8@postini.com; Wed, 05 Sep 2012 10:00:26 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id 90EF05C; Wed, 5 Sep 2012 09:59:15 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 6F6B1AB; Wed, 5 Sep 2012 06:05:45 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 22E22A8065; Wed, 5 Sep 2012 11:59:39 +0200 (CEST) Received: from lmenx30v.lme.st.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 5 Sep 2012 11:59:43 +0200 From: Loic Pallardy To: Samuel Ortiz , , , Linus Walleij Subject: [PATCH 17/17] mfd: db8500-prcmu: activate dbx540-prcmu driver Date: Wed, 5 Sep 2012 11:59:13 +0200 Message-ID: <1346839153-6465-18-git-send-email-loic.pallardy-ext@stericsson.com> X-Mailer: git-send-email 1.7.11.1 In-Reply-To: <1346839153-6465-1-git-send-email-loic.pallardy-ext@stericsson.com> References: <1346839153-6465-1-git-send-email-loic.pallardy-ext@stericsson.com> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.126.144.133 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Loic Pallardy , Loic Pallardy , STEricsson_nomadik_linux , Loic Pallardy , Lee Jones , LT ST-Ericsson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org db8500-prcmu clean up, removing dbx540 definition from db8500-prcmu file. Signed-off-by: Loic Pallardy Acked-by: Linus Walleij --- 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;