From patchwork Fri Aug 11 11:39:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 800503 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XJ96JAkJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xTNMb30gxz9t32 for ; Fri, 11 Aug 2017 21:39:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1F2EDC21E06; Fri, 11 Aug 2017 11:39:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 395B8C21D88; Fri, 11 Aug 2017 11:39:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 90098C21D88; Fri, 11 Aug 2017 11:39:30 +0000 (UTC) Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by lists.denx.de (Postfix) with ESMTPS id 050D6C21D63 for ; Fri, 11 Aug 2017 11:39:30 +0000 (UTC) Received: by mail-io0-f194.google.com with SMTP id h70so3286747ioi.2 for ; Fri, 11 Aug 2017 04:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=KcvA+Lch4OqHI9HlATRBD01lZId1ex9YQi/WjWmdDx8=; b=XJ96JAkJOpykzI48hkzhZ4VAhfvOgyppHAp6rOKs1lG0z5yiRPU177oVhGLY5sRLec E+jNS789TYMl2amUAYUrAeo4hSezIHkCMAfPbB2gfeeMQ3pUcYaymbMKEawfOJcltIqQ 49LGCpBlKf4KIR04FqAUl3JrOyitHS9fBT+Y8WxWt2M1qhkU41CvM2BE5K/eMtrwd+er 0IBaqkoE2Ol5dpGEm7jaGlN2togT4f11bw7rqax5cTuSEKPbokEDEUgdVitT6dflH+Tn 9crgyTfkjn9VpGFA3BD4ENoEhpP7hpfITrrmPyhZ0RjeSulehjHZhYBS8gi/R+jEFySk 9E7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KcvA+Lch4OqHI9HlATRBD01lZId1ex9YQi/WjWmdDx8=; b=IhiY1mYoXroAXbrfeXBNYPfPAmXjjubY5U8ZDQcuBA4c65ZX6vBJKNhivyi6UbzSZA L4IHfP4N+VEN+NhZXzcNfkwo9ASxZ7o+j0lUn7oY6vxQatwBhmxgAvP0FlGg0lWuXmTh 0ouIomzC2WCHK3nM5cNLAvkG4J1vMdh+GDYsY3NyZiRyOuE2jxHu/Ye2xwlEE+gtwQTJ SEWHudEXw0EftNe8RYmGbFaf+PbZAr6MatzZRCFq7RrjrLzPpBumdvZT2G8N+ouxKlMr SBWpAibYZuaS+MoIdRwY7hXt9Yual9D7btCTlczKEqHtSE2Vp+asQptPC10eMdAJr+ZS 1n1A== X-Gm-Message-State: AHYfb5g2Cbad+jZgh8XIrw2Rld8OzBw6osllAwD+0upsLRsQ693HCtKq NuIPXZRSkaU6SQ== X-Received: by 10.107.2.16 with SMTP id 16mr12863627ioc.112.1502451568624; Fri, 11 Aug 2017 04:39:28 -0700 (PDT) Received: from ubuntu16.lan (c-66-41-69-9.hsd1.mn.comcast.net. [66.41.69.9]) by smtp.gmail.com with ESMTPSA id o10sm314297ioe.27.2017.08.11.04.39.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Aug 2017 04:39:28 -0700 (PDT) From: Adam Ford To: Albert Aribaud , Heiko Schocher , Adam Ford , Simon Glass , Lokesh Vutla , Masahiro Yamada , "Andrew F. Davis" , Madan Srinivas , Franklin S Cooper Jr , Vignesh R , York Sun , u-boot@lists.denx.de Date: Fri, 11 Aug 2017 06:39:13 -0500 Message-Id: <1502451554-4920-1-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: adam.ford@logicpd.com Subject: [U-Boot] [PATCH 1/2] Configs: Migrate I2C_BUS_MAX to CONFIG_SYS_I2C_BUS_MAX X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" For consistency with other platforms and in preparation of Kconfig migration, let's change Several TI platforms that use I2C_BUS_MAX to CONFIG_SYS_I2C_BUS_MAX Signed-off-by: Adam Ford --- arch/arm/include/asm/arch-am33xx/i2c.h | 2 +- arch/arm/include/asm/arch-omap3/i2c.h | 2 +- arch/arm/include/asm/arch-omap4/i2c.h | 2 +- arch/arm/include/asm/arch-omap5/i2c.h | 2 +- drivers/i2c/davinci_i2c.c | 8 ++++---- drivers/i2c/omap24xx_i2c.c | 12 ++++++------ include/configs/ti_armv7_keystone2.h | 2 +- scripts/config_whitelist.txt | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/arm/include/asm/arch-am33xx/i2c.h b/arch/arm/include/asm/arch-am33xx/i2c.h index 8642c8f..a34282a 100644 --- a/arch/arm/include/asm/arch-am33xx/i2c.h +++ b/arch/arm/include/asm/arch-am33xx/i2c.h @@ -10,7 +10,7 @@ #define I2C_BASE1 0x44E0B000 #define I2C_BASE2 0x4802A000 #define I2C_BASE3 0x4819C000 -#define I2C_BUS_MAX 3 +#define CONFIG_SYS_I2C_BUS_MAX 3 #define I2C_DEFAULT_BASE I2C_BASE1 diff --git a/arch/arm/include/asm/arch-omap3/i2c.h b/arch/arm/include/asm/arch-omap3/i2c.h index 6b3a3da..d142175 100644 --- a/arch/arm/include/asm/arch-omap3/i2c.h +++ b/arch/arm/include/asm/arch-omap3/i2c.h @@ -7,7 +7,7 @@ #ifndef _OMAP3_I2C_H_ #define _OMAP3_I2C_H_ -#define I2C_BUS_MAX 3 +#define CONFIG_SYS_I2C_BUS_MAX 3 #define I2C_DEFAULT_BASE I2C_BASE1 struct i2c { diff --git a/arch/arm/include/asm/arch-omap4/i2c.h b/arch/arm/include/asm/arch-omap4/i2c.h index 463e979..1c5ed9b 100644 --- a/arch/arm/include/asm/arch-omap4/i2c.h +++ b/arch/arm/include/asm/arch-omap4/i2c.h @@ -7,7 +7,7 @@ #ifndef _OMAP4_I2C_H_ #define _OMAP4_I2C_H_ -#define I2C_BUS_MAX 4 +#define CONFIG_SYS_I2C_BUS_MAX 4 #define I2C_DEFAULT_BASE I2C_BASE1 struct i2c { diff --git a/arch/arm/include/asm/arch-omap5/i2c.h b/arch/arm/include/asm/arch-omap5/i2c.h index 2b55edf..5122cd6 100644 --- a/arch/arm/include/asm/arch-omap5/i2c.h +++ b/arch/arm/include/asm/arch-omap5/i2c.h @@ -7,7 +7,7 @@ #ifndef _OMAP5_I2C_H_ #define _OMAP5_I2C_H_ -#define I2C_BUS_MAX 5 +#define CONFIG_SYS_I2C_BUS_MAX 5 #define I2C_DEFAULT_BASE I2C_BASE1 struct i2c { diff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c index 2df07bb..a35ec46 100644 --- a/drivers/i2c/davinci_i2c.c +++ b/drivers/i2c/davinci_i2c.c @@ -343,11 +343,11 @@ static int _davinci_i2c_probe_chip(struct i2c_regs *i2c_base, uint8_t chip) static struct i2c_regs *davinci_get_base(struct i2c_adapter *adap) { switch (adap->hwadapnr) { -#if I2C_BUS_MAX >= 3 +#if CONFIG_SYS_I2C_BUS_MAX >= 3 case 2: return (struct i2c_regs *)I2C2_BASE; #endif -#if I2C_BUS_MAX >= 2 +#if CONFIG_SYS_I2C_BUS_MAX >= 2 case 1: return (struct i2c_regs *)I2C1_BASE; #endif @@ -412,7 +412,7 @@ U_BOOT_I2C_ADAP_COMPLETE(davinci_0, davinci_i2c_init, davinci_i2c_probe_chip, CONFIG_SYS_DAVINCI_I2C_SLAVE, 0) -#if I2C_BUS_MAX >= 2 +#if CONFIG_SYS_I2C_BUS_MAX >= 2 U_BOOT_I2C_ADAP_COMPLETE(davinci_1, davinci_i2c_init, davinci_i2c_probe_chip, davinci_i2c_read, davinci_i2c_write, davinci_i2c_setspeed, @@ -421,7 +421,7 @@ U_BOOT_I2C_ADAP_COMPLETE(davinci_1, davinci_i2c_init, davinci_i2c_probe_chip, 1) #endif -#if I2C_BUS_MAX >= 3 +#if CONFIG_SYS_I2C_BUS_MAX >= 3 U_BOOT_I2C_ADAP_COMPLETE(davinci_2, davinci_i2c_init, davinci_i2c_probe_chip, davinci_i2c_read, davinci_i2c_write, davinci_i2c_setspeed, diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index f71e0a5..c98c627 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -706,15 +706,15 @@ static struct i2c *omap24_get_base(struct i2c_adapter *adap) case 1: return (struct i2c *)I2C_BASE2; break; -#if (I2C_BUS_MAX > 2) +#if (CONFIG_SYS_I2C_BUS_MAX > 2) case 2: return (struct i2c *)I2C_BASE3; break; -#if (I2C_BUS_MAX > 3) +#if (CONFIG_SYS_I2C_BUS_MAX > 3) case 3: return (struct i2c *)I2C_BASE4; break; -#if (I2C_BUS_MAX > 4) +#if (CONFIG_SYS_I2C_BUS_MAX > 4) case 4: return (struct i2c *)I2C_BASE5; break; @@ -795,7 +795,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_1, omap24_i2c_init, omap24_i2c_probe, CONFIG_SYS_OMAP24_I2C_SPEED1, CONFIG_SYS_OMAP24_I2C_SLAVE1, 1) -#if (I2C_BUS_MAX > 2) +#if (CONFIG_SYS_I2C_BUS_MAX > 2) #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED2) #define CONFIG_SYS_OMAP24_I2C_SPEED2 CONFIG_SYS_OMAP24_I2C_SPEED #endif @@ -808,7 +808,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_2, omap24_i2c_init, omap24_i2c_probe, CONFIG_SYS_OMAP24_I2C_SPEED2, CONFIG_SYS_OMAP24_I2C_SLAVE2, 2) -#if (I2C_BUS_MAX > 3) +#if (CONFIG_SYS_I2C_BUS_MAX > 3) #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED3) #define CONFIG_SYS_OMAP24_I2C_SPEED3 CONFIG_SYS_OMAP24_I2C_SPEED #endif @@ -821,7 +821,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_3, omap24_i2c_init, omap24_i2c_probe, CONFIG_SYS_OMAP24_I2C_SPEED3, CONFIG_SYS_OMAP24_I2C_SLAVE3, 3) -#if (I2C_BUS_MAX > 4) +#if (CONFIG_SYS_I2C_BUS_MAX > 4) #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED4) #define CONFIG_SYS_OMAP24_I2C_SPEED4 CONFIG_SYS_OMAP24_I2C_SPEED #endif diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 03e28fc..812ba51 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -160,7 +160,7 @@ #define CONFIG_SYS_DAVINCI_I2C_SLAVE1 0x10 /* SMBus host address */ #define CONFIG_SYS_DAVINCI_I2C_SPEED2 100000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE2 0x10 /* SMBus host address */ -#define I2C_BUS_MAX 3 +#define CONFIG_SYS_I2C_BUS_MAX 3 /* EEPROM definitions */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4689d63..1261c18 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3456,7 +3456,7 @@ CONFIG_SYS_I2C_BASE3 CONFIG_SYS_I2C_BASE4 CONFIG_SYS_I2C_BASE5 CONFIG_SYS_I2C_BUSES -CONFIG_SYS_I2C_BUS_MAX +CONFIG_SYS_CONFIG_SYS_I2C_BUS_MAX CONFIG_SYS_I2C_CLK_OFFSET CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS