From patchwork Thu Jun 6 11:01:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chander Kashyap X-Patchwork-Id: 2678981 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4E31BDF23A for ; Thu, 6 Jun 2013 11:03:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932553Ab3FFLC7 (ORCPT ); Thu, 6 Jun 2013 07:02:59 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:53770 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932400Ab3FFLC7 (ORCPT ); Thu, 6 Jun 2013 07:02:59 -0400 Received: by mail-pb0-f44.google.com with SMTP id wz12so3130412pbc.3 for ; Thu, 06 Jun 2013 04:02:58 -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=Jxg0P9WM8q96Y8zt3WeleRLPuIuMmfnJmH8yyojeoVQ7BzIDi3N7FhFHYpiRHpXYZb Px5PVDco2WvYglW/+XHPxKubDpvBWd3ecX7vTpiTIKRfsbkLczNH4v4ojcweTvtbbtNx eL++fL6RIdMO2aENIKmPiYMqdOfWIc0l+ZdZ3vMIUWU2nE7A8D+bB/+ii/JbwDxCfDPU axX6vQS/U7Aikl479Avr1iUdew66xrKI4AO1b2MAX97bWkruOY+U3NpRUXm19XTrUJ9y FMGMl+1bDOsSz7u4x86dbA/7M94jFzbmD7mBs/WGhJv25UI65139SiE8rl59vZ7bJQ0U b2XA== X-Received: by 10.68.129.197 with SMTP id ny5mr37005606pbb.180.1370516578510; Thu, 06 Jun 2013 04:02:58 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id qh4sm77248213pac.8.2013.06.06.04.02.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Jun 2013 04:02:57 -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, thomas.ab@samsung.com, Chander Kashyap , Thomas Abraham Subject: [PATCH 07/13] ARM: Exynos: use four additional chipid bits to identify Exynos family Date: Thu, 6 Jun 2013 16:31:21 +0530 Message-Id: <1370516488-25860-7-git-send-email-chander.kashyap@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1370516488-25860-1-git-send-email-chander.kashyap@linaro.org> References: <1370516488-25860-1-git-send-email-chander.kashyap@linaro.org> X-Gm-Message-State: ALoCoQmSxZdmoz6mPKx4jBh22uFcBoe+DEUZHq4DwFtEC0gj7G+Wff0WLnbMrNyrRHwFH+lxeZFS Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org 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);