{"id":800503,"url":"http://patchwork.ozlabs.org/api/1.2/patches/800503/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1502451554-4920-1-git-send-email-aford173@gmail.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1502451554-4920-1-git-send-email-aford173@gmail.com>","list_archive_url":null,"date":"2017-08-11T11:39:13","name":"[U-Boot,1/2] Configs: Migrate I2C_BUS_MAX to CONFIG_SYS_I2C_BUS_MAX","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"f19bd589f3f13fef78f431b4ef73368c15db1935","submitter":{"id":67132,"url":"http://patchwork.ozlabs.org/api/1.2/people/67132/?format=json","name":"Adam Ford","email":"aford173@gmail.com"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/1.2/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1502451554-4920-1-git-send-email-aford173@gmail.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/800503/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/800503/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"XJ96JAkJ\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xTNMb30gxz9t32\n\tfor ;\n\tFri, 11 Aug 2017 21:39:39 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 1F2EDC21E06; Fri, 11 Aug 2017 11:39:35 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 395B8C21D88;\n\tFri, 11 Aug 2017 11:39:32 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 90098C21D88; Fri, 11 Aug 2017 11:39:30 +0000 (UTC)","from mail-io0-f194.google.com (mail-io0-f194.google.com\n\t[209.85.223.194])\n\tby lists.denx.de (Postfix) with ESMTPS id 050D6C21D63\n\tfor ; Fri, 11 Aug 2017 11:39:30 +0000 (UTC)","by mail-io0-f194.google.com with SMTP id h70so3286747ioi.2\n\tfor ; Fri, 11 Aug 2017 04:39:29 -0700 (PDT)","from ubuntu16.lan (c-66-41-69-9.hsd1.mn.comcast.net. [66.41.69.9])\n\tby smtp.gmail.com with ESMTPSA id\n\to10sm314297ioe.27.2017.08.11.04.39.27\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 11 Aug 2017 04:39:28 -0700 (PDT)"],"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,\n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id;\n\tbh=KcvA+Lch4OqHI9HlATRBD01lZId1ex9YQi/WjWmdDx8=;\n\tb=XJ96JAkJOpykzI48hkzhZ4VAhfvOgyppHAp6rOKs1lG0z5yiRPU177oVhGLY5sRLec\n\tE+jNS789TYMl2amUAYUrAeo4hSezIHkCMAfPbB2gfeeMQ3pUcYaymbMKEawfOJcltIqQ\n\t49LGCpBlKf4KIR04FqAUl3JrOyitHS9fBT+Y8WxWt2M1qhkU41CvM2BE5K/eMtrwd+er\n\t0IBaqkoE2Ol5dpGEm7jaGlN2togT4f11bw7rqax5cTuSEKPbokEDEUgdVitT6dflH+Tn\n\t9crgyTfkjn9VpGFA3BD4ENoEhpP7hpfITrrmPyhZ0RjeSulehjHZhYBS8gi/R+jEFySk\n\t9E7A==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=KcvA+Lch4OqHI9HlATRBD01lZId1ex9YQi/WjWmdDx8=;\n\tb=IhiY1mYoXroAXbrfeXBNYPfPAmXjjubY5U8ZDQcuBA4c65ZX6vBJKNhivyi6UbzSZA\n\tL4IHfP4N+VEN+NhZXzcNfkwo9ASxZ7o+j0lUn7oY6vxQatwBhmxgAvP0FlGg0lWuXmTh\n\t0ouIomzC2WCHK3nM5cNLAvkG4J1vMdh+GDYsY3NyZiRyOuE2jxHu/Ye2xwlEE+gtwQTJ\n\tSEWHudEXw0EftNe8RYmGbFaf+PbZAr6MatzZRCFq7RrjrLzPpBumdvZT2G8N+ouxKlMr\n\tSBWpAibYZuaS+MoIdRwY7hXt9Yual9D7btCTlczKEqHtSE2Vp+asQptPC10eMdAJr+ZS\n\t1n1A==","X-Gm-Message-State":"AHYfb5g2Cbad+jZgh8XIrw2Rld8OzBw6osllAwD+0upsLRsQ693HCtKq\n\tNuIPXZRSkaU6SQ==","X-Received":"by 10.107.2.16 with SMTP id 16mr12863627ioc.112.1502451568624;\n\tFri, 11 Aug 2017 04:39:28 -0700 (PDT)","From":"Adam Ford ","To":"Albert Aribaud , Heiko Schocher , \n\tAdam Ford , Simon Glass ,\n\tLokesh Vutla ,\n\tMasahiro Yamada ,\n\t\"Andrew F. Davis\" , Madan Srinivas ,\n\tFranklin S Cooper Jr , Vignesh R ,\n\tYork 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\n\tCONFIG_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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"For consistency with other platforms and in preparation of Kconfig\nmigration, let's change Several TI platforms that use I2C_BUS_MAX\nto CONFIG_SYS_I2C_BUS_MAX\n\nSigned-off-by: Adam Ford \n---\n arch/arm/include/asm/arch-am33xx/i2c.h | 2 +-\n arch/arm/include/asm/arch-omap3/i2c.h | 2 +-\n arch/arm/include/asm/arch-omap4/i2c.h | 2 +-\n arch/arm/include/asm/arch-omap5/i2c.h | 2 +-\n drivers/i2c/davinci_i2c.c | 8 ++++----\n drivers/i2c/omap24xx_i2c.c | 12 ++++++------\n include/configs/ti_armv7_keystone2.h | 2 +-\n scripts/config_whitelist.txt | 2 +-\n 8 files changed, 16 insertions(+), 16 deletions(-)","diff":"diff --git a/arch/arm/include/asm/arch-am33xx/i2c.h b/arch/arm/include/asm/arch-am33xx/i2c.h\nindex 8642c8f..a34282a 100644\n--- a/arch/arm/include/asm/arch-am33xx/i2c.h\n+++ b/arch/arm/include/asm/arch-am33xx/i2c.h\n@@ -10,7 +10,7 @@\n #define I2C_BASE1\t\t0x44E0B000\n #define I2C_BASE2\t\t0x4802A000\n #define I2C_BASE3\t\t0x4819C000\n-#define\t I2C_BUS_MAX\t\t3\n+#define\t CONFIG_SYS_I2C_BUS_MAX\t\t3\n \n #define I2C_DEFAULT_BASE\t\tI2C_BASE1\n \ndiff --git a/arch/arm/include/asm/arch-omap3/i2c.h b/arch/arm/include/asm/arch-omap3/i2c.h\nindex 6b3a3da..d142175 100644\n--- a/arch/arm/include/asm/arch-omap3/i2c.h\n+++ b/arch/arm/include/asm/arch-omap3/i2c.h\n@@ -7,7 +7,7 @@\n #ifndef _OMAP3_I2C_H_\n #define _OMAP3_I2C_H_\n \n-#define I2C_BUS_MAX\t3\n+#define CONFIG_SYS_I2C_BUS_MAX\t3\n #define I2C_DEFAULT_BASE\tI2C_BASE1\n \n struct i2c {\ndiff --git a/arch/arm/include/asm/arch-omap4/i2c.h b/arch/arm/include/asm/arch-omap4/i2c.h\nindex 463e979..1c5ed9b 100644\n--- a/arch/arm/include/asm/arch-omap4/i2c.h\n+++ b/arch/arm/include/asm/arch-omap4/i2c.h\n@@ -7,7 +7,7 @@\n #ifndef _OMAP4_I2C_H_\n #define _OMAP4_I2C_H_\n \n-#define I2C_BUS_MAX\t4\n+#define CONFIG_SYS_I2C_BUS_MAX\t4\n #define I2C_DEFAULT_BASE\tI2C_BASE1\n \n struct i2c {\ndiff --git a/arch/arm/include/asm/arch-omap5/i2c.h b/arch/arm/include/asm/arch-omap5/i2c.h\nindex 2b55edf..5122cd6 100644\n--- a/arch/arm/include/asm/arch-omap5/i2c.h\n+++ b/arch/arm/include/asm/arch-omap5/i2c.h\n@@ -7,7 +7,7 @@\n #ifndef _OMAP5_I2C_H_\n #define _OMAP5_I2C_H_\n \n-#define I2C_BUS_MAX\t5\n+#define CONFIG_SYS_I2C_BUS_MAX\t5\n #define I2C_DEFAULT_BASE\tI2C_BASE1\n \n struct i2c {\ndiff --git a/drivers/i2c/davinci_i2c.c b/drivers/i2c/davinci_i2c.c\nindex 2df07bb..a35ec46 100644\n--- a/drivers/i2c/davinci_i2c.c\n+++ b/drivers/i2c/davinci_i2c.c\n@@ -343,11 +343,11 @@ static int _davinci_i2c_probe_chip(struct i2c_regs *i2c_base, uint8_t chip)\n static struct i2c_regs *davinci_get_base(struct i2c_adapter *adap)\n {\n \tswitch (adap->hwadapnr) {\n-#if I2C_BUS_MAX >= 3\n+#if CONFIG_SYS_I2C_BUS_MAX >= 3\n \tcase 2:\n \t\treturn (struct i2c_regs *)I2C2_BASE;\n #endif\n-#if I2C_BUS_MAX >= 2\n+#if CONFIG_SYS_I2C_BUS_MAX >= 2\n \tcase 1:\n \t\treturn (struct i2c_regs *)I2C1_BASE;\n #endif\n@@ -412,7 +412,7 @@ U_BOOT_I2C_ADAP_COMPLETE(davinci_0, davinci_i2c_init, davinci_i2c_probe_chip,\n \t\t\t CONFIG_SYS_DAVINCI_I2C_SLAVE,\n \t\t\t 0)\n \n-#if I2C_BUS_MAX >= 2\n+#if CONFIG_SYS_I2C_BUS_MAX >= 2\n U_BOOT_I2C_ADAP_COMPLETE(davinci_1, davinci_i2c_init, davinci_i2c_probe_chip,\n \t\t\t davinci_i2c_read, davinci_i2c_write,\n \t\t\t davinci_i2c_setspeed,\n@@ -421,7 +421,7 @@ U_BOOT_I2C_ADAP_COMPLETE(davinci_1, davinci_i2c_init, davinci_i2c_probe_chip,\n \t\t\t 1)\n #endif\n \n-#if I2C_BUS_MAX >= 3\n+#if CONFIG_SYS_I2C_BUS_MAX >= 3\n U_BOOT_I2C_ADAP_COMPLETE(davinci_2, davinci_i2c_init, davinci_i2c_probe_chip,\n \t\t\t davinci_i2c_read, davinci_i2c_write,\n \t\t\t davinci_i2c_setspeed,\ndiff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c\nindex f71e0a5..c98c627 100644\n--- a/drivers/i2c/omap24xx_i2c.c\n+++ b/drivers/i2c/omap24xx_i2c.c\n@@ -706,15 +706,15 @@ static struct i2c *omap24_get_base(struct i2c_adapter *adap)\n \tcase 1:\n \t\treturn (struct i2c *)I2C_BASE2;\n \t\tbreak;\n-#if (I2C_BUS_MAX > 2)\n+#if (CONFIG_SYS_I2C_BUS_MAX > 2)\n \tcase 2:\n \t\treturn (struct i2c *)I2C_BASE3;\n \t\tbreak;\n-#if (I2C_BUS_MAX > 3)\n+#if (CONFIG_SYS_I2C_BUS_MAX > 3)\n \tcase 3:\n \t\treturn (struct i2c *)I2C_BASE4;\n \t\tbreak;\n-#if (I2C_BUS_MAX > 4)\n+#if (CONFIG_SYS_I2C_BUS_MAX > 4)\n \tcase 4:\n \t\treturn (struct i2c *)I2C_BASE5;\n \t\tbreak;\n@@ -795,7 +795,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_1, omap24_i2c_init, omap24_i2c_probe,\n \t\t\t CONFIG_SYS_OMAP24_I2C_SPEED1,\n \t\t\t CONFIG_SYS_OMAP24_I2C_SLAVE1,\n \t\t\t 1)\n-#if (I2C_BUS_MAX > 2)\n+#if (CONFIG_SYS_I2C_BUS_MAX > 2)\n #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED2)\n #define CONFIG_SYS_OMAP24_I2C_SPEED2 CONFIG_SYS_OMAP24_I2C_SPEED\n #endif\n@@ -808,7 +808,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_2, omap24_i2c_init, omap24_i2c_probe,\n \t\t\t CONFIG_SYS_OMAP24_I2C_SPEED2,\n \t\t\t CONFIG_SYS_OMAP24_I2C_SLAVE2,\n \t\t\t 2)\n-#if (I2C_BUS_MAX > 3)\n+#if (CONFIG_SYS_I2C_BUS_MAX > 3)\n #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED3)\n #define CONFIG_SYS_OMAP24_I2C_SPEED3 CONFIG_SYS_OMAP24_I2C_SPEED\n #endif\n@@ -821,7 +821,7 @@ U_BOOT_I2C_ADAP_COMPLETE(omap24_3, omap24_i2c_init, omap24_i2c_probe,\n \t\t\t CONFIG_SYS_OMAP24_I2C_SPEED3,\n \t\t\t CONFIG_SYS_OMAP24_I2C_SLAVE3,\n \t\t\t 3)\n-#if (I2C_BUS_MAX > 4)\n+#if (CONFIG_SYS_I2C_BUS_MAX > 4)\n #if !defined(CONFIG_SYS_OMAP24_I2C_SPEED4)\n #define CONFIG_SYS_OMAP24_I2C_SPEED4 CONFIG_SYS_OMAP24_I2C_SPEED\n #endif\ndiff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h\nindex 03e28fc..812ba51 100644\n--- a/include/configs/ti_armv7_keystone2.h\n+++ b/include/configs/ti_armv7_keystone2.h\n@@ -160,7 +160,7 @@\n #define CONFIG_SYS_DAVINCI_I2C_SLAVE1\t0x10 /* SMBus host address */\n #define CONFIG_SYS_DAVINCI_I2C_SPEED2\t100000\n #define CONFIG_SYS_DAVINCI_I2C_SLAVE2\t0x10 /* SMBus host address */\n-#define I2C_BUS_MAX\t\t\t3\n+#define CONFIG_SYS_I2C_BUS_MAX\t\t\t3\n \n /* EEPROM definitions */\n #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN\t\t2\ndiff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt\nindex 4689d63..1261c18 100644\n--- a/scripts/config_whitelist.txt\n+++ b/scripts/config_whitelist.txt\n@@ -3456,7 +3456,7 @@ CONFIG_SYS_I2C_BASE3\n CONFIG_SYS_I2C_BASE4\n CONFIG_SYS_I2C_BASE5\n CONFIG_SYS_I2C_BUSES\n-CONFIG_SYS_I2C_BUS_MAX\n+CONFIG_SYS_CONFIG_SYS_I2C_BUS_MAX\n CONFIG_SYS_I2C_CLK_OFFSET\n CONFIG_SYS_I2C_DAVINCI\n CONFIG_SYS_I2C_DIRECT_BUS\n","prefixes":["U-Boot","1/2"]}