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: 2721751 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 4F6DBC0AB1 for ; Fri, 14 Jun 2013 14:03:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 316E020287 for ; Fri, 14 Jun 2013 14:03:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7193F2028F for ; Fri, 14 Jun 2013 14:03:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753015Ab3FNODk (ORCPT ); Fri, 14 Jun 2013 10:03:40 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:58180 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752371Ab3FNODj (ORCPT ); Fri, 14 Jun 2013 10:03:39 -0400 Received: by mail-pd0-f171.google.com with SMTP id y14so613712pdi.16 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=IOri0yyqf4dVDSDWJATLwE2pNROwB0jloCAB82cuLTrg5u2mx4BdbUff6LwsuUNiGB t+nIzA8PsFf5kfzdLfk3yEZ/GThNI0asPTeyQOIda5tfE3JPNwYldvkNT5IQ03O2GLQm yWRRVznEJm6JJnkH4qYYJt/vwV6uIslQu+lnMT2tFHngjwPW2T+PycGRZCXV9PVWQthO HGf+qm/y5lWsOuBvC3Aa0kCpyJVle21rWBNY/g/KKewphfd9HUGnanVYgVjVw/R10QN8 wVl2YgBqKegZNvo/YcACoxNGrnd/zEngHyRMdnsFIs+859Ohm9PW6URT+Vmwhi2IsIHK WyZw== 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 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 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: ALoCoQm1ce6VrmrZtGPyiZpK6k6dCY0SYGIu9latqoNQJDchMa3RqzS5QUgyKIvCRGyYKzx1thUz 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 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);