From patchwork Fri Aug 10 10:05:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 956181 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="h58Nieqc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41n13V3qLwz9s7Q for ; Fri, 10 Aug 2018 20:05:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9BD9BC21DF3; Fri, 10 Aug 2018 10:05:47 +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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 51163C21C51; Fri, 10 Aug 2018 10:05:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8D068C21C50; Fri, 10 Aug 2018 10:05:41 +0000 (UTC) Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by lists.denx.de (Postfix) with ESMTPS id C7F6FC21C27 for ; Fri, 10 Aug 2018 10:05:40 +0000 (UTC) Received: by mail-it0-f65.google.com with SMTP id e14-v6so1901018itf.1 for ; Fri, 10 Aug 2018 03:05:40 -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=TYLW9a8UO1NIlrUG766HxdDj8/mLQ5KnHRANeqV5asU=; b=h58NieqcPFBruAhleiSgRHQTmro/Y0M2VzXFquyYWEWWI187/G+xzFMT6jO5Knf3N3 Hn+DMFEHWshdNDK00ROH0TgyCyeCgZlonoFmHLQj7d3g28Tc+XgFvXn6h6JIWwt1Jp0g y7deiCt7MkdnqXttscOEMcaldqH7QrINE2i1VrH3YkJfY8XjzxbVL2XF9qzzAltBdVml PhUGabkQVNxLdcKAyAFh5V6TOaoQ1UgS91Wk4JgmQjpoUhCioe6lsHTNTvUYTqmqcPHi 11ed/5dJUznckeCU8Q4+6DFYgGBHckes5DsCpcRZOxu9/GfIITW0Dqt7R09NpblLo3Qp dBgA== 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=TYLW9a8UO1NIlrUG766HxdDj8/mLQ5KnHRANeqV5asU=; b=p6xi0EWqChd4MWRE/IIVHV9Hh8Eig9EhCJA/TO8YMC/ViB9OrKCNyVmfjFDqb3SbPT 2kmfNKEozEna86/3O+M9DqY7qrXLI9cBEqXrNPHBpbfj82MeoHs88RwLBCmLh36pHNU8 1BzjNyY7SWnSVkD1soePgQnIHx4jWJWdoIqz54EE2VzfmFRdZnxz+mj+vAfe2cpvKxkj KS+TzwO2dmxmvPUW0MhIJdGhXAtFfA9z8bh+JlJIAa4cWi2thUE7mOE61BtZ79vDqoFg jzUfzcWjHWTc1NCqkGL8LD5nhEYM7uppMcqC18g+cpOW5O0IXo+SQINPcxdDzIOeVcWC yeDg== X-Gm-Message-State: AOUpUlFi3eoeXesW9ZejWLBpmISlQpAhVfTLc96t2831aIDKRnVGRpuv GM5vJ7Ktv6BRTUnQ2U9GMas= X-Google-Smtp-Source: AA+uWPzDcX/ON6btIdgXudOmdfhQwHLibC/2R5T4FnA8BA9fjmrO1BL1+hOLKc/p4PSMKXeKQu15Pw== X-Received: by 2002:a24:ad45:: with SMTP id a5-v6mr1579105itj.0.1533895539437; Fri, 10 Aug 2018 03:05:39 -0700 (PDT) Received: from localhost.localdomain (c-75-73-34-135.hsd1.mn.comcast.net. [75.73.34.135]) by smtp.gmail.com with ESMTPSA id g2-v6sm1540994iop.29.2018.08.10.03.05.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Aug 2018 03:05:38 -0700 (PDT) From: Adam Ford To: adam.ford@logicpd.com Date: Fri, 10 Aug 2018 05:05:22 -0500 Message-Id: <20180810100522.22430-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: David Lechner , Vitaly Andrianov , u-boot@lists.denx.de, Peter Howard Subject: [U-Boot] [PATCH] Convert CONFIG_SYS_I2C_DAVINCI to Kconfig 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" This converts the following to Kconfig: CONFIG_SYS_I2C_DAVINCI Signed-off-by: Adam Ford diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig index abb2295951..31e0529e40 100644 --- a/configs/da850_am18xxevm_defconfig +++ b/configs/da850_am18xxevm_defconfig @@ -38,6 +38,7 @@ CONFIG_DM=y CONFIG_DA8XX_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_MTD_DEVICE=y CONFIG_MTD_PARTITIONS=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 4242728e6a..ea56d01344 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -40,6 +40,7 @@ CONFIG_DM_GPIO=y CONFIG_DA8XX_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_MTD_DEVICE=y CONFIG_MTD_PARTITIONS=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index 9d6c47df50..b5f17c2575 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -38,6 +38,7 @@ CONFIG_DM=y CONFIG_DA8XX_GPIO=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_DAVINCI=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_DM_SPI_FLASH=y diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig index ace5fc51d4..76f2d97786 100644 --- a/configs/ea20_defconfig +++ b/configs/ea20_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DA8XX_GPIO=y +CONFIG_SYS_I2C_DAVINCI=y # CONFIG_MMC is not set CONFIG_NAND=y CONFIG_NAND_DAVINCI=y diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index c5bb84a8d6..0b9fcd2cd9 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -34,6 +34,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/k2e_hs_evm_defconfig b/configs/k2e_hs_evm_defconfig index a86eeb8b14..78b0060457 100644 --- a/configs/k2e_hs_evm_defconfig +++ b/configs/k2e_hs_evm_defconfig @@ -27,6 +27,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index 911618c17a..813483b40f 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -34,6 +34,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y # CONFIG_BLK is not set +CONFIG_SYS_I2C_DAVINCI=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index 174af79960..015eb54ec1 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -27,6 +27,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y # CONFIG_BLK is not set +CONFIG_SYS_I2C_DAVINCI=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index 942e44e7a9..ee24a558b7 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -34,6 +34,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/k2hk_hs_evm_defconfig b/configs/k2hk_hs_evm_defconfig index 12be37f0b7..4af27ed30f 100644 --- a/configs/k2hk_hs_evm_defconfig +++ b/configs/k2hk_hs_evm_defconfig @@ -27,6 +27,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 5381e9f7cc..4150af1d9c 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -34,6 +34,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/k2l_hs_evm_defconfig b/configs/k2l_hs_evm_defconfig index 0381a7240c..f9f38ee62f 100644 --- a/configs/k2l_hs_evm_defconfig +++ b/configs/k2l_hs_evm_defconfig @@ -26,6 +26,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y # CONFIG_MMC is not set CONFIG_NAND=y diff --git a/configs/legoev3_defconfig b/configs/legoev3_defconfig index 8ee2d223fd..c9a7eb6e10 100644 --- a/configs/legoev3_defconfig +++ b/configs/legoev3_defconfig @@ -22,6 +22,7 @@ CONFIG_CMD_SPI=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_DIAG=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 4a97269dd4..b16e9d3665 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -34,6 +34,7 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_DM_I2C=y CONFIG_DM_I2C_COMPAT=y +CONFIG_SYS_I2C_DAVINCI=y CONFIG_NAND=y CONFIG_NAND_DAVINCI=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 5eceab9ea8..27331259d3 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -96,6 +96,12 @@ config SYS_I2C_CADENCE Say yes here to select Cadence I2C Host Controller. This controller is e.g. used by Xilinx Zynq. +config SYS_I2C_DAVINCI + bool "Davinci I2C Controller" + depends on (ARCH_KEYSTONE || ARCH_DAVINCI) + help + Say yes here to add support for Davinci and Keystone I2C controller + config SYS_I2C_DW bool "Designware I2C Controller" default n diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 3dcd1390ca..00efe6164c 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -141,7 +141,6 @@ * I2C Configuration */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20 #endif diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 485866d694..f459ac4b2d 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -62,7 +62,6 @@ * I2C Configuration */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_DAVINCI_I2C_SPEED 100000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 7a0511f88e..d5ea1fa833 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -56,7 +56,6 @@ * I2C Configuration */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_DAVINCI_I2C_SPEED 400000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index a68c18f625..14b18ce623 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -133,7 +133,6 @@ /* * I2C Configuration */ -#define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_DAVINCI_I2C_SPEED 25000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */ #define CONFIG_SYS_I2C_EXPANDER_ADDR 0x20 diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 116bfaa4d9..1c68aaf437 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -143,7 +143,6 @@ #define CONFIG_AEMIF_CNTRL_BASE KS2_AEMIF_CNTRL_BASE /* I2C Configuration */ -#define CONFIG_SYS_I2C_DAVINCI #define CONFIG_SYS_DAVINCI_I2C_SPEED 100000 #define CONFIG_SYS_DAVINCI_I2C_SLAVE 0x10 /* SMBus host address */ #define CONFIG_SYS_DAVINCI_I2C_SPEED1 100000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0ec125160d..95d7ab0e7a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3071,7 +3071,6 @@ CONFIG_SYS_I2C_BASE4 CONFIG_SYS_I2C_BASE5 CONFIG_SYS_I2C_BUSES CONFIG_SYS_I2C_CLK_OFFSET -CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DVI_ADDR CONFIG_SYS_I2C_DVI_BUS_NUM