From patchwork Thu Aug 11 10:30:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 1056372 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7BAWAwZ028012 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 11 Aug 2011 10:32:31 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QrSYR-0004r5-99; Thu, 11 Aug 2011 10:32:00 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QrSYQ-000480-EK; Thu, 11 Aug 2011 10:31:58 +0000 Received: from comal.ext.ti.com ([198.47.26.152]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QrSXE-0003oU-O0 for linux-arm-kernel@lists.infradead.org; Thu, 11 Aug 2011 10:30:47 +0000 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id p7BAUbdm031581 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 11 Aug 2011 05:30:39 -0500 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id p7BAUYOx013241; Thu, 11 Aug 2011 16:00:36 +0530 (IST) Received: from dbdp31.itg.ti.com (172.24.170.98) by DBDE70.ent.ti.com (172.24.170.148) with Microsoft SMTP Server id 8.3.106.1; Thu, 11 Aug 2011 16:00:34 +0530 Received: from localhost.localdomain (dbdp20.itg.ti.com [172.24.170.38]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id p7BAUUla024433; Thu, 11 Aug 2011 16:00:33 +0530 (IST) From: To: Subject: [RFC: PATCH 2/4] AM335X: Update common OMAP machine specific sources Date: Thu, 11 Aug 2011 16:00:28 +0530 Message-ID: <1313058630-32447-3-git-send-email-hvaibhav@ti.com> X-Mailer: git-send-email 1.6.2.4 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110811_063044_991297_4EBE2488 X-CRM114-Status: GOOD ( 17.07 ) X-Spam-Score: -3.1 (---) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-3.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [198.47.26.152 listed in list.dnswl.org] -0.8 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: khilman@ti.com, paul@pwsan.com, tony@atomide.com, Afzal Mohammed , Vaibhav Hiremath , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 11 Aug 2011 10:32:31 +0000 (UTC) From: Afzal Mohammed This patch updates the common machine specific source files for support for AM335x with cpu type, macros for identification of AM335X device. Signed-off-by: Afzal Mohammed Signed-off-by: Vaibhav Hiremath --- arch/arm/mach-omap2/clock3xxx_data.c | 3 +++ arch/arm/mach-omap2/common.c | 16 ++++++++++++++++ arch/arm/mach-omap2/id.c | 6 ++++++ arch/arm/plat-omap/include/plat/io.h | 12 ++++++++++++ arch/arm/plat-omap/include/plat/omap34xx.h | 2 ++ arch/arm/plat-omap/include/plat/ti81xx.h | 4 ++++ 6 files changed, 43 insertions(+), 0 deletions(-) -- 1.6.2.4 diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index af58741..0ad8841 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c @@ -3485,6 +3485,9 @@ int __init omap3xxx_clk_init(void) } else if (cpu_is_ti814x()) { cpu_mask = RATE_IN_TI814X; cpu_clkflg = CK_TI814X; + } else if (cpu_is_am335x()) { + cpu_mask = RATE_IN_AM335X; + cpu_clkflg = CK_AM335X; } else if (cpu_is_omap34xx()) { if (omap_rev() == OMAP3430_REV_ES1_0) { cpu_mask = RATE_IN_3430ES1; diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 7ce80f2..8551fa2 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -119,6 +119,22 @@ void __init omap2_set_globals_ti81xx(void) { __omap2_set_globals(&ti81xx_globals); } + +#define AM335X_TAP_BASE (AM335X_CTRL_BASE + \ + TI81XX_CONTROL_DEVICE_ID - 0x204) + +static struct omap_globals am335x_globals = { + .class = OMAP343X_CLASS, + .tap = OMAP2_L4_IO_ADDRESS(AM335X_TAP_BASE), + .ctrl = AM335X_CTRL_BASE, + .prm = AM335X_PRCM_BASE, + .cm = AM335X_PRCM_BASE, +}; + +void __init omap2_set_globals_am335x(void) +{ + __omap2_set_globals(&am335x_globals); +} #endif #if defined(CONFIG_ARCH_OMAP4) diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 98f1922..bb8603f 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -362,6 +362,10 @@ static void __init omap3_check_revision(void) omap_revision = TI8148_REV_ES2_1; } break; + case 0xb944: + omap_revision = AM335X_REV_ES1_0; + omap_chip.oc |= CHIP_IS_AM335X; + break; default: /* Unknown default to latest silicon rev as default*/ omap_revision = OMAP3630_REV_ES1_2; @@ -469,6 +473,8 @@ static void __init omap3_cpuinfo(void) strcpy(cpu_name, "TI816X"); } else if (cpu_is_ti814x()) { strcpy(cpu_name, "TI814X"); + } else if (cpu_is_am335x()) { + strcpy(cpu_name, "AM335X"); } else if (omap3_has_iva() && omap3_has_sgx()) { /* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */ strcpy(cpu_name, "OMAP3430/3530"); diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index 98c4280..17eec63 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h @@ -73,6 +73,9 @@ #define OMAP4_L3_IO_OFFSET 0xb4000000 #define OMAP4_L3_IO_ADDRESS(pa) IOMEM((pa) + OMAP4_L3_IO_OFFSET) /* L3 */ +#define AM335X_L4_WK_IO_OFFSET 0xb5000000 +#define AM335X_L4_WK_IO_ADDRESS(pa) IOMEM((pa) + AM335X_L4_WK_IO_OFFSET) + #define OMAP4_L3_PER_IO_OFFSET 0xb1100000 #define OMAP4_L3_PER_IO_ADDRESS(pa) IOMEM((pa) + OMAP4_L3_PER_IO_OFFSET) @@ -154,6 +157,15 @@ #define L4_34XX_SIZE SZ_4M /* 1MB of 128MB used, want 1MB sect */ /* + * ---------------------------------------------------------------------------- + * AM335x specific IO mapping + * ---------------------------------------------------------------------------- + */ +#define L4_WK_AM335X_PHYS L4_WK_AM335X_BASE +#define L4_WK_AM335X_VIRT (L4_WK_AM335X_PHYS + AM335X_L4_WK_IO_OFFSET) +#define L4_WK_AM335X_SIZE SZ_4M /* 1MB of 128MB used, want 1MB sect */ + +/* * Need to look at the Size 4M for L4. * VPOM3430 was not working for Int controller */ diff --git a/arch/arm/plat-omap/include/plat/omap34xx.h b/arch/arm/plat-omap/include/plat/omap34xx.h index b9e8588..0376a97 100644 --- a/arch/arm/plat-omap/include/plat/omap34xx.h +++ b/arch/arm/plat-omap/include/plat/omap34xx.h @@ -35,6 +35,8 @@ #define L4_EMU_34XX_BASE 0x54000000 #define L3_34XX_BASE 0x68000000 +#define L4_WK_AM335X_BASE 0x44C00000 + #define OMAP3430_32KSYNCT_BASE 0x48320000 #define OMAP3430_CM_BASE 0x48004800 #define OMAP3430_PRM_BASE 0x48306800 diff --git a/arch/arm/plat-omap/include/plat/ti81xx.h b/arch/arm/plat-omap/include/plat/ti81xx.h index 8f9843f..f52f7dc 100644 --- a/arch/arm/plat-omap/include/plat/ti81xx.h +++ b/arch/arm/plat-omap/include/plat/ti81xx.h @@ -24,4 +24,8 @@ #define TI81XX_ARM_INTC_BASE 0x48200000 +#define AM335X_SCM_BASE 0x44E10000 +#define AM335X_CTRL_BASE AM335X_SCM_BASE +#define AM335X_PRCM_BASE 0x44E00000 + #endif /* __ASM_ARCH_TI81XX_H */