From patchwork Mon Jan 6 09:02:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 3436771 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 63E16C02DC for ; Mon, 6 Jan 2014 09:06:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D47720170 for ; Mon, 6 Jan 2014 09:06:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 786EB2016D for ; Mon, 6 Jan 2014 09:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753675AbaAFJGw (ORCPT ); Mon, 6 Jan 2014 04:06:52 -0500 Received: from mail-pa0-f50.google.com ([209.85.220.50]:54844 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753441AbaAFJGu (ORCPT ); Mon, 6 Jan 2014 04:06:50 -0500 Received: by mail-pa0-f50.google.com with SMTP id kp14so16397277pab.23 for ; Mon, 06 Jan 2014 01:06:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BEoYC9yaHQUsOG/Y228mVtsg/ORf6zFNxZ1MbdUAlsg=; b=KwwzzVOZKQ67VcpWPyQw5XhZgnDRJYdeLDuEeYQ48MVWnQSkIni51kHkXLb8EU231G Ma3v+UGPQqr8XwF4qU4Z7TioflvUzgr4n0q/75txgG7ZUtCsbTOMx8l2myPoe8hHqiHp CMSj/oLssTbo5JssFcj1KFvZJftlZPBpqDAxSMmyhfLmVa9NrxbxhmF08H8I5Iyn0PDx 3fK1xE6e3Zltg2KBXRGL0bWNcvGIhkUxan50fB6kvzX+1W/A2rWoiSXJfV77l0YT9osn yWZgW+pUovAWTGTY2uZ8O1pG0QaCWZu2nL+K3baX6qxecx6CRuktPNTVbWj2A5sWA3zX 5vpw== X-Gm-Message-State: ALoCoQkd7AJA40QdT1NX5WjWNa8UwozMEwojvfP66ndnu8et3W6FxZnPkQX1/EyfRWvUTCZ+cXnF X-Received: by 10.68.162.66 with SMTP id xy2mr4476935pbb.46.1388999210305; Mon, 06 Jan 2014 01:06:50 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id z10sm166710858pas.6.2014.01.06.01.06.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Jan 2014 01:06:49 -0800 (PST) From: Sachin Kamat To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: kgene.kim@samsung.com, arnd@arndb.de, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 2/2] ARM: EXYNOS: Remove uncompress.h Date: Mon, 6 Jan 2014 14:32:55 +0530 Message-Id: <1388998975-32362-2-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1388998975-32362-1-git-send-email-sachin.kamat@linaro.org> References: <1388998975-32362-1-git-send-email-sachin.kamat@linaro.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that we can use the generic uncompres.h file, there is no need for the machine specific header. Remove it. Signed-off-by: Sachin Kamat --- arch/arm/mach-exynos/include/mach/uncompress.h | 48 ------------------------ 1 file changed, 48 deletions(-) delete mode 100644 arch/arm/mach-exynos/include/mach/uncompress.h diff --git a/arch/arm/mach-exynos/include/mach/uncompress.h b/arch/arm/mach-exynos/include/mach/uncompress.h deleted file mode 100644 index 5d7ce36be46f..000000000000 --- a/arch/arm/mach-exynos/include/mach/uncompress.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2010-2012 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * EXYNOS - uncompress code - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_ARCH_UNCOMPRESS_H -#define __ASM_ARCH_UNCOMPRESS_H __FILE__ - -#include - -#include -#include - -static unsigned int __raw_readl(unsigned int ptr) -{ - return *((volatile unsigned int *)ptr); -} - -static void arch_detect_cpu(void) -{ - u32 chip_id = __raw_readl(EXYNOS_PA_CHIPID); - - /* - * product_id is bits 31:12 - * bits 23:20 describe the exynosX family - * bits 27:24 describe the exynosX family in exynos5420 - */ - chip_id >>= 20; - - if ((chip_id & 0x0f) == 0x5 || (chip_id & 0xf0) == 0x50) - uart_base = (volatile u8 *)EXYNOS5_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT); - else - uart_base = (volatile u8 *)EXYNOS4_PA_UART + (S3C_UART_OFFSET * CONFIG_S3C_LOWLEVEL_UART_PORT); - - /* - * For preventing FIFO overrun or infinite loop of UART console, - * fifo_max should be the minimum fifo size of all of the UART channels - */ - fifo_mask = S5PV210_UFSTAT_TXMASK; - fifo_max = 15 << S5PV210_UFSTAT_TXSHIFT; -} -#endif /* __ASM_ARCH_UNCOMPRESS_H */