From patchwork Wed Dec 15 13:51:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Cousson X-Patchwork-Id: 413321 X-Patchwork-Delegate: paul@pwsan.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBFDrUaC002700 for ; Wed, 15 Dec 2010 13:53:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754066Ab0LONxd (ORCPT ); Wed, 15 Dec 2010 08:53:33 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:39561 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754045Ab0LONxc (ORCPT ); Wed, 15 Dec 2010 08:53:32 -0500 Received: from dlep36.itg.ti.com ([157.170.170.91]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id oBFDrRlr000718 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 15 Dec 2010 07:53:27 -0600 Received: from dlep26.itg.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id oBFDrRBq001623; Wed, 15 Dec 2010 07:53:27 -0600 (CST) Received: from dlee73.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id oBFDrQ4g007502; Wed, 15 Dec 2010 07:53:26 -0600 (CST) Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE73.ent.ti.com (157.170.170.88) with Microsoft SMTP Server id 8.3.106.1; Wed, 15 Dec 2010 07:53:26 -0600 Received: from localhost.localdomain (lncpu04.tif.ti.com [137.167.102.15]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id oBFDr3kl002351; Wed, 15 Dec 2010 07:53:25 -0600 From: Benoit Cousson To: CC: , , , Benoit Cousson , Charulatha V Subject: [PATCH v2 7/7] OMAP2430: hwmod data: Use common dev_attr for i2c1 and i2c2 Date: Wed, 15 Dec 2010 14:51:43 +0100 Message-ID: <1292421103-19282-8-git-send-email-b-cousson@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1292421103-19282-1-git-send-email-b-cousson@ti.com> References: <1292421103-19282-1-git-send-email-b-cousson@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 15 Dec 2010 13:53:36 +0000 (UTC) diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index 0f87736..eb73e5c 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c @@ -482,14 +482,12 @@ static struct omap_hwmod_class i2c_class = { .sysc = &i2c_sysc, }; -static struct omap_i2c_dev_attr i2c_dev_attr; - -/* I2C1 */ - -static struct omap_i2c_dev_attr i2c1_dev_attr = { +static struct omap_i2c_dev_attr i2c_dev_attr = { .fifo_depth = 8, /* bytes */ }; +/* I2C1 */ + static struct omap_hwmod_irq_info i2c1_mpu_irqs[] = { { .irq = INT_24XX_I2C1_IRQ, }, }; @@ -530,16 +528,12 @@ static struct omap_hwmod omap2430_i2c1_hwmod = { .slaves = omap2430_i2c1_slaves, .slaves_cnt = ARRAY_SIZE(omap2430_i2c1_slaves), .class = &i2c_class, - .dev_attr = &i2c1_dev_attr, + .dev_attr = &i2c_dev_attr, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), }; /* I2C2 */ -static struct omap_i2c_dev_attr i2c2_dev_attr = { - .fifo_depth = 8, /* bytes */ -}; - static struct omap_hwmod_irq_info i2c2_mpu_irqs[] = { { .irq = INT_24XX_I2C2_IRQ, }, }; @@ -572,7 +566,7 @@ static struct omap_hwmod omap2430_i2c2_hwmod = { .slaves = omap2430_i2c2_slaves, .slaves_cnt = ARRAY_SIZE(omap2430_i2c2_slaves), .class = &i2c_class, - .dev_attr = &i2c2_dev_attr, + .dev_attr = &i2c_dev_attr, .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), };