From patchwork Wed Sep 29 16:14:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 217652 X-Patchwork-Delegate: khilman@deeprootsystems.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 o8TGEMd3021206 for ; Wed, 29 Sep 2010 16:14:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753634Ab0I2QOT (ORCPT ); Wed, 29 Sep 2010 12:14:19 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:57455 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751077Ab0I2QOS convert rfc822-to-8bit (ORCPT ); Wed, 29 Sep 2010 12:14:18 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o8TGEEGt009266 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 29 Sep 2010 11:14:16 -0500 Received: from dbde71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id o8TGECis011059; Wed, 29 Sep 2010 21:44:12 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde71.ent.ti.com ([172.24.170.149]) with mapi; Wed, 29 Sep 2010 21:44:11 +0530 From: "Nayak, Rajendra" To: "Nayak, Rajendra" , Kevin Hilman , Tony Lindgren CC: "linux-omap@vger.kernel.org" , "Varadarajan, Charulatha" , "Raja, Govindraj" Date: Wed, 29 Sep 2010 21:44:01 +0530 Subject: RE: [GIT PULL] for testing: OMAP hwmod driver conversions: watchdog, UART, i2c Thread-Topic: [GIT PULL] for testing: OMAP hwmod driver conversions: watchdog, UART, i2c Thread-Index: ActfVSKJTpjJ7Ww5S0a2AhFmgkFTVwANb3OwABj6nCA= Message-ID: <0680EC522D0CC943BC586913CF3768C003FF2DAF48@dbde02.ent.ti.com> References: <8762xpenf8.fsf@deeprootsystems.com> <20100928201844.GI3117@atomide.com> <87d3rxblfu.fsf@deeprootsystems.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US 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, 29 Sep 2010 16:14:23 +0000 (UTC) diff --git a/arch/arm/mach-omap2/cm-regbits-24xx.h b/arch/arm/mach-omap2/cm-regbits-24xx.h index 5986e2b..9a106c0 100644 --- a/arch/arm/mach-omap2/cm-regbits-24xx.h +++ b/arch/arm/mach-omap2/cm-regbits-24xx.h @@ -126,12 +126,12 @@ #define OMAP24XX_ST_HDQ_MASK (1 << 23) #define OMAP2420_ST_I2C2_SHIFT 20 #define OMAP2420_ST_I2C2_MASK (1 << 20) -#define OMAP2430_ST_I2CHS1_SHIFT 20 -#define OMAP2430_ST_I2CHS1_MASK (1 << 20) +#define OMAP2430_ST_I2CHS1_SHIFT 19 +#define OMAP2430_ST_I2CHS1_MASK (1 << 19) #define OMAP2420_ST_I2C1_SHIFT 19 #define OMAP2420_ST_I2C1_MASK (1 << 19) -#define OMAP2430_ST_I2CHS2_SHIFT 19 -#define OMAP2430_ST_I2CHS2_MASK (1 << 19) +#define OMAP2430_ST_I2CHS2_SHIFT 20 +#define OMAP2430_ST_I2CHS2_MASK (1 << 20) #define OMAP24XX_ST_MCBSP2_SHIFT 16 #define OMAP24XX_ST_MCBSP2_MASK (1 << 16) #define OMAP24XX_ST_MCBSP1_SHIFT 15 diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c index 8bf46c1..ca4edd3 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c @@ -504,6 +504,7 @@ static struct omap_hwmod omap2420_i2c1_hwmod = { .main_clk = "i2c1_fck", .prcm = { .omap2 = { + .module_offs = CORE_MOD, .prcm_reg_id = 1, .module_bit = OMAP2420_EN_I2C1_SHIFT, .idlest_reg_id = 1, @@ -541,6 +542,7 @@ static struct omap_hwmod omap2420_i2c2_hwmod = { .main_clk = "i2c2_fck", .prcm = { .omap2 = { + .module_offs = CORE_MOD, .prcm_reg_id = 1, .module_bit = OMAP2420_EN_I2C2_SHIFT, .idlest_reg_id = 1, diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index 92f4ec0..9498847 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c @@ -502,7 +502,7 @@ static struct omap_hwmod omap2430_i2c1_hwmod = { .mpu_irqs_cnt = ARRAY_SIZE(i2c1_mpu_irqs), .sdma_reqs = i2c1_sdma_reqs, .sdma_reqs_cnt = ARRAY_SIZE(i2c1_sdma_reqs), - .main_clk = "i2c1_fck", + .main_clk = "i2chs1_fck", .prcm = { .omap2 = { /* @@ -513,6 +513,7 @@ static struct omap_hwmod omap2430_i2c1_hwmod = { * additonal flags when clk handling is moved * to hwmod framework. */ + .module_offs = CORE_MOD, .prcm_reg_id = 1, .module_bit = OMAP2430_EN_I2CHS1_SHIFT, .idlest_reg_id = 1, @@ -551,9 +552,10 @@ static struct omap_hwmod omap2430_i2c2_hwmod = { .mpu_irqs_cnt = ARRAY_SIZE(i2c2_mpu_irqs), .sdma_reqs = i2c2_sdma_reqs, .sdma_reqs_cnt = ARRAY_SIZE(i2c2_sdma_reqs), - .main_clk = "i2c2_fck", + .main_clk = "i2chs2_fck", .prcm = { .omap2 = { + .module_offs = CORE_MOD, .prcm_reg_id = 1, .module_bit = OMAP2430_EN_I2CHS2_SHIFT, .idlest_reg_id = 1,