From patchwork Fri May 31 09:19:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 17343 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f70.google.com (mail-qe0-f70.google.com [209.85.128.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A846E25CAB for ; Fri, 31 May 2013 09:21:28 +0000 (UTC) Received: by mail-qe0-f70.google.com with SMTP id 2sf1656471qea.5 for ; Fri, 31 May 2013 02:21:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=RbCUSd/LyhjCW533SLs1aqG2uFMGOPkk//jFK82JNfA=; b=KXdcTaXBaVofGbbW6DTsGW3cmbhuxcxAdrrOA1nCTiHPOmL6FI3f4MhpqfPkZYfBN7 usIag+yWJZV5ct2MKZaYnfI7U9ldmdPYQvVMvDIxnmJzmJrUvUQMzpZQFF+c04To3grt h79gFsf3RDh1EnMzrpe3Y4Q69ci9kyhxf6svzKLzW9KRB3+EEAWLIfjT6RSJT+1GlkFT JTAPYcZ/A0Qy29TuvD3XG5Dv/Uk08F2A5+O6FzVvuk51Vu8la78UGoEZJei2RDf8UhTv 4imA7FZ0ovta2qekeIJDZ5YanOHggVLih6ni4xUOqp8sYQlpweAlQSX24EViHHhfEk6V gBRA== X-Received: by 10.224.200.202 with SMTP id ex10mr6287465qab.8.1369992088471; Fri, 31 May 2013 02:21:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.41.7 with SMTP id b7ls788898qel.12.gmail; Fri, 31 May 2013 02:21:28 -0700 (PDT) X-Received: by 10.52.53.36 with SMTP id y4mr7741537vdo.51.1369992088325; Fri, 31 May 2013 02:21:28 -0700 (PDT) Received: from mail-ve0-x231.google.com (mail-ve0-x231.google.com [2607:f8b0:400c:c01::231]) by mx.google.com with ESMTPS id tn5si27830338vdc.39.2013.05.31.02.21.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:28 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::231 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::231; Received: by mail-ve0-f177.google.com with SMTP id cz10so953757veb.36 for ; Fri, 31 May 2013 02:21:28 -0700 (PDT) X-Received: by 10.220.112.16 with SMTP id u16mr9424467vcp.40.1369992088230; Fri, 31 May 2013 02:21:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.229.199 with SMTP id jj7csp42446vcb; Fri, 31 May 2013 02:21:27 -0700 (PDT) X-Received: by 10.15.35.129 with SMTP id g1mr12903387eev.110.1369992086804; Fri, 31 May 2013 02:21:26 -0700 (PDT) Received: from eu1sys200aog118.obsmtp.com (eu1sys200aog118.obsmtp.com [207.126.144.145]) by mx.google.com with SMTP id x8si24315156eel.59.2013.05.31.02.21.02 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 02:21:26 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.145 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.145; Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob118.postini.com ([207.126.147.11]) with SMTP ID DSNKUahrfQnpEpJRy4qmV42JIOM7LcvrHwyK@postini.com; Fri, 31 May 2013 09:21:26 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 46EFE108; Fri, 31 May 2013 09:20:58 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 02CBA16B1; Fri, 31 May 2013 09:20:58 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 1257E24C080; Fri, 31 May 2013 11:20:52 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.279.5; Fri, 31 May 2013 11:20:57 +0200 From: Linus Walleij To: Cc: Arnd Bergmann , Linus Walleij Subject: [PATCH 29/39] ARM: u300: delete remnant machine headers Date: Fri, 31 May 2013 11:19:04 +0200 Message-ID: <1369991954-17406-30-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> References: <1369991954-17406-1-git-send-email-linus.walleij@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQll6WQcgtaUM/COEzYb9Fodu7hCXB5YhZYWWvncVkKcWKPoIcnqEKNVH3ewAU/X8OPVJNCg X-Original-Sender: linus.walleij@stericsson.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::231 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Linus Walleij Two files remain in for U300: timex.h and uncompress.h. The former is done away with by using defaults, the latter is unused in multiplatform. Acked-by: Arnd Bergmann Signed-off-by: Linus Walleij --- arch/arm/mach-u300/include/mach/timex.h | 17 ----------- arch/arm/mach-u300/include/mach/uncompress.h | 45 ---------------------------- 2 files changed, 62 deletions(-) delete mode 100644 arch/arm/mach-u300/include/mach/timex.h delete mode 100644 arch/arm/mach-u300/include/mach/uncompress.h diff --git a/arch/arm/mach-u300/include/mach/timex.h b/arch/arm/mach-u300/include/mach/timex.h deleted file mode 100644 index f233b72..0000000 --- a/arch/arm/mach-u300/include/mach/timex.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * - * arch/arm/mach-u300/include/mach/timex.h - * - * - * Copyright (C) 2006-2009 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 - * Platform tick rate definition. - * Author: Linus Walleij - */ -#ifndef __MACH_TIMEX_H -#define __MACH_TIMEX_H - -/* This is for the APP OS GP1 (General Purpose 1) timer */ -#define CLOCK_TICK_RATE 1000000 - -#endif diff --git a/arch/arm/mach-u300/include/mach/uncompress.h b/arch/arm/mach-u300/include/mach/uncompress.h deleted file mode 100644 index 783e7e6..0000000 --- a/arch/arm/mach-u300/include/mach/uncompress.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * arch/arm/mach-u300/include/mach/uncompress.h - * - * Copyright (C) 2003 ARM Limited - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#define AMBA_UART_DR (*(volatile unsigned char *)0xc0013000) -#define AMBA_UART_LCRH (*(volatile unsigned char *)0xc001302C) -#define AMBA_UART_CR (*(volatile unsigned char *)0xc0013030) -#define AMBA_UART_FR (*(volatile unsigned char *)0xc0013018) - -/* - * This does not append a newline - */ -static inline void putc(int c) -{ - while (AMBA_UART_FR & (1 << 5)) - barrier(); - - AMBA_UART_DR = c; -} - -static inline void flush(void) -{ - while (AMBA_UART_FR & (1 << 3)) - barrier(); -} - -/* - * nothing to do - */ -#define arch_decomp_setup()