From patchwork Fri Jun 14 14:02:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chander Kashyap X-Patchwork-Id: 2721871 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 DBD7BC0AB1 for ; Fri, 14 Jun 2013 14:08:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C339C202DB for ; Fri, 14 Jun 2013 14:08:51 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D53720292 for ; Fri, 14 Jun 2013 14:08:47 +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 1UnUdf-0001Fb-3r; Fri, 14 Jun 2013 14:06:05 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnUcu-0000K4-JW; Fri, 14 Jun 2013 14:05:16 +0000 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UnUbh-00009G-Ct for linux-arm-kernel@lists.infradead.org; Fri, 14 Jun 2013 14:04:02 +0000 Received: by mail-pa0-f47.google.com with SMTP id kl14so683370pab.20 for ; Fri, 14 Jun 2013 07:03:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=QqVjHf+2TmRroVWP70YYSodPDfdP8IpKzJQ4t5waKSk=; b=gzpAb5i/ad5yZWVjnB/QUwtUXbMgOkCDD0HpQmAlEhv8hftjJJN64Tb29AOVR6gx0C +xlf/Rq3voy/9nQYmelQjEMBcLidt/A2wlrxoo5B6s95htCLWA7UpBrg91Q+xlnJVGTu +tGMjK4e4G9C4hXMaNTQTxhZtXAWMfmyirFCO9G5/gu/NkJwoVgJPQ/C62P/tqsy8OkX kDKTVffJRQZQWFHRZoGlqpLbaLo8e0K50s0Mrq684s+auyAO5PW6dTv2mdysQbxEYM3d BAWdGUI/rucWRMg+2K7FSGcOZ8EwGVRc9uLCZxdivzTP8E1QboZW4tbIpMVPJgYJSA1g 2flQ== X-Received: by 10.66.20.66 with SMTP id l2mr2671974pae.205.1371218619343; Fri, 14 Jun 2013 07:03:39 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id ri8sm2452804pbc.3.2013.06.14.07.03.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Jun 2013 07:03:38 -0700 (PDT) From: Chander Kashyap To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 05/10] ARM: Exynos: use four additional chipid bits to identify Exynos family Date: Fri, 14 Jun 2013 19:32:47 +0530 Message-Id: <1371218572-8993-6-git-send-email-chander.kashyap@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371218572-8993-1-git-send-email-chander.kashyap@linaro.org> References: <1370516488-25860-10-git-send-email-chander.kashyap@linaro.org> <1371218572-8993-1-git-send-email-chander.kashyap@linaro.org> X-Gm-Message-State: ALoCoQmXRjKX+SdEzGuR+QLsODahvrZUMmDOkF76jOl91O0FNiNWyXn7fppuy9yQOrg/cIZGryoY X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130614_100401_517677_DC6AA379 X-CRM114-Status: GOOD ( 11.32 ) X-Spam-Score: -1.9 (-) Cc: mark.rutland@arm.com, kgene.kim@samsung.com, linux-serial@vger.kernel.org, t.figa@samsung.com, Chander Kashyap , linux-samsung-soc@vger.kernel.org, Thomas Abraham , thomas.ab@samsung.com, s.nawrocki@samsung.com 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 Use chipid[27:20] bits to identify the Exynos family while setting up the serial port during the uncompression setup. This uses four additional bits of chipid to identify the Exynos family since this is required for identifying Exynos5420 SoC. Signed-off-by: Chander Kashyap Signed-off-by: Thomas Abraham --- arch/arm/mach-exynos/include/mach/uncompress.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/uncompress.h b/arch/arm/mach-exynos/include/mach/uncompress.h index 2979995..1937e0f 100644 --- a/arch/arm/mach-exynos/include/mach/uncompress.h +++ b/arch/arm/mach-exynos/include/mach/uncompress.h @@ -31,13 +31,12 @@ static void arch_detect_cpu(void) /* * product_id is bits 31:12 - * bits 23:20 describe the exynosX family - * + * bits 23:20 describe the exynosX family + * bits 27:24 describe the exynosX family in exynos5420 */ chip_id >>= 20; - chip_id &= 0xf; - if (chip_id == 0x5) + 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);