From patchwork Wed Oct 14 19:51:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Buxton X-Patchwork-Id: 53817 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9EK0igI003174 for ; Wed, 14 Oct 2009 20:00:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759587AbZJNTv2 (ORCPT ); Wed, 14 Oct 2009 15:51:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759569AbZJNTv2 (ORCPT ); Wed, 14 Oct 2009 15:51:28 -0400 Received: from mail-fx0-f227.google.com ([209.85.220.227]:56523 "EHLO mail-fx0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759567AbZJNTv1 (ORCPT ); Wed, 14 Oct 2009 15:51:27 -0400 Received: by mail-fx0-f227.google.com with SMTP id 27so164467fxm.17 for ; Wed, 14 Oct 2009 12:51:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:cc:content-type; bh=dGYzogTsWLBSlRiUVLBLZLLh5AvabqvfTyadmNvvWc8=; b=tFqsAQnR0SXhFtLiqUAEyh9KFjQu8vRkFI80QE72MB+dX4ks3EIcxYfKafcgKXx62U doZlipu0KMMrNS2/vgp5ETDGp6CxfrrZUnB7ubCBOGmnxb6oADAe4MuP3LiUaiy1HepN Rdz2gN2nUwGrd/i+feJ14F64iR289kg6xbfxY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=w3Hrq5T27iSn1UFtKrQGxHczugIZm2pIX14EfE57RKsO4uetuwKclraZg9oawa7WGY iQMzt88IdOZTgK2P65Xz5MAU/4YtPFfYJgK1f3d7w6pMijK7a8NHzJqLrxaiPXJ/aX3/ 8PyEv9JXrzpJ+ZXdjg8Lc1TYuH2UavEu4CEYs= MIME-Version: 1.0 Received: by 10.204.153.215 with SMTP id l23mr7478116bkw.135.1255549876315; Wed, 14 Oct 2009 12:51:16 -0700 (PDT) Date: Wed, 14 Oct 2009 20:51:16 +0100 Message-ID: <3d374d00910141251j322d7042nf045d1da4002cbd2@mail.gmail.com> Subject: [PATCH 09/17] OMAP7XX: McBSP: Add omap850 support From: Alistair Buxton To: linux-arm-kernel@lists.infradead.org Cc: linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c index 505d98c..06f380b 100644 --- a/arch/arm/mach-omap1/mcbsp.c +++ b/arch/arm/mach-omap1/mcbsp.c @@ -79,7 +79,7 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = { .free = omap1_mcbsp_free, }; -#ifdef CONFIG_ARCH_OMAP730 +#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { { .phys_base = OMAP730_MCBSP1_BASE, @@ -172,7 +172,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { int __init omap1_mcbsp_init(void) { - if (cpu_is_omap730()) + if (cpu_is_omap7xx()) omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ; if (cpu_is_omap15xx()) omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ; @@ -184,7 +184,7 @@ int __init omap1_mcbsp_init(void) if (!mcbsp_ptr) return -ENOMEM; - if (cpu_is_omap730()) + if (cpu_is_omap7xx()) omap_mcbsp_register_board_cfg(omap730_mcbsp_pdata, OMAP730_MCBSP_PDATA_SZ); diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h index e0d6eca..0b476b9 100644 --- a/arch/arm/plat-omap/include/mach/mcbsp.h +++ b/arch/arm/plat-omap/include/mach/mcbsp.h @@ -58,7 +58,7 @@ #define OMAP44XX_MCBSP3_BASE 0x49026000 #define OMAP44XX_MCBSP4_BASE 0x48074000 -#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) +#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)