From patchwork Tue Jun 18 06:29:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chander Kashyap X-Patchwork-Id: 2738951 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 E6848C0AB1 for ; Tue, 18 Jun 2013 06:30:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFE1520257 for ; Tue, 18 Jun 2013 06:30:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 047832015C for ; Tue, 18 Jun 2013 06:30:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752756Ab3FRGaB (ORCPT ); Tue, 18 Jun 2013 02:30:01 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:43999 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752201Ab3FRGaA (ORCPT ); Tue, 18 Jun 2013 02:30:00 -0400 Received: by mail-pd0-f177.google.com with SMTP id p10so3526316pdj.8 for ; Mon, 17 Jun 2013 23:30:00 -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=oqpwUSno6qe09+6Z+D8yt9g+2AYYej3sfIn1YJeUKBA=; b=OqBMVEg9QixkmVGnlMDPbg3DqTGrjSqQ53ZmWJZgq+KQkl6br5iPkr7pEeyz12qKBm cph5cuZOn4pQ66rIiz09FcxP2cRsRocKp0Rm1uxxDnnfpVIT1jUCYGMWb77x9SR3+n65 qBwd+RMD7rs+lpSQPsOjzKKcR5fGYtR1O0u0Vv20aazyj6MHxisp+XbAaBzzkGyLw+0j LZxsvOYIvxJjB4pDS+4vkFoBTIdJTQnYtQJ2hu/2ZZ4RMCoVZPk/r5uKxG1Ogd042BO5 SP56a41u1del2C240kCoY2oNxHSudlWfinjwFPzscM2V0+S4eQcRF6QGh7gCr24UaI9b oTmQ== X-Received: by 10.68.232.67 with SMTP id tm3mr15774873pbc.204.1371537000128; Mon, 17 Jun 2013 23:30:00 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id ep3sm7967227pbd.27.2013.06.17.23.29.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 17 Jun 2013 23:29:59 -0700 (PDT) From: Chander Kashyap To: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org, linux-serial@vger.kernel.org, kgene.kim@samsung.com, t.figa@samsung.com, s.nawrocki@samsung.com, mark.rutland@arm.com, thomas.ab@samsung.com, Chander Kashyap , Thomas Abraham Subject: [PATCH v4 05/10] ARM: Exynos: use four additional chipid bits to identify Exynos family Date: Tue, 18 Jun 2013 11:59:17 +0530 Message-Id: <1371536962-13322-6-git-send-email-chander.kashyap@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371536962-13322-1-git-send-email-chander.kashyap@linaro.org> References: <1371536962-13322-1-git-send-email-chander.kashyap@linaro.org> X-Gm-Message-State: ALoCoQniky2DL0+6lu2fVxwI1u425Nz4l+WCFWx4S+W3aYqiSAHZa5TksAB2eMECIAGQTT0LjyoT 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=-8.1 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 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 Reviewed-by: Tomasz Figa --- 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);