From patchwork Tue Mar 15 09:03:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 86914 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 74BFEB6F99 for ; Tue, 15 Mar 2011 20:16:10 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B9816280F5; Tue, 15 Mar 2011 10:14:56 +0100 (CET) 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 ntgZslnZHJ+U; Tue, 15 Mar 2011 10:14:56 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B5991280F6; Tue, 15 Mar 2011 10:13:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 976B7280A9 for ; Tue, 15 Mar 2011 10:13:15 +0100 (CET) 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 g2BCswptzaes for ; Tue, 15 Mar 2011 10:13:15 +0100 (CET) X-policyd-weight: IN_SBL_XBL_SPAMHAUS=4.35 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from pollux.denx.de (p4FF07062.dip.t-dialin.net [79.240.112.98]) by theia.denx.de (Postfix) with ESMTP id 0BAB428093 for ; Tue, 15 Mar 2011 10:13:10 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id 960A71865EA35; Tue, 15 Mar 2011 10:04:17 +0100 (CET) From: Heiko Schocher To: u-boot@lists.denx.de Date: Tue, 15 Mar 2011 10:03:55 +0100 Message-Id: <1300179844-8951-13-git-send-email-hs@denx.de> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1300179844-8951-1-git-send-email-hs@denx.de> References: <1299591018-8944-1-git-send-email-hs@denx.de> <1300179844-8951-1-git-send-email-hs@denx.de> In-Reply-To: <1299591018-8944-1-git-send-email-hs@denx.de> References: <1299591018-8944-1-git-send-email-hs@denx.de> Cc: Valentin Longchamp , Lukas Roggli , Holger Brunck , Heiko Schocher Subject: [U-Boot] [PATCH v2 12/21] km-arm: i2c support for suenx based boards X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 renames the suen3 defines and functions to suenx which is more generic and more precise, because these values and functions where used by all suenX boards and not only sune3. Signed-off-by: Lukas Roggli Signed-off-by: Valentin Longchamp Signed-off-by: Holger Brunck Signed-off-by: Heiko Schocher cc: Prafulla Wadaskar --- Changes for v2: - fix checkpatch.pl errors and warnings board/keymile/km_arm/km_arm.c | 20 ++++++++++---------- include/configs/km_arm.h | 18 +++++++++--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 5c1e822..2ba1cbe 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -96,7 +96,7 @@ u32 kwmpp_config[] = { MPP41_GPIO, /* Piggy3 LED[4] */ MPP42_GPIO, /* Piggy3 LED[5] */ MPP43_GPIO, /* Piggy3 LED[6] */ - MPP44_GPIO, /* Piggy3 LED[7] */ + MPP44_GPIO, /* Piggy3 LED[7], BIST_EN_L */ MPP45_GPIO, /* Piggy3 LED[8] */ MPP46_GPIO, /* Reserved */ MPP47_GPIO, /* Reserved */ @@ -162,14 +162,14 @@ int board_early_init_f(void) #if defined(CONFIG_SOFT_I2C) /* init the GPIO for I2C Bitbang driver */ - kw_gpio_set_valid(SUEN3_SDA_PIN, 1); - kw_gpio_set_valid(SUEN3_SCL_PIN, 1); - kw_gpio_direction_output(SUEN3_SDA_PIN, 0); - kw_gpio_direction_output(SUEN3_SCL_PIN, 0); + kw_gpio_set_valid(SUENx_SDA_PIN, 1); + kw_gpio_set_valid(SUENx_SCL_PIN, 1); + kw_gpio_direction_output(SUENx_SDA_PIN, 0); + kw_gpio_direction_output(SUENx_SCL_PIN, 0); #endif #if defined(CONFIG_SYS_EEPROM_WREN) - kw_gpio_set_valid(SUEN3_ENV_WP, 38); - kw_gpio_direction_output(SUEN3_ENV_WP, 1); + kw_gpio_set_valid(SUENx_ENV_WP, 38); + kw_gpio_direction_output(SUENx_ENV_WP, 1); #endif return 0; @@ -322,15 +322,15 @@ int get_sda (void) int get_scl (void) { - return (kw_gpio_get_value(SUEN3_SCL_PIN) ? 1 : 0); + return kw_gpio_get_value(SUENx_SCL_PIN) ? 1 : 0; } #endif #if defined(CONFIG_SYS_EEPROM_WREN) int eeprom_write_enable (unsigned dev_addr, int state) { - kw_gpio_set_value(SUEN3_ENV_WP, !state); + kw_gpio_set_value(SUENx_ENV_WP, !state); - return !kw_gpio_get_value(SUEN3_ENV_WP); + return !kw_gpio_get_value(SUENx_ENV_WP); } #endif diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index 6e8e8b7..8b429a1 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -177,15 +177,15 @@ void set_sda (int state); void set_scl (int state); int get_sda (void); int get_scl (void); -#define SUEN3_SDA_PIN 8 -#define SUEN3_SCL_PIN 9 -#define SUEN3_ENV_WP 38 - -#define I2C_ACTIVE __set_direction(SUEN3_SDA_PIN, 0) -#define I2C_TRISTATE __set_direction(SUEN3_SDA_PIN, 1) -#define I2C_READ (kw_gpio_get_value(SUEN3_SDA_PIN) ? 1 : 0) -#define I2C_SDA(bit) kw_gpio_set_value(SUEN3_SDA_PIN, bit); -#define I2C_SCL(bit) kw_gpio_set_value(SUEN3_SCL_PIN, bit); +#define SUENx_SDA_PIN 8 +#define SUENx_SCL_PIN 9 +#define SUENx_ENV_WP 38 + +#define I2C_ACTIVE __set_direction(SUENx_SDA_PIN, 0) +#define I2C_TRISTATE __set_direction(SUENx_SDA_PIN, 1) +#define I2C_READ (kw_gpio_get_value(SUENx_SDA_PIN) ? 1 : 0) +#define I2C_SDA(bit) kw_gpio_set_value(SUENx_SDA_PIN, bit); +#define I2C_SCL(bit) kw_gpio_set_value(SUENx_SCL_PIN, bit); #endif #define I2C_DELAY udelay(3) /* 1/4 I2C clock duration */