From patchwork Tue Nov 5 06:58:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Wu X-Patchwork-Id: 3139611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4FD599F432 for ; Tue, 5 Nov 2013 07:00:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6403520616 for ; Tue, 5 Nov 2013 06:59:59 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4088F20615 for ; Tue, 5 Nov 2013 06:59:58 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VdabU-00011T-GS; Tue, 05 Nov 2013 06:59:08 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VdabE-0000Lk-Ne; Tue, 05 Nov 2013 06:58:52 +0000 Received: from newsmtp5.atmel.com ([204.2.163.5] helo=sjogate2.atmel.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vdaay-0000JM-Vf for linux-arm-kernel@lists.infradead.org; Tue, 05 Nov 2013 06:58:38 +0000 Received: from localhost.localdomain ([10.217.11.52]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id rA56psoH028410; Mon, 4 Nov 2013 22:51:56 -0800 (PST) From: Josh Wu To: nicolas.ferre@atmel.com Subject: [PATCH 1/2] ARM: at91: sama5d3: add support for sama5d36 chip Date: Tue, 5 Nov 2013 14:58:08 +0800 Message-Id: <1383634689-15343-2-git-send-email-josh.wu@atmel.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1383634689-15343-1-git-send-email-josh.wu@atmel.com> References: <1383634689-15343-1-git-send-email-josh.wu@atmel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131105_015837_243577_88A5F292 X-CRM114-Status: GOOD ( 16.25 ) X-Spam-Score: -1.9 (-) Cc: Josh Wu , plagnioj@jcrosoft.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 The SAMA5D36 chip is the superset product of SAMA5D3x family. For detail information please refer to: http://www.atmel.com/Microsite/sama5d3/default.aspx Signed-off-by: Josh Wu --- arch/arm/mach-at91/Kconfig | 2 +- arch/arm/mach-at91/include/mach/cpu.h | 3 ++- arch/arm/mach-at91/sama5d3.c | 7 +++---- arch/arm/mach-at91/setup.c | 4 ++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 699b71e..44eacdd 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -67,7 +67,7 @@ config SOC_SAMA5D3 select HAVE_AT91_DBGU1 help Select this if you are using one of Atmel's SAMA5D3 family SoC. - This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35. + This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36. endif if SOC_SAM_V4_V5 diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h index d3d7b99..86c71de 100644 --- a/arch/arm/mach-at91/include/mach/cpu.h +++ b/arch/arm/mach-at91/include/mach/cpu.h @@ -53,6 +53,7 @@ #define ARCH_EXID_SAMA5D33 0x00414300 #define ARCH_EXID_SAMA5D34 0x00414301 #define ARCH_EXID_SAMA5D35 0x00584300 +#define ARCH_EXID_SAMA5D36 0x00004301 #define ARCH_FAMILY_AT91X92 0x09200000 #define ARCH_FAMILY_AT91SAM9 0x01900000 @@ -105,7 +106,7 @@ enum at91_soc_subtype { /* SAMA5D3 */ AT91_SOC_SAMA5D31, AT91_SOC_SAMA5D33, AT91_SOC_SAMA5D34, - AT91_SOC_SAMA5D35, + AT91_SOC_SAMA5D35, AT91_SOC_SAMA5D36, /* No subtype for this SoC */ AT91_SOC_SUBTYPE_NONE, diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c index 4012797..f853c97 100644 --- a/arch/arm/mach-at91/sama5d3.c +++ b/arch/arm/mach-at91/sama5d3.c @@ -177,25 +177,24 @@ static struct clk udphs_clk = { .pid = SAMA5D3_ID_UDPHS, .type = CLK_TYPE_PERIPHERAL, }; -/* gmac only for sama5d33, sama5d34, sama5d35 */ +/* gmac only for sama5d33, sama5d34, sama5d35, sama5d36 */ static struct clk macb0_clk = { .name = "macb0_clk", .pid = SAMA5D3_ID_GMAC, .type = CLK_TYPE_PERIPHERAL, }; -/* emac only for sama5d31, sama5d35 */ +/* emac only for sama5d31, sama5d35, sama5d36 */ static struct clk macb1_clk = { .name = "macb1_clk", .pid = SAMA5D3_ID_EMAC, .type = CLK_TYPE_PERIPHERAL, }; -/* lcd only for sama5d31, sama5d33, sama5d34 */ +/* lcd only for sama5d31, sama5d33, sama5d34, sama5d36 */ static struct clk lcdc_clk = { .name = "lcdc_clk", .pid = SAMA5D3_ID_LCDC, .type = CLK_TYPE_PERIPHERAL, }; -/* isi only for sama5d33, sama5d35 */ static struct clk isi_clk = { .name = "isi_clk", .pid = SAMA5D3_ID_ISI, diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index b17fbcf..157b687 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -232,6 +232,9 @@ static void __init soc_detect(u32 dbgu_base) case ARCH_EXID_SAMA5D35: at91_soc_initdata.subtype = AT91_SOC_SAMA5D35; break; + case ARCH_EXID_SAMA5D36: + at91_soc_initdata.subtype = AT91_SOC_SAMA5D36; + break; } } } @@ -274,6 +277,7 @@ static const char *soc_subtype_name[] = { [AT91_SOC_SAMA5D33] = "sama5d33", [AT91_SOC_SAMA5D34] = "sama5d34", [AT91_SOC_SAMA5D35] = "sama5d35", + [AT91_SOC_SAMA5D36] = "sama5d36", [AT91_SOC_SUBTYPE_NONE] = "None", [AT91_SOC_SUBTYPE_UNKNOWN] = "Unknown", };