From patchwork Tue Feb 5 09:55:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1036582 X-Patchwork-Delegate: monstr@monstr.eu 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=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="Wq5Zw+mC"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43v0NB4nQpz9sMl for ; Tue, 5 Feb 2019 20:56:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 41364C21F69; Tue, 5 Feb 2019 09:56:10 +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=RCVD_IN_DNSWL_BLOCKED, 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 4F256C21F4A; Tue, 5 Feb 2019 09:55:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B96C9C21EE4; Tue, 5 Feb 2019 09:55:52 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 8FFE5C21EC3 for ; Tue, 5 Feb 2019 09:55:51 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id p6so2896151wmc.1 for ; Tue, 05 Feb 2019 01:55:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=3cRFtfALa87+iUWtDqqtIvqadC17OlhSuzJRMSxFHjk=; b=Wq5Zw+mCB2Hvqo1wmj9IlTYSawbDIy3dDPeF+197rucgnzYhfLTEv1fwC+KsOtEE0D vrywriLQRPdjaSmxEKfBSUbA8Xm3fz30R4ntJRYAhy5Aaz5aJK8UptMXKlV7OpVdwN7S 1/RLX46/oRucanrkIt1QA5hMK0jyYxe2M55j/0qon8xvz3mD4hN/MgeQTksH52pyVD9t 13kzIhxD5siG+nnsieguImT+ahR3SpCVRozSB+CK7RudTvCKh29/iB6qImCQ0xKJCToy 60ZjC+RMArb+yTp6QH2HZZB2BLLwvgzTwwSMG5JYFsgbxaLHuoHn+JGBku9mdsxHZduH 5yZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references; bh=3cRFtfALa87+iUWtDqqtIvqadC17OlhSuzJRMSxFHjk=; b=bIngEJNw18dUAqCcg9+ZzIj0TOrbBc5I8AZt7Sk8eSHPT3Ik85VOmxE7kJGfzyQg8o nj46jnP/k6Q7qTRokCYjY4/9YIC3oy/TXzuUwle/bjBPQaTMMsd/mplU27CQypADMQu0 wFzdfXcMttg8MCtIHGTh6+jplWXvRtHKnIorZqxwXCttkb+63ZZp74pu9RvJoa5ExqmC zmn+xFNYm1HN3H8QZbTeDz7Q8s89cDYbxtypZRyUHDBs+9IPBAZu2mItLgMnhRTUDAw+ hOWh5ZEKMc/Wltf/6XjtYv1umWCPbn63xrmy4DqW/khxy6HBMpH6qpVYqJfHAUELQWWb COGg== X-Gm-Message-State: AHQUAubtEkDYAwqcESTPALmsDKF7Vzj/hz2tCzDaGwgAIRk7Ea/nZvs/ FUMdzyWHEcgXBzcsFOprzFcn8mpVZt0iVg== X-Google-Smtp-Source: AHgI3IYE9uRVw3Qx6datqmpAn2By2Bt/vHBh/I4d2kpb0eeI4KfkeZfLpeJdWPOxrASxWyb7hsSZpA== X-Received: by 2002:a1c:f50a:: with SMTP id t10mr3060409wmh.126.1549360550919; Tue, 05 Feb 2019 01:55:50 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id w16sm28157258wrp.1.2019.02.05.01.55.50 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 05 Feb 2019 01:55:50 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Tue, 5 Feb 2019 10:55:39 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [U-Boot] [PATCH v2 2/7] ARM: zynq: Convert dlc20 and zc70x board to DM_I2C 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" All these board have also eeprom enabled that's why it is also enabled via defconfig. There is also no need to have zc70x specific config file that's why also remove it. Signed-off-by: Michal Simek Reviewed-by: Heiko Schocher --- Changes in v2: None configs/zynq_dlc20_rev1_0_defconfig | 9 ++++++--- configs/zynq_zc702_defconfig | 10 ++++++---- configs/zynq_zc706_defconfig | 10 ++++++---- include/configs/zynq-common.h | 14 -------------- include/configs/zynq_zc70x.h | 16 ---------------- 5 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 include/configs/zynq_zc70x.h diff --git a/configs/zynq_dlc20_rev1_0_defconfig b/configs/zynq_dlc20_rev1_0_defconfig index 65850b3c31f7..07101e53a67b 100644 --- a/configs/zynq_dlc20_rev1_0_defconfig +++ b/configs/zynq_dlc20_rev1_0_defconfig @@ -18,7 +18,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_PROMPT="Zynq> " CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_EEPROM=y CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_FPGA_LOADBP=y @@ -43,8 +42,12 @@ CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C0=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_SYS_I2C_EEPROM_ADDR=0x0 +CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0 CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 6bdf352fa885..c713e8f353c6 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -1,5 +1,4 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_zc70x" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SPL=y @@ -18,7 +17,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_PROMPT="Zynq> " CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set @@ -44,10 +42,14 @@ CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C0=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y CONFIG_LED=y CONFIG_LED_GPIO=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_SYS_I2C_EEPROM_ADDR=0x0 +CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0 CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 5536af8cf425..b8fc657a80c2 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -1,5 +1,4 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_zc70x" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SPL=y @@ -21,7 +20,6 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_PROMPT="Zynq> " CONFIG_CMD_THOR_DOWNLOAD=y -CONFIG_CMD_EEPROM=y CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_FPGA_LOADBP=y @@ -46,8 +44,12 @@ CONFIG_DFU_RAM=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C0=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_SYS_I2C_EEPROM_ADDR=0x0 +CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0 CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 3d6dbf6ea82b..a285fcdece73 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -102,20 +102,6 @@ # define DFU_ALT_INFO #endif -/* I2C */ -#if defined(CONFIG_SYS_I2C_ZYNQ) -# define CONFIG_SYS_I2C -#endif - -/* EEPROM */ -#ifdef CONFIG_ZYNQ_EEPROM -# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -# define CONFIG_SYS_I2C_EEPROM_ADDR 0x54 -# define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 4 -# define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 -# define CONFIG_SYS_EEPROM_SIZE 1024 /* Bytes */ -#endif - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h deleted file mode 100644 index b5a28dab878f..000000000000 --- a/include/configs/zynq_zc70x.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2013 Xilinx, Inc. - * - * Configuration settings for the Xilinx Zynq ZC702 and ZC706 boards - * See zynq-common.h for Zynq common configs - */ - -#ifndef __CONFIG_ZYNQ_ZC70X_H -#define __CONFIG_ZYNQ_ZC70X_H - -#define CONFIG_ZYNQ_EEPROM - -#include - -#endif /* __CONFIG_ZYNQ_ZC70X_H */