From patchwork Sun Dec 4 15:04:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1711911 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=kxaTo998; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NQ9FM4yFlz23nB for ; Mon, 5 Dec 2022 02:14:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E4CB9854E8; Sun, 4 Dec 2022 16:08:06 +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="kxaTo998"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 49C7685491; Sun, 4 Dec 2022 16:06:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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 DFC1285461 for ; Sun, 4 Dec 2022 16:06:45 +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-x62e.google.com with SMTP id bj12so22254669ejb.13 for ; Sun, 04 Dec 2022 07:06:45 -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=ZP3JmgbstDrjZBxduMyIouVRlhej9zNaFBA0zRJW9Bw=; b=kxaTo998lCxF8oMxARznkI+q2v0VCeMVHp3XFFtbLHdPb18ZaikRYHr24l8Nb2Xcn+ GOjkghMTqM1xv3oxJbq26QKcGlMWzfL4xsUMkSqy1t4+ttTWwwPiDmc6QgML50Tzc5z/ 33DsM86RRKd6956DyrTTg+W4YR+9iMxL91C6g= 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=ZP3JmgbstDrjZBxduMyIouVRlhej9zNaFBA0zRJW9Bw=; b=MeLqFL4Kq3Pfpcptzr8nkdfxkasoS1ml11CxlYul2r9diCSQMl0YJtAscoGF0Ir/No l3/HEbPwYPM0A+xCkxV23lBwN7Od/PVxvQlbFWTdYPfIKC8Avwn44TL0U/VmpXxrcjaI nuonl5Uiu2yLXoleKd2w9zLPyxdRDOrZbk/HQhBbAjYWf0ZbvQZTWWh3hjXsXHhY+xLc YBArPCYycTydrDeVv1XaxQsj8GeNeCLTTxrjlmxAFwtj8mmM0F5zzAmaFSFNtSfUJj7a 1iGfkP5+6AxCnDQ5zXTn3k1hfju9fY1mdqEhnCnky0EUOmGrj1cL4vZQFcS86Gap+8qu OO9g== X-Gm-Message-State: ANoB5pmH/NEE1cSWwGGr3NC7ArJLnDUMlpv8nQwPlT4w2OJXx56nEXKX y6Nv4QXWE0AJt0iU1FGrnt/8zmOyHLh6W0Hl X-Google-Smtp-Source: AA0mqf411C3GYmm5NwArLheNLB5ngrrMS8pfmeGKXLTUXE2NesjUm+3/OfGbCBjs/ZkLUHUxHETL4w== X-Received: by 2002:a17:906:a107:b0:77f:9082:73c7 with SMTP id t7-20020a170906a10700b0077f908273c7mr49463436ejy.517.1670166405361; Sun, 04 Dec 2022 07:06:45 -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.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 07:06:44 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 043/149] global: Migrate CONFIG_I2C_MULTI_BUS to CFG Date: Sun, 4 Dec 2022 10:04:08 -0500 Message-Id: <20221204150554.4165941-43-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 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_MULTI_BUS to CFG_I2C_MULTI_BUS Signed-off-by: Tom Rini --- README | 2 +- include/configs/omap3_beagle.h | 2 +- include/configs/sniper.h | 2 +- include/configs/tqma6.h | 2 +- include/i2c.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index 84086764d810..05618352fa93 100644 --- a/README +++ b/README @@ -955,7 +955,7 @@ The following options need to be configured: You should define these to the GPIO value as given directly to the generic GPIO functions. - CONFIG_I2C_MULTI_BUS + CFG_I2C_MULTI_BUS This option allows the use of multiple I2C buses, each of which must have a controller. At any point in time, only one bus is diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index efeb7bf10078..af7cb3513f8f 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -29,7 +29,7 @@ #endif /* CONFIG_MTD_RAW_NAND */ /* Enable Multi Bus support for I2C */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS /* DSS Support */ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index eaee8dd37396..45a3102aeeef 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -38,7 +38,7 @@ * I2C */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS /* * Input diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 14d7730f67bf..cb5f7fc25af9 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -28,7 +28,7 @@ #define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K /* I2C Configs */ -#define CONFIG_I2C_MULTI_BUS +#define CFG_I2C_MULTI_BUS #if !defined(CONFIG_DM_PMIC) #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 diff --git a/include/i2c.h b/include/i2c.h index 51390f8fd84f..3811b26c08e0 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -930,7 +930,7 @@ unsigned int i2c_get_bus_speed(void); * only for backwardcompatibility, should go away if we switched * completely to new multibus support. */ -#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS) +#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS) # if !defined(CFG_SYS_MAX_I2C_BUS) # define CFG_SYS_MAX_I2C_BUS 2 # endif