From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756906Ab1HEQZ2 (ORCPT ); Fri, 5 Aug 2011 12:25:28 -0400 Received: from newsmtp5.atmel.com ([204.2.163.5]:58059 "EHLO sjogate2.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756612Ab1HEQZZ (ORCPT ); Fri, 5 Aug 2011 12:25:25 -0400 From: Nicolas Ferre To: linux-arm-kernel@lists.infradead.org, grant.likely@secretlab.ca Cc: linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Nicolas Ferre 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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