From patchwork Thu Apr 23 09:43:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Jokiniemi X-Patchwork-Id: 19587 X-Patchwork-Delegate: khilman@deeprootsystems.com 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 n3N9hFm3017093 for ; Thu, 23 Apr 2009 09:43:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753753AbZDWJnL (ORCPT ); Thu, 23 Apr 2009 05:43:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754124AbZDWJnL (ORCPT ); Thu, 23 Apr 2009 05:43:11 -0400 Received: from smtp1.digia.com ([82.118.214.156]:23796 "EHLO smtp1.digia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753753AbZDWJnJ (ORCPT ); Thu, 23 Apr 2009 05:43:09 -0400 Received: from smtp1.digia.com (unknown [127.0.0.1]) by IMSA (Postfix) with ESMTP id C8C5E47804B; Thu, 23 Apr 2009 12:43:07 +0300 (EEST) Received: from IT-EXCH02-HKI.it.local (unknown [10.9.52.55]) by smtp1.digia.com (Postfix) with ESMTP id BA4C4478049; Thu, 23 Apr 2009 12:43:07 +0300 (EEST) Received: from localhost.localdomain (10.120.146.225) by IT-EXCH02-HKI.it.local (10.9.52.56) with Microsoft SMTP Server id 8.1.340.0; Thu, 23 Apr 2009 12:43:07 +0300 From: Kalle Jokiniemi To: CC: , Kalle Jokiniemi Subject: [PATCH] ARM: OMAP3: Fix OMAP_CHIP_INIT usage Date: Thu, 23 Apr 2009 12:43:07 +0300 Message-ID: <1240479787-16921-2-git-send-email-kalle.jokiniemi@digia.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1240479787-16921-1-git-send-email-kalle.jokiniemi@digia.com> References: <> <1240479787-16921-1-git-send-email-kalle.jokiniemi@digia.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Some modules have been specified only to exist in ES2.0 devices while they should exist on >= ES2.0 devices. Fixed OMAP_CHIP_INIT() calls to take this to account. Signed-off-by: Kalle Jokiniemi Acked-by: Paul Walmsley --- arch/arm/mach-omap2/omapdev3xxx.h | 8 ++++---- arch/arm/mach-omap2/resource34xx.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/omapdev3xxx.h b/arch/arm/mach-omap2/omapdev3xxx.h index dce87df..d2772c4 100644 --- a/arch/arm/mach-omap2/omapdev3xxx.h +++ b/arch/arm/mach-omap2/omapdev3xxx.h @@ -374,7 +374,7 @@ static struct omapdev neon_3xxx_omapdev = { static struct omapdev sgx_3xxx_omapdev = { .name = "sgx_omapdev", .pwrdm = { .name = "sgx_pwrdm" }, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2), + .omap_chip = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2), }; /* CORE */ @@ -435,7 +435,7 @@ static struct omapdev hsmmc3_3xxx_omapdev = { .pwrdm = { .name = "core_pwrdm" }, .pdev_name = "mmci-omap", .pdev_id = 2, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2), + .omap_chip = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2), }; static struct omapdev mcspi4_3xxx_omapdev = { @@ -658,7 +658,7 @@ static struct omapdev usbhost_3xxx_omapdev = { .pwrdm = { .name = "usbhost_pwrdm" }, .pdev_name = "ehci-omap", .pdev_id = 0, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2), + .omap_chip = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2), }; static struct omapdev usbotg_3xxx_omapdev = { @@ -666,7 +666,7 @@ static struct omapdev usbotg_3xxx_omapdev = { .pwrdm = { .name = "usbhost_pwrdm" }, .pdev_name = "musb_hdrc", .pdev_id = -1, - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2), + .omap_chip = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2), }; static struct omapdev usbtll_3xxx_omapdev = { diff --git a/arch/arm/mach-omap2/resource34xx.h b/arch/arm/mach-omap2/resource34xx.h index b847208..8d95a00 100644 --- a/arch/arm/mach-omap2/resource34xx.h +++ b/arch/arm/mach-omap2/resource34xx.h @@ -133,7 +133,7 @@ static struct shared_resource gfx_pwrdm_latency = { static struct shared_resource sgx_pwrdm_latency = { .name = "sgx_pwrdm_latency", - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2), + .omap_chip = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2), .resource_data = &sgx_pwrdm_lat_db, .ops = &pd_lat_res_ops, }; @@ -208,7 +208,7 @@ static struct pd_latency_db usbhost_pwrdm_lat_db = { static struct shared_resource usbhost_pwrdm_latency = { .name = "usbhost_pwrdm_latency", - .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430ES2), + .omap_chip = OMAP_CHIP_INIT(CHIP_GE_OMAP3430ES2), .resource_data = &usbhost_pwrdm_lat_db, .ops = &pd_lat_res_ops, };