From patchwork Mon Sep 3 13:10:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11154 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7D69523E29 for ; Mon, 3 Sep 2012 13:11:21 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id B94FEA1906A for ; Mon, 3 Sep 2012 13:10:33 +0000 (UTC) Received: by iafj25 with SMTP id j25so7270291iaf.11 for ; Mon, 03 Sep 2012 06:11:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=nprFKOSN5wAFu5u0pGV3u+8c1THF9jwTOThCu5kg1J4=; b=Z5S/P13Y5NOrGPEHn4C/YOLdsnq22yW3c/ALaiw5mingXOaY0MOYNfX3eAuP+fKw8S WAixi3nYIMcKrTh3vOuUi1dlGyh8a4Y2qUlAMF0XwYycYMxLO6tlJSThr+pu8mNwOKj+ luaUxSa4yq/CinoV3JnW1VOxiN2W4+D+Gmw9MIXRvu/RRGLmyLZJWjCguAABOdBbD4c1 X5wZUah+B42B5PKFwh0Frl2W5syPa529UgxakKf1AkvvdNCwE/FNBGDV30bnvNY2v6/T iiIIwdjsIZXP1ivExTWTgKt26410oBqeBr9U2TY+Rld6ehdCYyDlIrfiAjehF3TqyMGT xV5g== Received: by 10.50.45.162 with SMTP id o2mr10783389igm.0.1346677880215; Mon, 03 Sep 2012 06:11:20 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp136191igc; Mon, 3 Sep 2012 06:11:18 -0700 (PDT) Received: by 10.14.203.70 with SMTP id e46mr21734154eeo.2.1346677877913; Mon, 03 Sep 2012 06:11:17 -0700 (PDT) Received: from eu1sys200aog105.obsmtp.com (eu1sys200aog105.obsmtp.com [207.126.144.119]) by mx.google.com with SMTP id z3si7733934een.108.2012.09.03.06.11.04 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 03 Sep 2012 06:11:17 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.119 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.119; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.119 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob105.postini.com ([207.126.147.11]) with SMTP ID DSNKUESsZMhyWIaiOWvFto6A9F6NIrWwWosH@postini.com; Mon, 03 Sep 2012 13:11:17 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 7A624B7; Mon, 3 Sep 2012 13:10:48 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 39C974E86; Mon, 3 Sep 2012 13:10:48 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id DCF4224C07D; Mon, 3 Sep 2012 15:10:35 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Mon, 3 Sep 2012 15:10:42 +0200 From: Linus Walleij To: Olof Johansson , Arnd Bergmann Cc: , Anmar Oueja , Loic PALLARDY , Loic Pallardy , Linus Walleij Subject: [PATCH] ARM: ux500: Correct Ux500 family names usage Date: Mon, 3 Sep 2012 15:10:23 +0200 Message-ID: <1346677823-28158-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmw7bvyIiXbvlQQoJJh/2fJRdQPcJ5oJbBAt4TPedzVoDwYHL7yhypzoHKH0C3rH91t0Xbz From: Loic PALLARDY Update users with cpu_is_ux540_family() to keep x540 family functional. Signed-off-by: Loic Pallardy Signed-off-by: Linus Walleij --- Hi Arnd, Olof: This patch goes on top of the ux500-asicid patches pulled earlier, into your ux500/asic-id branch, it'd be best if you just applied this one on top manually. If you prefer I can send a new pull request from the same branch. Linus --- arch/arm/mach-ux500/clock.c | 2 +- arch/arm/mach-ux500/platsmp.c | 2 +- arch/arm/mach-ux500/timer.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c index 8d73b06..bc5a516 100644 --- a/arch/arm/mach-ux500/clock.c +++ b/arch/arm/mach-ux500/clock.c @@ -149,7 +149,7 @@ static unsigned long clk_mtu_get_rate(struct clk *clk) unsigned long mturate; unsigned long retclk; - if (cpu_is_u8500_family()) + if (cpu_is_u8500_family() || cpu_is_ux540_family()) addr = __io_address(U8500_PRCMU_BASE); else ux500_unknown_soc(); diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c index cb35897..a5dda684 100644 --- a/arch/arm/mach-ux500/platsmp.c +++ b/arch/arm/mach-ux500/platsmp.c @@ -118,7 +118,7 @@ static void __init wakeup_secondary(void) { void __iomem *backupram; - if (cpu_is_u8500_family()) + if (cpu_is_u8500_family() || cpu_is_ux540_family()) backupram = __io_address(U8500_BACKUPRAM0_BASE); else ux500_unknown_soc(); diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 66e7f00..6f39731 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -54,7 +54,7 @@ static void __init ux500_timer_init(void) void __iomem *tmp_base; struct device_node *np; - if (cpu_is_u8500_family()) { + if (cpu_is_u8500_family() || cpu_is_ux540_family()) { mtu_timer_base = __io_address(U8500_MTU0_BASE); prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE); } else {