From patchwork Sun Feb 22 16:42:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 8322 X-Patchwork-Delegate: tony@atomide.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 n1MGdqib016491 for ; Sun, 22 Feb 2009 16:39:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752996AbZBVQjt (ORCPT ); Sun, 22 Feb 2009 11:39:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753191AbZBVQjt (ORCPT ); Sun, 22 Feb 2009 11:39:49 -0500 Received: from nf-out-0910.google.com ([64.233.182.190]:58787 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752996AbZBVQjs (ORCPT ); Sun, 22 Feb 2009 11:39:48 -0500 Received: by nf-out-0910.google.com with SMTP id d21so353385nfb.21 for ; Sun, 22 Feb 2009 08:39:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=jTbuuFR7VFF4tHMnO+w/ipI38oG6Nunspey1oOqxVLA=; b=qYM5R2j0ahLvPOYBUYxDUeYUo6cX65qj7wzmDX+tyeGkZhgRdIG3LtX6WrciGIBJzg rMN1uM//QPmtEtJU2fjuC+x+WgDA7oXnWE3o59MbWjCe7S4mGuzPIJHfoxpLB/pHByKx lOzH2VgT6yF+xTcnE+Cs8FxRuQJ3jKZzEkyV4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=hZUZiQqMLGUTUS9jiehGjWCL7Ytu1nFEfnXp3ZYwxCimbd3z7YpvFsl+z3CVG+shHm C+rk8V+uwh8TNL6YzN4iY2Yskt6XiQ5iqAlVn0TH5ibQ8RoY+G+J1IQIVizWudge5sbG /dTzsu0t79pt7XIa/+qzsOl8VQRk7C7yM38DU= Received: by 10.210.51.18 with SMTP id y18mr2650003eby.103.1235320787516; Sun, 22 Feb 2009 08:39:47 -0800 (PST) Received: from localhost (host-94-101-4-66.taloyhtioverkot.fi [94.101.4.66]) by mx.google.com with ESMTPS id 28sm2514014eye.49.2009.02.22.08.39.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 22 Feb 2009 08:39:46 -0800 (PST) From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: Jarkko Nikula , Dirk Behme Subject: [linux-omap][PATCH 1/1] ARM: OMAP3: Revert "Make I2C bus 2 configurable for BeagleBoard" Date: Sun, 22 Feb 2009 18:42:47 +0200 Message-Id: <1235320967-5614-2-git-send-email-jarkko.nikula@nokia.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1235320967-5614-1-git-send-email-jarkko.nikula@nokia.com> References: <1235320967-5614-1-git-send-email-jarkko.nikula@nokia.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This is manual revert for commit bae4b6a716ccf3247a1991d3c20b5e58ddd52890. CONFIG_I2C2_OMAP_BEAGLE is not needed anymore since additional busses can be registered on the command line by the commit ea9fcdaff4e9a6830833f3351eb44f6025df60e4. This change makes drivers/i2c/busses/Kconfig sync with the mainline. Signed-off-by: Jarkko Nikula Cc: Dirk Behme --- arch/arm/mach-omap2/board-omap3beagle.c | 3 --- drivers/i2c/busses/Kconfig | 20 ++------------------ 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index eb261af..af21a91 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -240,9 +240,6 @@ static int __init omap3_beagle_i2c_init(void) { omap_register_i2c_bus(1, 2600, beagle_i2c_boardinfo, ARRAY_SIZE(beagle_i2c_boardinfo)); -#ifdef CONFIG_I2C2_OMAP_BEAGLE - omap_register_i2c_bus(2, 400, NULL, 0); -#endif /* Bus 3 is attached to the DVI port where devices like the pico DLP * projector don't work reliably with 400kHz */ omap_register_i2c_bus(3, 100, NULL, 0); diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 4b8f400..7f95905 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -418,26 +418,10 @@ config I2C_OMAP default y if MACH_OMAP_H3 || MACH_OMAP_OSK help If you say yes to this option, support will be included for the - I2C interface on the Texas Instruments OMAP1/2/3 family of - processors. - Like OMAP1510/1610/1710/5912, OMAP242x, OMAP34x and OMAP35x. + I2C interface on the Texas Instruments OMAP1/2 family of processors. + Like OMAP1510/1610/1710/5912 and OMAP242x. For details see http://www.ti.com/omap. -config I2C2_OMAP_BEAGLE - bool "Enable I2C2 for OMAP3 BeagleBoard" - depends on ARCH_OMAP && MACH_OMAP3_BEAGLE - select OMAP_MUX - default n - help - Say Y here if you want to enable I2C bus 2 at OMAP3 based - BeagleBoard. - I2C2 at BeagleBoard is connected to expansion connector, i.e. unused - if nothing is connected to this connector. As internal OMAP3 pull up - resistors are not strong enough, enabled but unused I2C2 bus results - in error messages (e.g. I2C timeouts). Enable this only if you have - something connected to I2C2 at board's expansion connector and this - extension has additional pull up resistors for I2C2 bus. - config I2C_PASEMI tristate "PA Semi SMBus interface" depends on PPC_PASEMI && PCI