Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752031AbcDROZL (ORCPT ); Mon, 18 Apr 2016 10:25:11 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:57012 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750849AbcDROZK (ORCPT ); Mon, 18 Apr 2016 10:25:10 -0400 From: James Hartley To: Ralf Baechle , Andrew Bresticker , Jonas Gorski , James Hogan CC: , , Ionela Voinescu , James Hartley Subject: [PATCH] mips: pistachio: Determine SoC revision during boot Date: Mon, 18 Apr 2016 15:24:49 +0100 Message-ID: <1460989489-30469-1-git-send-email-james.hartley@imgtec.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.167.31] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1860 Lines: 68 Now that there are different revisions of the Pistachio SoC in circulation, add this information to the boot log to make it easier for users to determine which hardware they have. Signed-off-by: James Hartley Signed-off-by: Ionela Voinescu diff --git a/arch/mips/pistachio/init.c b/arch/mips/pistachio/init.c index 96ba2cc..48f8755 100644 --- a/arch/mips/pistachio/init.c +++ b/arch/mips/pistachio/init.c @@ -2,6 +2,7 @@ * Pistachio platform setup * * Copyright (C) 2014 Google, Inc. + * Copyright (C) 2016 Imagination Technologies * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -9,6 +10,7 @@ */ #include +#include #include #include #include @@ -24,9 +26,28 @@ #include #include +/* + * Core revision register decoding + * Bits 23 to 20: Major rev + * Bits 15 to 8: Minor rev + * Bits 7 to 0: Maintenance rev + */ +#define PISTACHIO_CORE_REV_REG 0xB81483D0 +#define PISTACHIO_CORE_REV_A1 0x00100006 +#define PISTACHIO_CORE_REV_B0 0x00100106 + const char *get_system_type(void) { - return "IMG Pistachio SoC"; + u32 core_rev; + + core_rev = __raw_readl((const void *)PISTACHIO_CORE_REV_REG); + + if (core_rev == PISTACHIO_CORE_REV_B0) + return "IMG Pistachio SoC (B0)"; + else if (core_rev == PISTACHIO_CORE_REV_A1) + return "IMG_Pistachio SoC (A1)"; + else + return "IMG_Pistachio SoC"; } static void __init plat_setup_iocoherency(void) @@ -109,6 +130,8 @@ void __init prom_init(void) mips_cm_probe(); mips_cpc_probe(); register_cps_smp_ops(); + + pr_info("SoC Type: %s\n", get_system_type()); } void __init prom_free_prom_memory(void) -- 2.5.0