From patchwork Fri Aug 5 16:24:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Ferre X-Patchwork-Id: 1038902 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 p75GPq6V028327 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 5 Aug 2011 16:26:20 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QpNDK-0006h7-84; Fri, 05 Aug 2011 16:25:35 +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 1QpNDJ-0000c2-OP; Fri, 05 Aug 2011 16:25:33 +0000 Received: from newsmtp5.atmel.com ([204.2.163.5] helo=sjogate2.atmel.com) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QpND0-0000YE-1e for linux-arm-kernel@lists.infradead.org; Fri, 05 Aug 2011 16:25:15 +0000 Received: from meyreuil.atmel.fr ([10.159.254.132]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id p75GLjMu028786; Fri, 5 Aug 2011 09:21:51 -0700 (PDT) Received: from ubuntu.atmel.com ([172.24.48.118]) by meyreuil.atmel.fr (8.11.7p1+Sun/8.11.7) with ESMTP id p75GOxe25298; Fri, 5 Aug 2011 18:24:59 +0200 (MEST) From: Nicolas Ferre To: linux-arm-kernel@lists.infradead.org, grant.likely@secretlab.ca Subject: [RFC PATCH 2/2] AT91: dt: simple device tree support for at91sam9g45 family Date: Fri, 5 Aug 2011 17:24:53 +0100 Message-Id: X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1312561493-7849-1-git-send-email-nicolas.ferre@atmel.com> References: <1312561493-7849-1-git-send-email-nicolas.ferre@atmel.com> In-Reply-To: <56092075210001f40db485e0b126fe7c0c7b75ac.1312560476.git.nicolas.ferre@atmel.com> References: <56092075210001f40db485e0b126fe7c0c7b75ac.1312560476.git.nicolas.ferre@atmel.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110805_122514_311932_E6220372 X-CRM114-Status: GOOD ( 16.60 ) X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.9 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: devicetree-discuss@lists.ozlabs.org, Nicolas Ferre , linux-kernel@vger.kernel.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: , MIME-Version: 1.0 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]); Fri, 05 Aug 2011 16:27:29 +0000 (UTC) Add basic device tree support for at91sam9g45 SoC family and the at91sam9m10g45ek board. DT is been used to describe the at91sam9g45 SoC memory and AIC. It also adds the dmaengine driver. Signed-off-by: Nicolas Ferre --- arch/arm/mach-at91/Kconfig | 8 ++++++ arch/arm/mach-at91/Makefile.boot | 2 + arch/arm/mach-at91/at91sam9g45_devices.c | 3 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 36 ++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 2248467..973c725 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -407,6 +407,14 @@ config MACH_AT91SAM9M10G45EK "ES" at the end of the name means that this board is an Engineering Sample. +config MACH_AT91SAM9M10G45EK_DT + bool "Atmel AT91SAM9M10G45-EK Evaluation Kits with device-tree support" + select USE_OF + select MACH_AT91SAM9M10G45EK + help + Select this if you want to experiment device-tree with + Atmel's AT91SAM9M10G45-EK Evaluation Kit. + endif # ---------------------------------------------------------- diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot index 3462b81..78d384f 100644 --- a/arch/arm/mach-at91/Makefile.boot +++ b/arch/arm/mach-at91/Makefile.boot @@ -16,3 +16,5 @@ else params_phys-y := 0x20000100 initrd_phys-y := 0x20410000 endif + +dtb-$(CONFIG_MACH_AT91SAM9M10G45EK_DT) += at91sam9m10g45ek.dtb diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c index 600bffb..ff3b7fc 100644 --- a/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/arch/arm/mach-at91/at91sam9g45_devices.c @@ -35,7 +35,8 @@ * HDMAC - AHB DMA Controller * -------------------------------------------------------------------- */ -#if defined(CONFIG_AT_HDMAC) || defined(CONFIG_AT_HDMAC_MODULE) +#if (defined(CONFIG_AT_HDMAC) || defined(CONFIG_AT_HDMAC_MODULE)) \ + && !defined(CONFIG_OF) static u64 hdmac_dmamask = DMA_BIT_MASK(32); static struct at_dma_platform_data atdma_pdata = { diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index ad234cc..99e8617 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c @@ -26,6 +26,10 @@ #include #include +#include +#include +#include + #include #include