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 D688BC4321E for ; Sun, 4 Dec 2022 15:14:24 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 21EE4854F7; Sun, 4 Dec 2022 16:08:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="J8EX2tAz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0A17585491; Sun, 4 Dec 2022 16:06:52 +0100 (CET) Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7823385458 for ; Sun, 4 Dec 2022 16:06:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-ej1-x633.google.com with SMTP id vp12so22285664ejc.8 for ; Sun, 04 Dec 2022 07:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yrKrnFRAtl1HhM5XQxMD+9YE1+uZjfwHwzcqwteZIeU=; b=J8EX2tAz7ZFFhth80avPW6A9X1Dn/6MLNw4NnE2Xo6RmCPGLO7ym2KVv5Ehwb21Akn +yHW0z4KU9bUzYX4UZWRyGRG/bWKC6J+xQiF76Bs6U67ulXQjCTgfwQdG2rgY48qEe+8 YrvjBSQfgaTXnV62Q3CxXwU6tvZdKXA5SyMnc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yrKrnFRAtl1HhM5XQxMD+9YE1+uZjfwHwzcqwteZIeU=; b=DnyOyQLyakfQ65uJCOjMDncL7ytACoPZtTw/2RcHBprVvmuldbkxhBcoCxBX8l3QmA CGtXsdxzShJUUGTwTUxDgcRfnZtZNYIcwe//6uj2X4urJ3Pgey9engKLx/RvM/d+e5bG wpb/in3hPCLp3Q+lqssOlFEqZDvY0WdcqRqZkWFUoCjznG23MMXGx+JPRUB0ZC9R1WyQ amACDWUP4GXZ9hd8Kw/fKOxoNJoLEb5QEf0Z9RfsNf6zjK7a8YM9IGrCim1aGiT/g+R6 5SiZ8KqwMQN8+IawYAbb6xP51ciqMlAWBHq4b7IIaz5bQQk0PaGZHRFilSiT/xwqtZJp tC/g== X-Gm-Message-State: ANoB5pn2T+vOHoJtpWASBXs0r5inr2TsKQnCgB5iJku1X5vlWBsk1s6r 5FYYYfcJbtJDsQ8CQWgmDHcjZUzgw6E8EX4E X-Google-Smtp-Source: AA0mqf6Tc8491n6pMW9yBLzAOD+qn9ba3Q9DpZGlsKizjS1Tgf4aWmnZz2h2NI3U/c+ATZzkJRZjHQ== X-Received: by 2002:a17:906:7244:b0:7ae:2964:72dc with SMTP id n4-20020a170906724400b007ae296472dcmr42408704ejk.111.1670166406980; Sun, 04 Dec 2022 07:06:46 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-61c7-2644-b62d-0af3.res6.spectrum.com. [2603:6081:7b00:6400:61c7:2644:b62d:af3]) by smtp.gmail.com with ESMTPSA id g1-20020a17090604c100b0073dc5bb7c32sm5240058eja.64.2022.12.04.07.06.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:46 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 044/149] global: Migrate CONFIG_I2C_MVTWSI_BASE0 to CFG Date: Sun, 4 Dec 2022 10:04:09 -0500 Message-Id: <20221204150554.4165941-44-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204150554.4165941-1-trini@konsulko.com> References: <20221202214251.3027264-41-trini@konsulko.com> <20221204150554.4165941-1-trini@konsulko.com> 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.6 at phobos.denx.de X-Virus-Status: Clean Perform a simple rename of CONFIG_I2C_MVTWSI_BASE0 to CFG_I2C_MVTWSI_BASE0 Signed-off-by: Tom Rini --- arch/arm/include/asm/arch-sunxi/i2c.h | 2 +- arch/arm/mach-kirkwood/include/mach/config.h | 2 +- drivers/i2c/mvtwsi.c | 6 +++--- include/configs/db-88f6720.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/ds414.h | 2 +- include/configs/maxbcm.h | 2 +- include/configs/theadorable.h | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/i2c.h b/arch/arm/include/asm/arch-sunxi/i2c.h index 241b44928a95..2c2d6b7d31d0 100644 --- a/arch/arm/include/asm/arch-sunxi/i2c.h +++ b/arch/arm/include/asm/arch-sunxi/i2c.h @@ -8,7 +8,7 @@ #include #ifdef CONFIG_I2C0_ENABLE -#define CONFIG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE +#define CFG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE #endif #ifdef CONFIG_I2C1_ENABLE #define CONFIG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h index a6de7676294b..fbef9c99b1d3 100644 --- a/arch/arm/mach-kirkwood/include/mach/config.h +++ b/arch/arm/mach-kirkwood/include/mach/config.h @@ -24,7 +24,7 @@ #include -#define CONFIG_I2C_MVTWSI_BASE0 KW_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 KW_TWSI_BASE #define MV_UART_CONSOLE_BASE KW_UART0_BASE #define MV_SATA_BASE KW_SATA_BASE #define MV_SATA_PORT0_OFFSET KW_SATA_PORT0_OFFSET diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index a9c7d6e1bc26..076525d6c4d5 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -197,9 +197,9 @@ inline uint calc_tick(uint speed) static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap) { switch (adap->hwadapnr) { -#ifdef CONFIG_I2C_MVTWSI_BASE0 +#ifdef CFG_I2C_MVTWSI_BASE0 case 0: - return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE0; + return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0; #endif #ifdef CONFIG_I2C_MVTWSI_BASE1 case 1: @@ -737,7 +737,7 @@ static int twsi_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr, 10000); } -#ifdef CONFIG_I2C_MVTWSI_BASE0 +#ifdef CFG_I2C_MVTWSI_BASE0 U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe, twsi_i2c_read, twsi_i2c_write, twsi_i2c_set_bus_speed, diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index ef9c457e1020..54de2d0d8334 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -17,7 +17,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* USB/EHCI configuration */ diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 6dbf582d733b..2cbe4eb440b4 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -11,7 +11,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* Environment in SPI NOR flash */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index bf8b35102ad7..5c6d7fa1b776 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -13,7 +13,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* USB/EHCI configuration */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index e69883ba73bc..9446acba7923 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -17,7 +17,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 5ad945b55896..413597e09b26 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -19,7 +19,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE /* SPI NOR flash default params, used by sf commands */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 9722b0db72aa..412698d3fe92 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -25,7 +25,7 @@ */ /* I2C */ -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE +#define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE #define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE /* USB/EHCI configuration */ -- 2.25.1