From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DF714C52D6F for ; Wed, 7 Aug 2024 13:09:40 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 250CE88A7D; Wed, 7 Aug 2024 15:09:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1723036179; bh=hOnM6m/VySkYjSsH0ZLFeefLvIPUR4MCZ35I86X7rtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=zITWfM3gyIvtMcpGNf86Bbs83gIkfS6SxIGSbx/qu8wWke/JPwcqFcvWQc+xZ/rs6 rklzbXJnita4xBeKCj5EliQJLos4syixVYNR7+GllZsdP0FlzbRBYUT6VCssKQF1br MpaZdSGua4l/k2awT33SFzRIEg8antRb77wVrAXLLrIVaDj8icozCtwpUXz58ZIaiq qRpn92rBSTHCmQKizCio+RQyN1rSTLDRdtVlXbG2rGoFFkJIpCWM8T4AEegsPr053H C/SYjqMu33W00CX89+3jnTJKb57fzQIqyfr3PCRmOooGUz2aIbBrW9ZkIbhq7T0svA DEWERa+wQTaOQ== Received: from crub.agik.hopto.org (p508b6395.dip0.t-ipconnect.de [80.139.99.149]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: agust@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 9DA8588A6B; Wed, 7 Aug 2024 15:09:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1723036177; bh=hOnM6m/VySkYjSsH0ZLFeefLvIPUR4MCZ35I86X7rtE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mUuSBoj2P5wOYwbQaPfiKbwXUgdLFnjxazj1fUZcvX5l/H1xqtgBopVJsgQYX8md4 0zT2aIMDzPfOmbUFl76HI0DZrEbXRjjHfcS2CPj27a9mLMdROLDwRQkd6ksEL8DRKp LVSdzeBGM8oiFhXeEnRBMDvcFxFejrnqNjzU6U84YpeCHozLKWsULVAp8qeLD1Ovxk ILDLhr+xnw90IJMmxrXB9ppW13f8lpCdnKm5ya/dKbMC2QzBPq1E7Mv1EQMhCeVVd2 DhJu8gTDVe3xgiJoXrdiKNR2U/G3wTQHXqaso/9vTDeFJ8pPLw2I++LItnNUApY36v EnbP+NwBMPjng== From: Anatolij Gustschin To: u-boot@lists.denx.de Cc: Nikita Kiryanov , Fabio Estevam , Heiko Schocher , Tom Rini Subject: [PATCH v2 10/11] board: cm_fx6: convert to DM_I2C Date: Wed, 7 Aug 2024 15:09:33 +0200 Message-Id: <20240807130933.846385-1-agust@denx.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240803161513.486062-10-agust@denx.de> References: <20240803161513.486062-10-agust@denx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Conversion to DM_I2C is mandatory, enable DM_I2C to fix board removal warning. Convert EEPROM access to use DM_I2C API. Signed-off-by: Anatolij Gustschin --- Cc: Nikita Kiryanov Cc: Fabio Estevam Cc: Heiko Schocher Cc: Tom Rini --- Changes in v2: fix trimslice build errors board/compulab/cm_fx6/cm_fx6.c | 3 ++- board/compulab/common/Makefile | 8 +++++++- board/compulab/common/eeprom.c | 14 +++++--------- board/compulab/common/eeprom.h | 2 +- configs/cm_fx6_defconfig | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index c6d33c32cc..40047cf678 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -256,7 +257,7 @@ static int cm_fx6_setup_one_i2c(int busnum, struct i2c_pads_info *pads) { int ret; - ret = setup_i2c(busnum, CONFIG_SYS_I2C_SPEED, 0x7f, pads); + ret = setup_i2c(busnum, I2C_SPEED_STANDARD_RATE, 0x7f, pads); if (ret) printf("Warning: I2C%d setup failed: %d\n", busnum, ret); diff --git a/board/compulab/common/Makefile b/board/compulab/common/Makefile index 7c8226e6e1..c7b2237e5c 100644 --- a/board/compulab/common/Makefile +++ b/board/compulab/common/Makefile @@ -4,6 +4,12 @@ # # Author: Igor Grinberg +CL_EEPROM=y + +ifdef CONFIG_TARGET_TRIMSLICE +CL_EEPROM= +endif + obj-y += common.o -obj-$(CONFIG_$(SPL_)SYS_I2C_LEGACY) += eeprom.o +obj-$(CL_EEPROM) += eeprom.o obj-$(CONFIG_SMC911X) += omap3_smc911x.o diff --git a/board/compulab/common/eeprom.c b/board/compulab/common/eeprom.c index efdaf342d5..1b12d09604 100644 --- a/board/compulab/common/eeprom.c +++ b/board/compulab/common/eeprom.c @@ -34,19 +34,15 @@ static int cl_eeprom_layout; /* Implicitly LAYOUT_INVALID */ static int cl_eeprom_read(uint offset, uchar *buf, int len) { + struct udevice *eeprom; int res; - unsigned int current_i2c_bus = i2c_get_bus_num(); - res = i2c_set_bus_num(cl_eeprom_bus); - if (res < 0) + res = i2c_get_chip_for_busnum(cl_eeprom_bus, CONFIG_SYS_I2C_EEPROM_ADDR, + CONFIG_SYS_I2C_EEPROM_ADDR_LEN, &eeprom); + if (res) return res; - res = i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, offset, - CONFIG_SYS_I2C_EEPROM_ADDR_LEN, buf, len); - - i2c_set_bus_num(current_i2c_bus); - - return res; + return dm_i2c_read(eeprom, offset, (uint8_t *)buf, len); } static int cl_eeprom_setup(uint eeprom_bus) diff --git a/board/compulab/common/eeprom.h b/board/compulab/common/eeprom.h index 9bd7604a99..0a44926ebd 100644 --- a/board/compulab/common/eeprom.h +++ b/board/compulab/common/eeprom.h @@ -10,7 +10,7 @@ #define _EEPROM_ #include -#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) +#if !CONFIG_IS_ENABLED(TARGET_TRIMSLICE) int cl_eeprom_read_mac_addr(uchar *buf, uint eeprom_bus); u32 cl_eeprom_get_board_rev(uint eeprom_bus); int cl_eeprom_get_product_name(uchar *buf, uint eeprom_bus); diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 386616cc42..81a39f7073 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -80,7 +80,7 @@ CONFIG_BOUNCE_BUFFER=y CONFIG_DWC_AHSATA=y # CONFIG_DWC_AHSATA_AHCI is not set CONFIG_LBA48=y -CONFIG_SYS_I2C_LEGACY=y +CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MXC=y CONFIG_SYS_MXC_I2C3_SPEED=400000 -- 2.25.1