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: 3436781 Return-Path: X-Original-To: patchwork-linux-arm@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 B41E6C02DC for ; Mon, 6 Jan 2014 09:07:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C23E22016D for ; Mon, 6 Jan 2014 09:07:25 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BA6B420170 for ; Mon, 6 Jan 2014 09:07:24 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W069X-0007y0-Au; Mon, 06 Jan 2014 09:07:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W069U-0004Qo-Vl; Mon, 06 Jan 2014 09:07:17 +0000 Received: from mail-pa0-f44.google.com ([209.85.220.44]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W069R-0004QO-MK for linux-arm-kernel@lists.infradead.org; Mon, 06 Jan 2014 09:07:15 +0000 Received: by mail-pa0-f44.google.com with SMTP id fa1so18456149pad.3 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=Pb+NtCcCkSn0nq3GShh/qkLG0GbMdvtlD3qNb3uQDjNAr/RfhmSzE75IbqeBMwHO4r oUtVEXj4u/c6iTw4Be9geNsUxore5fuGEHErMwGyHFRw0FA1PHezNAyLLvzTkoEXPiWX 7hN5BWYWuAbgnt30VRtA7Pj9C252Uj8LTtcG9l3bK6mXmVZbL1mfmdQm2AdtBjoqs/Bx 81/FuzF66gWEk1c7hN0IgN/czyiMoHyDxg0Bo9PjQdY3LVI6BYNGBIwuefu7nBraeu5t fg+GOmruvbvp+xKcOCR/CLobTo/g4wfJsmvsJAfePsm+qHnI3SwHoCvXaWNvBGUTyKin lxbQ== X-Gm-Message-State: ALoCoQmrzKx1m0K7maBCY3e4W4M6UH1VBu4acSIhpV5mXKzs2eUHrhlFNI4yuGNRJqeKHcvpGnbG 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140106_040713_799820_0E5CAD7F X-CRM114-Status: GOOD ( 13.32 ) X-Spam-Score: -2.6 (--) Cc: sachin.kamat@linaro.org, kgene.kim@samsung.com, arnd@arndb.de, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 */