From patchwork Tue Jan 22 13:51:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1029301 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="qyq4fq77"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43kVGH1tqYz9s1l for ; Wed, 23 Jan 2019 00:52:02 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C7118C21DA6; Tue, 22 Jan 2019 13:51:57 +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=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 D2D7BC21C2F; Tue, 22 Jan 2019 13:51:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 12455C21C27; Tue, 22 Jan 2019 13:51:55 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id 3EDE8C21BE5 for ; Tue, 22 Jan 2019 13:51:54 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id v13so27443848wrw.5 for ; Tue, 22 Jan 2019 05:51:54 -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; bh=G4barGXekX1xLoPHBNQZc7AlBqWrBErZfPGpy1PmtoU=; b=qyq4fq77jLA4f65zlcuTz3XiHWFBmYjeb9ljDexvdsGDCeMJyZqHHqeAq+cQiRRbc3 G2kkfMsMRM29ZRYSoEE7+HyFcPV4vD2MMF6Z/nwt/BhRBWDYBXpVehYD+JCGhMnK/uLd xHTetgfrXAPsfrwY1a/m94O7sPprrMM58kpFz2N8slJQEkfnibdXKIJtI29qyq5lMeme WF0PCJOJKwrjz4xQNHpNmb8+Hqifw2HJu2lNRjwFfOYE/X7JN4tuRMhnWrYII8ZzPHCX Q3pOkHx0Hh6EolhEysRcGcq+qp+Y0DZZIgqM8E99tiv8yhCKtfOKZ9TvFlbDtrRc5CXs 7wgQ== 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; bh=G4barGXekX1xLoPHBNQZc7AlBqWrBErZfPGpy1PmtoU=; b=Tx5MbM0u5LyWI6dKuFGl9pZTM6HM2FDxsdsjyY91U2rs4Do9QyM9n0CCiOX+5IyKju 0ucD8sG/pzGrhIajEcEtIDgz2Bf6SlZ+Qm9loc5QYzm3dtHPlmb3IrF7ddxQyJ/AT5TO T7lMHm0Fus9ltgTbhtWXvTvNdFM/m8cUtM4/zmFM48dtKZOu97qOJq41zgFqWc/ttbxX BRpsXH3NAFZNJmK22OAy5rM+EbO9JomxUrCmvzYTsBnJPwD9gz901eMRKvkkLu4ppYtJ /k3Iq9NUsmYJGN+h5cSM9tYq3ggoVh+HRqXOpNxd4lcZahOVeHci8KPQZOq1xBV3Xp2z 5ikQ== X-Gm-Message-State: AJcUukef5ibzmK77+nCQY/eIgvAWAcgDiqtAT06IfSFT4a2EsdNtFfht J3kQvCfkV1ddA9RqyH3xEAWY8/ulupQDPA== X-Google-Smtp-Source: ALg8bN7/VA0v1My49JdccuayndBv/fbUJyBCOjw/8mWVzZOCaN5oR6X2tEEiyh1fqrRueu2kXoob9g== X-Received: by 2002:adf:ee07:: with SMTP id y7mr34132363wrn.187.1548165113345; Tue, 22 Jan 2019 05:51:53 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id q3sm105361214wrn.84.2019.01.22.05.51.52 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 22 Jan 2019 05:51:52 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Tue, 22 Jan 2019 14:51:49 +0100 Message-Id: <9ce2267083f41472415fcf70f7f0bd1283c99cfc.1548165109.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH 1/3] ARM: zynq: Disable i2c for Zybo/Zybo Z7 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" There is no i2c connected in base DT that's why disable I2C commands. Also remove zynq_zybo which is not needed now. Signed-off-by: Michal Simek --- configs/zynq_zybo_defconfig | 6 ------ configs/zynq_zybo_z7_defconfig | 4 ---- include/configs/zynq_zybo.h | 18 ------------------ 3 files changed, 28 deletions(-) delete mode 100644 include/configs/zynq_zybo.h diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index 46b63003b315..9e44e82549f7 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -1,5 +1,4 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_zybo" 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_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_FPGA_LOADBP=y @@ -26,7 +24,6 @@ CONFIG_CMD_FPGA_LOADFS=y CONFIG_CMD_FPGA_LOADMK=y CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y @@ -43,9 +40,6 @@ 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_ZYNQ_I2C1=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y diff --git a/configs/zynq_zybo_z7_defconfig b/configs/zynq_zybo_z7_defconfig index 7985ad6c6363..d729ca340c36 100644 --- a/configs/zynq_zybo_z7_defconfig +++ b/configs/zynq_zybo_z7_defconfig @@ -24,7 +24,6 @@ CONFIG_CMD_FPGA_LOADFS=y CONFIG_CMD_FPGA_LOADMK=y CONFIG_CMD_FPGA_LOADP=y CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y @@ -41,9 +40,6 @@ 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_ZYNQ_I2C1=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h deleted file mode 100644 index 7d00b412a7e5..000000000000 --- a/include/configs/zynq_zybo.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2012 Xilinx - * (C) Copyright 2014 Digilent Inc. - * - * Configuration for Zynq Development Board - ZYBO - * See zynq-common.h for Zynq common configs - */ - -#ifndef __CONFIG_ZYNQ_ZYBO_H -#define __CONFIG_ZYNQ_ZYBO_H - -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_ZYNQ_GEM_EEPROM_ADDR 0x50 - -#include - -#endif /* __CONFIG_ZYNQ_ZYBO_H */ From patchwork Tue Jan 22 13:51:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1029302 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="DXxj6b3+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43kVGj0llPz9s2P for ; Wed, 23 Jan 2019 00:52:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C863FC21E4E; Tue, 22 Jan 2019 13:52:09 +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_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 432C3C21C2F; Tue, 22 Jan 2019 13:51:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2032DC21BE5; Tue, 22 Jan 2019 13:51:55 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id AC5CBC21BE5 for ; Tue, 22 Jan 2019 13:51:55 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id t6so27381473wrr.12 for ; Tue, 22 Jan 2019 05:51:55 -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=WzSSZj2Zd5jg0NpBT54YyCDpud+Zsw3gVeiAG7qLHoI=; b=DXxj6b3+XlbCnfHYqbmpBMAE1WOUlyzcVVvYrqbx5T2KdWj/tpiRqbVyafGflzR4R6 r/aa/9WEWrnNUcE+Joj+5cchIq6iPC6tmcimp4PQRjUQKxZu9AhCUP1CY08f+ijt+PYI K71fSuqRDp0+o3LDDG3AZsxaIGo+oOftDDylDu5ZWJ7og8dwAkCrVYlx2J8ru8UrM1D6 t2m92DHW+O3s8jBMppFRXb4uzcoT1m5WDG4ifk8+AZgqSPNCHoBa0xL5wxCdy5ytLkRc JvXmGu3S6898LqAPfsgXzedIy12D3216o/eLRoFvi/Pnr2AwUaFBerv9R+YVFAi2VxWL oOjQ== 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=WzSSZj2Zd5jg0NpBT54YyCDpud+Zsw3gVeiAG7qLHoI=; b=Fd9Hr4sBKo1gdGzlRCtBTvsePJU3mL5/wWLQj6qykwQteRJtKy8UBPFHDEUIBDReUG 3vGNtNGO45LFtHbkCkF6YutMCFaiuchJEMpUGggXCJd1f5t++S14i7P3WPRXTuImEufD EsTE8dc14Ov1qElOzYO0C+CkizRm9sP1hC/cVqFfQfLInvwQyhOEMPPN9Ofcylp7QQ+y gWbnytwtg4YYae4sP8slhJFVtPlfU4zxSrR3emHlPsYU9BgmtDkgClSbIuydU8zd/eOS X6CN8WwpNOuXHnLve9h9LxGPgKnBQqlMIT+SZpaAJy3+Ij/R3lEHwqSEmyufVTVaJ0mK I0dw== X-Gm-Message-State: AJcUukcMcLMNwyu64sPBT7fsBFNIOnKAiDw8zBgBfOH3axZ93Z2JmIH/ JPjOoiApA5f8kJonxlnJarO1wDGBETN/sg== X-Google-Smtp-Source: ALg8bN7cEUHgDFSurJbvuMgyP7rFEVN12C/ULZAmCZZD8Z6Qcx6T1JsuZhNlc/pL7Tmu3t5ZHYqc3w== X-Received: by 2002:adf:ea11:: with SMTP id q17mr31803569wrm.328.1548165115021; Tue, 22 Jan 2019 05:51:55 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id o5sm36505473wrw.46.2019.01.22.05.51.54 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 22 Jan 2019 05:51:54 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Tue, 22 Jan 2019 14:51:50 +0100 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: <9ce2267083f41472415fcf70f7f0bd1283c99cfc.1548165109.git.michal.simek@xilinx.com> References: <9ce2267083f41472415fcf70f7f0bd1283c99cfc.1548165109.git.michal.simek@xilinx.com> In-Reply-To: <9ce2267083f41472415fcf70f7f0bd1283c99cfc.1548165109.git.michal.simek@xilinx.com> References: <9ce2267083f41472415fcf70f7f0bd1283c99cfc.1548165109.git.michal.simek@xilinx.com> Cc: Tom McLeod Subject: [U-Boot] [PATCH 2/3] ARM: zynq: Convert Syzygy and Topic Miami 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" Both boards have only controllers enabled that's why move to DM_I2C is easy. Add also i2c alias for Syzygy not to be shown as i2c bus -1 because alias doesn't exist. Signed-off-by: Michal Simek --- arch/arm/dts/zynq-syzygy-hub.dts | 1 + configs/syzygy_hub_defconfig | 5 ++--- configs/topic_miami_defconfig | 5 ++--- configs/topic_miamilite_defconfig | 5 ++--- configs/topic_miamiplus_defconfig | 5 ++--- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/arch/arm/dts/zynq-syzygy-hub.dts b/arch/arm/dts/zynq-syzygy-hub.dts index a30d667146d1..0f25cbe60923 100644 --- a/arch/arm/dts/zynq-syzygy-hub.dts +++ b/arch/arm/dts/zynq-syzygy-hub.dts @@ -16,6 +16,7 @@ ethernet0 = &gem0; serial0 = &uart0; mmc0 = &sdhci0; + i2c0 = &i2c1; }; memory@0 { diff --git a/configs/syzygy_hub_defconfig b/configs/syzygy_hub_defconfig index 75139d93b346..793156520021 100644 --- a/configs/syzygy_hub_defconfig +++ b/configs/syzygy_hub_defconfig @@ -17,7 +17,6 @@ CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd" CONFIG_SPL_STACK_R=y CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="Zynq> " -CONFIG_CMD_EEPROM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_FPGA_LOADBP=y CONFIG_CMD_FPGA_LOADFS=y @@ -36,8 +35,8 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_FPGA_XILINX=y CONFIG_FPGA_ZYNQPL=y CONFIG_DM_GPIO=y -CONFIG_SYS_I2C_ZYNQ=y -CONFIG_ZYNQ_I2C1=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xFA CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index 70d07ac041ae..927ce9ad2848 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -34,9 +34,8 @@ 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_ZYNQ_I2C1=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index 387f4cae0865..e4d52f6a915e 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -34,9 +34,8 @@ 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_ZYNQ_I2C1=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig index d820fff501d1..f742838d7c1f 100644 --- a/configs/topic_miamiplus_defconfig +++ b/configs/topic_miamiplus_defconfig @@ -33,9 +33,8 @@ 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_ZYNQ_I2C1=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CADENCE=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ZYNQ=y CONFIG_SPI_FLASH=y From patchwork Tue Jan 22 13:51:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1029303 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="iClmSSjQ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43kVHN0vVHz9s2P for ; Wed, 23 Jan 2019 00:53:04 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C8B94C21CB6; Tue, 22 Jan 2019 13:52:22 +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=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 D1600C21D72; Tue, 22 Jan 2019 13:52:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 26A41C21DF8; Tue, 22 Jan 2019 13:52:00 +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 7F4BFC21DD4 for ; Tue, 22 Jan 2019 13:51:57 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id m22so14366504wml.3 for ; Tue, 22 Jan 2019 05:51:57 -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=/93U29QZkp6HYJlVwJibuRq0WTxEonH8vZlyGgmyHrc=; b=iClmSSjQN2fxsPflwvOsAD1AMrW7UiwbY2uezUYD/ri8P9mVkVPRfKVXBYKfHBxIzA tzkw2rjKKQcowJLRN648fM7AuQyjHBbOumLo5Dxqg9jzWgQmOUXFFC0NkMerhkTR1imz WK9bejTr02K8cdTU+cgXmV2WZIYiCH0eWnP74eI5SPppqtdMxzRBlcybJEb7EyjWmBf1 p7hK9DgbdSZZ7KAB4QwurEh5koIbf9TzgMCjHrAz4f6hVNctHOf7E/72uRtTy7aT/mgv p3sYviUp6Ns+R5MBZZo2uM2kavUBiNcmVk6vwmd7aQMfAxszOU7dQ1SLukoVYMR0AQsr WHlw== 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=/93U29QZkp6HYJlVwJibuRq0WTxEonH8vZlyGgmyHrc=; b=AEDANxabdGkm9W6YcpDUYrynEW/8E1cMbRmeV/cSPeOcF5c6BYMsMA4wwTaU5BLx8Z 15yFPZQyhGhlaYPp9qMeTSKELDWdeqs9CM/JbteUBDJkeU4xET4dCobEFl6jVQqLJX0Q gR5zk3KKYcVB1yhMUmQY392R9NfJfDoGm2Awrzy2jUkh1hnGoMCfxTVCXBVNWFB7lXHu P1i039zCiMhZIP5vun8pB1fBTJcS+I8XJghgOao0Btwxpq79u/ebUrLXJf2OT7oBPhu2 pWnaQhX1WSsPNZiwlSSmwWhYCmT6vUt6Qcs9fZ+KY3IfzxUCBAqn5KsxRxIg3ExtGCcf L8sA== X-Gm-Message-State: AJcUukdgVuSVnyI1s9TVYIjNghcCe7i/17iR6zCfRdt3TX5DzZY7hfW1 0WE32vD5XuO7WKBhcCRGy2J0D7c3QYO51w== X-Google-Smtp-Source: ALg8bN45LrU1NQ4gTjovTJzr1fWhqnbtZrzjT6F9s2OWMPl25XAFJ6etwppSQ4SWFP9mJPizKgCl2Q== X-Received: by 2002:a1c:c90b:: with SMTP id f11mr3813878wmb.33.1548165116708; Tue, 22 Jan 2019 05:51:56 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id c21sm62573895wre.71.2019.01.22.05.51.55 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 22 Jan 2019 05:51:56 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Tue, 22 Jan 2019 14:51:51 +0100 Message-Id: <24941d97a2a6c3ad3ff792b95bf4be003970444f.1548165109.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <9ce2267083f41472415fcf70f7f0bd1283c99cfc.1548165109.git.michal.simek@xilinx.com> References: <9ce2267083f41472415fcf70f7f0bd1283c99cfc.1548165109.git.michal.simek@xilinx.com> In-Reply-To: <9ce2267083f41472415fcf70f7f0bd1283c99cfc.1548165109.git.michal.simek@xilinx.com> References: <9ce2267083f41472415fcf70f7f0bd1283c99cfc.1548165109.git.michal.simek@xilinx.com> Subject: [U-Boot] [PATCH 3/3] 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 --- 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 7ead19208f4f..489d54773c8a 100644 --- a/configs/zynq_dlc20_rev1_0_defconfig +++ b/configs/zynq_dlc20_rev1_0_defconfig @@ -19,7 +19,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 @@ -44,8 +43,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 9734f24fdfed..d6c602b73b6e 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 @@ -19,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_MEMTEST=y CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set @@ -45,10 +43,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 4a03351d1ee2..4f14636b912d 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 @@ -22,7 +21,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 @@ -47,8 +45,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 1710feda9185..884f3cf01c8e 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 */