From patchwork Fri Aug 10 08:43:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10667 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 C744523E00 for ; Fri, 10 Aug 2012 08:44:14 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8C846A18B54 for ; Fri, 10 Aug 2012 08:44:14 +0000 (UTC) Received: by yenq6 with SMTP id q6so1346323yen.11 for ; Fri, 10 Aug 2012 01:44:14 -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=zoiWT1kt/COlRs1XATGHKplFTlIPoAhrc8WG2S3VCKM=; b=IYEi2qxsbF5XyyIxs/Og+aTMDOcjAjsY0gEG/kw0jfLiG70dsXTfZ9Lsr2F8jmPHaf 3BxKSWDcU83NIytxvGuRIkpHEZqR5X93yf7Fb4L5A0tIiPsbzDUieQmbxzxBbzlXogtm qAg3qiETBNFT5AxN7/nCfFeTw1czB7dR9qba2eD1Gg5N2vlQ/hrSZHcVHSVppGFN31wm 9GnPxlOqbYjCUCj/ghSWB5O47TFy8Al7OXvzR+UvIldro0ulIG8LHgttEX2befBNNjl7 5OZxjtCB8eS2SreMsdSxzwGAwGHiF4breWrQWvag7X3/nsJbaZk9DJ500wNZc0geX7LS L9xA== Received: by 10.50.57.168 with SMTP id j8mr1079896igq.16.1344588253918; Fri, 10 Aug 2012 01:44:13 -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.200 with SMTP id ew8csp50358igc; Fri, 10 Aug 2012 01:44:13 -0700 (PDT) Received: by 10.14.204.200 with SMTP id h48mr2366273eeo.7.1344588252588; Fri, 10 Aug 2012 01:44:12 -0700 (PDT) Received: from eu1sys200aog111.obsmtp.com (eu1sys200aog111.obsmtp.com. [207.126.144.131]) by mx.google.com with SMTP id c41si2370038eem.122.2012.08.10.01.44.07 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 10 Aug 2012 01:44:12 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.131 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.131; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.131 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-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob111.postini.com ([207.126.147.11]) with SMTP ID DSNKUCTJ1yD1ERuJYluGrJFmhIfzJSIsZZtI@postini.com; Fri, 10 Aug 2012 08:44:12 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 5A8AF59; Fri, 10 Aug 2012 08:43:32 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 088FC49; Fri, 10 Aug 2012 05:10:11 +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 relay2.stm.gmessaging.net (Postfix) with ESMTPS id 9BED3A809E; Fri, 10 Aug 2012 10:43:53 +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; Fri, 10 Aug 2012 10:43:56 +0200 From: Linus Walleij To: Cc: Linus Walleij Subject: [PATCH 1/4] ARM: ux500: delete remnant U5500 macros Date: Fri, 10 Aug 2012 10:43:54 +0200 Message-ID: <1344588234-8597-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: ALoCoQncWDQDlx0Qz9FsMXk1H5JrOq6AQaMHovJ5K4E/3xWxQ6aJIEyQR79oNGCYGBhQJiJPMsY3 From: Linus Walleij The code using these ASIC detection functions is now gone so we remove it. Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/include/mach/id.h | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/arch/arm/mach-ux500/include/mach/id.h b/arch/arm/mach-ux500/include/mach/id.h index c6e2db9..87aa921 100644 --- a/arch/arm/mach-ux500/include/mach/id.h +++ b/arch/arm/mach-ux500/include/mach/id.h @@ -51,35 +51,6 @@ static inline bool cpu_is_u8500_family(void) return cpu_is_u8500() || cpu_is_u9540(); } -static inline bool __attribute_const__ cpu_is_u5500(void) -{ - return dbx500_partnumber() == 0x5500; -} - -/* - * 5500 revisions - */ - -static inline bool __attribute_const__ cpu_is_u5500v1(void) -{ - return cpu_is_u5500() && (dbx500_revision() & 0xf0) == 0xA0; -} - -static inline bool __attribute_const__ cpu_is_u5500v2(void) -{ - return (dbx500_id.revision & 0xf0) == 0xB0; -} - -static inline bool __attribute_const__ cpu_is_u5500v20(void) -{ - return cpu_is_u5500() && ((dbx500_revision() & 0xf0) == 0xB0); -} - -static inline bool __attribute_const__ cpu_is_u5500v21(void) -{ - return cpu_is_u5500() && (dbx500_revision() == 0xB1); -} - /* * 8500 revisions */