From patchwork Mon Aug 10 09:28:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J, KEERTHY" X-Patchwork-Id: 505540 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4FD2714018C for ; Mon, 10 Aug 2015 19:29:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932347AbbHJJ3D (ORCPT ); Mon, 10 Aug 2015 05:29:03 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:55404 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932292AbbHJJ3C (ORCPT ); Mon, 10 Aug 2015 05:29:02 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id t7A9Sk2n010866; Mon, 10 Aug 2015 04:28:46 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t7A9Sju9025413; Mon, 10 Aug 2015 04:28:45 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Mon, 10 Aug 2015 04:28:45 -0500 Received: from ula0393675.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t7A9SQqI000780; Mon, 10 Aug 2015 04:28:41 -0500 From: Keerthy To: , , CC: , , , , , , , , , , , Subject: [PATCH v2 3/6] ARM: AM43xx: Introduce a separate soc_is function for am438x series of SoCs Date: Mon, 10 Aug 2015 14:58:23 +0530 Message-ID: <1439198906-31189-4-git-send-email-j-keerthy@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439198906-31189-1-git-send-email-j-keerthy@ti.com> References: <1439198906-31189-1-git-send-email-j-keerthy@ti.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org EPOS evms are fitted with a separate family of am43xx SoCs and are named am438x series. Adding a separate soc_is function to identify that particular series of SoCs. This can be done to avoid unnecessarily registering hwmods like rtc when not needed on EPOS evms. Signed-off-by: Keerthy --- Documentation/devicetree/bindings/arm/omap/omap.txt | 3 +++ arch/arm/mach-omap2/board-generic.c | 1 + arch/arm/mach-omap2/id.c | 2 ++ arch/arm/mach-omap2/soc.h | 7 +++++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index 9f4e513..4269c13 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt @@ -100,6 +100,9 @@ SoCs: - AM4372 compatible = "ti,am4372", "ti,am43" +- AM438x + compatible = "ti,am438x", "ti,am43" + Boards: - OMAP3 BeagleBoard : Low cost community board diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 34ff14b..3d70d6a 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -266,6 +266,7 @@ MACHINE_END #ifdef CONFIG_SOC_AM43XX static const char *const am43_boards_compat[] __initconst = { "ti,am4372", + "ti,am438x", "ti,am43", NULL, }; diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index e3f713f..1bab9f5 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -228,6 +228,8 @@ static void __init omap3_cpuinfo(void) cpu_name = "AM335X"; } else if (soc_is_am437x()) { cpu_name = "AM437x"; + } else if (soc_is_am438x()) { + cpu_name = "AM438X"; } else if (cpu_is_ti814x()) { cpu_name = "TI814X"; } else if (omap3_has_iva() && omap3_has_sgx()) { diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index f97654d..feb27fd 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h @@ -238,6 +238,7 @@ IS_AM_SUBCLASS(437x, 0x437) #define soc_is_am335x() 0 #define soc_is_am43xx() 0 #define soc_is_am437x() 0 +#define soc_is_am438x() 0 #define cpu_is_omap44xx() 0 #define cpu_is_omap443x() 0 #define cpu_is_omap446x() 0 @@ -371,8 +372,10 @@ IS_OMAP_TYPE(3430, 0x3430) #ifdef CONFIG_SOC_AM43XX # undef soc_is_am43xx # undef soc_is_am437x -# define soc_is_am43xx() is_am43xx() -# define soc_is_am437x() is_am437x() +# undef soc_is_am438x +# define soc_is_am43xx() of_machine_is_compatible("ti,am43") +# define soc_is_am437x() of_machine_is_compatible("ti,am4372") +# define soc_is_am438x() of_machine_is_compatible("ti,am438x") #endif # if defined(CONFIG_ARCH_OMAP4)