From patchwork Mon Jun 4 15:34:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 162817 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id A1EF6B6F86 for ; Tue, 5 Jun 2012 01:34:56 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0E0EE28097; Mon, 4 Jun 2012 17:34:55 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3aItF0S9ILmb; Mon, 4 Jun 2012 17:34:54 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 050C328080; Mon, 4 Jun 2012 17:34:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3B17F28080 for ; Mon, 4 Jun 2012 17:34:51 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZPRTfqVeYlQn for ; Mon, 4 Jun 2012 17:34:50 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id D6C6628077 for ; Mon, 4 Jun 2012 17:34:47 +0200 (CEST) Received: by pbcwy7 with SMTP id wy7so5671264pbc.3 for ; Mon, 04 Jun 2012 08:34:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=qIk4zbmTb2Qg9qANzmU7hlT0MDGA2ik9wZlRwT6972o=; b=ibgeGQ5cvSIme/KNTdRcH6IlOwFW5W7mvUYsTgjjTNIMyNx12YYaEpQrRI+coeizem MYvQq2txjeH9W5y7SpdrW/MydGT+y0tR2zxoN9D8Qt4MckQW0YNXjIiqZCo7qVxpAvlG RCAXDelbXn7dZExYhpRy+CT34ml4bwNzs9R/j3c3YF1smfzLrNi3ypgNfUHi80E6wmei 8/Jhi80eS2V+sIpVkApeYfzyJlpIrhtvZGwNNY+g3/fiRTFWWqBT4gYmlZizsM9XejUs q86X6EP6fEoyo8/r/QoT6ZUPrNyD0jrR69oSedunijAc8/Gya/h+OAqt81e6dp0E1Vhj yogA== Received: by 10.68.234.35 with SMTP id ub3mr40452555pbc.8.1338824086176; Mon, 04 Jun 2012 08:34:46 -0700 (PDT) Received: from quadra (static-74-41-60-154.dsl1.pco.ca.frontiernet.net. [74.41.60.154]) by mx.google.com with ESMTPS id np8sm13619653pbc.71.2012.06.04.08.34.44 (version=SSLv3 cipher=OTHER); Mon, 04 Jun 2012 08:34:45 -0700 (PDT) From: Steve Sakoman To: u-boot@lists.denx.de Date: Mon, 4 Jun 2012 08:34:39 -0700 Message-Id: <1338824079-16800-1-git-send-email-steve@sakoman.com> X-Mailer: git-send-email 1.7.1 X-Gm-Message-State: ALoCoQktkIAP/+dYvzEgznKrjSE+zzCSrzNC0Cy0EYIfkzKJqlgiay21miCpQirBCS5G/7cE4a3D Cc: Tom Rini , Steve Sakoman Subject: [U-Boot] [PATCH] omap: am335x_evm: enable i2c1 channel X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This patch sets up pinmux, enables fclk, and defines CONFIG_I2C_MULTI_BUS Signed-off-by: Steve Sakoman --- arch/arm/cpu/armv7/am33xx/clock.c | 5 +++++ board/ti/am335x/mux.c | 8 ++++++++ include/configs/am335x_evm.h | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/armv7/am33xx/clock.c b/arch/arm/cpu/armv7/am33xx/clock.c index bbb9c13..57bec98 100644 --- a/arch/arm/cpu/armv7/am33xx/clock.c +++ b/arch/arm/cpu/armv7/am33xx/clock.c @@ -118,6 +118,11 @@ static void enable_per_clocks(void) writel(PRCM_MOD_EN, &cmwkup->wkup_i2c0ctrl); while (readl(&cmwkup->wkup_i2c0ctrl) != PRCM_MOD_EN) ; + + /* i2c1 */ + writel(PRCM_MOD_EN, &cmper->i2c1clkctrl); + while (readl(&cmper->i2c1clkctrl) != PRCM_MOD_EN) + ; } static void mpu_pll_config(void) diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 9ccb436..b97cfc8 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -280,6 +280,14 @@ static struct module_pin_mux i2c0_pin_mux[] = { {-1}, }; +static struct module_pin_mux i2c1_pin_mux[] = { + {OFFSET(spi0_d1), (MODE(2) | RXACTIVE | + PULLUDEN | SLEWCTRL)}, /* I2C_DATA */ + {OFFSET(spi0_cs0), (MODE(2) | RXACTIVE | + PULLUDEN | SLEWCTRL)}, /* I2C_SCLK */ + {-1}, +}; + /* * Configure the pin mux for the module */ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 89e2aa0..2b41c1c 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -108,6 +108,7 @@ #define CONFIG_HARD_I2C #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_I2C_SLAVE 1 +#define CONFIG_I2C_MULTI_BUS #define CONFIG_DRIVER_OMAP24XX_I2C #define CONFIG_BAUDRATE 115200