From patchwork Tue Apr 9 18:52:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1082624 X-Patchwork-Delegate: marek.vasut@gmail.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="QH5WmJKW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44dxJv0dnTz9sSQ for ; Wed, 10 Apr 2019 04:53:51 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BB716C21E13; Tue, 9 Apr 2019 18:53:24 +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_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 5261CC21E07; Tue, 9 Apr 2019 18:53:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EA6B5C21DA2; Tue, 9 Apr 2019 18:53:08 +0000 (UTC) Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by lists.denx.de (Postfix) with ESMTPS id 9F920C21C4A for ; Tue, 9 Apr 2019 18:53:08 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id o26so2605822edv.12 for ; Tue, 09 Apr 2019 11:53:08 -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:in-reply-to:references; bh=oz8znVv34zhl8QUCgrOK32RvRfJo0KH9OIo7Mnt1eDQ=; b=QH5WmJKWe1UkjzE41xLf3lKHeKHG7x9/6EYRr6xJDFGKNfCrlXm4O/0nZ0R6t9RrAe QEmzGPzvkqD2pHVJ59lWGf0wlUql6t85QtCzwT+9PjOMerjBfCOUPymWyfp00ricQOeS ORPA3vcoVPigs2kCIU2GSH7HurQ5u7f+Y/zdcWQORHer9v+ukQaUSb5qctxiSucUyVHR ltOYo6tuLHj7n8P5gdulBaXfCGBWus7x/4K+4BYQ1qtL7SReSR0Nx1dSqGqMWqqCv1EF s9WdD2CvUTgl0HF+OIIpDItBwx1P8u+urpZqkgrtl76tYJMJeUXWSCj44jma1tMk3x6S 3T7g== 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:in-reply-to :references; bh=oz8znVv34zhl8QUCgrOK32RvRfJo0KH9OIo7Mnt1eDQ=; b=Os3lTaHiwpC50jhiUPy7ru6K76FDPdeH1iwYvsXvo1Dy6Hz42GDRq+W1bPiAaIvoLk jF0QYZfaFpLqjEm0WeDybak3elWrq15coEAFaNg7FIsN60iAV+NIm1jzmkNWZ7JLvuew pltEchs8JDBM28RjYRBV0lvrzz72D6RQbMfcS3WnRKDNOjYI0dpk08hAWDuM9Ra7aUoa DjuW3o8irrkF8j+KtoNQd+pO0QVGaQ1+jfSXrUmFSWpm3S3Jj1/5fOC43TJhFVn2b7rU kl7VE/AqOzOCFaFkSbNNFmty92eJJuK7jYLNOhsX9HViYBKZGTXwN+NE7BWUUnqZlAr+ oFrw== X-Gm-Message-State: APjAAAWC8rQQ6voRqjx1W4/OAgJEWsDcZEbvMjYf1Kh3rjhDFJOB8jVk KybrqAA8/tPmmeVgVj8f9No= X-Google-Smtp-Source: APXvYqyu3oPQ1ZFGwgm7Lf7robD0MqhCIhWZgIlKTYxte+OILh9fRCgUheI7PXroK6JadXIHoC5pWA== X-Received: by 2002:a17:906:b6c8:: with SMTP id ec8mr20912245ejb.89.1554835988352; Tue, 09 Apr 2019 11:53:08 -0700 (PDT) Received: from ubuntu.home (HSI-KBW-046-005-136-229.hsi8.kabel-badenwuerttemberg.de. [46.5.136.229]) by smtp.gmail.com with ESMTPSA id c4sm1544989edl.63.2019.04.09.11.53.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 11:53:07 -0700 (PDT) From: Simon Goldschmidt To: Marek Vasut , u-boot@lists.denx.de Date: Tue, 9 Apr 2019 20:52:56 +0200 Message-Id: <20190409185259.19052-2-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190409185259.19052-1-simon.k.r.goldschmidt@gmail.com> References: <20190409185259.19052-1-simon.k.r.goldschmidt@gmail.com> Cc: Tien Fong Chee , Tom Rini , Joe Hershberger , Stefan Roese Subject: [U-Boot] [PATCH v2 1/4] arm: socfpga: move vining_fpga 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 socfpga boards except for vining_fpga use DM_I2C. Enable DM_I2C for this board and set the EEPROM defines via Kconfig (enabling CONFIG_I2C_EEPROM from MISC). Signed-off-by: Simon Goldschmidt --- Changes in v2: - added (this) patch to move socfpga_vining to DM_I2C configs/socfpga_vining_fpga_defconfig | 8 +++++++- include/configs/socfpga_common.h | 26 -------------------------- include/configs/socfpga_vining_fpga.h | 9 --------- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig index 7b47b111b7..4a7f775337 100644 --- a/configs/socfpga_vining_fpga_defconfig +++ b/configs/socfpga_vining_fpga_defconfig @@ -16,8 +16,8 @@ CONFIG_VERSION_VARIABLE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_SPI_LOAD=y CONFIG_CMD_ASKENV=y -CONFIG_CMD_GREPENV=y CONFIG_CMD_EEPROM=y +CONFIG_CMD_GREPENV=y CONFIG_CMD_DFU=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y @@ -44,6 +44,7 @@ CONFIG_DFU_RAM=y CONFIG_DFU_SF=y CONFIG_DM_GPIO=y CONFIG_DWAPB_GPIO=y +CONFIG_DM_I2C=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y @@ -55,6 +56,11 @@ CONFIG_LED_STATUS_BIT2=54 CONFIG_LED_STATUS3=y CONFIG_LED_STATUS_BIT3=65 CONFIG_LED_STATUS_CMD=y +CONFIG_MISC=y +CONFIG_I2C_EEPROM=y +CONFIG_SYS_I2C_EEPROM_ADDR=0x50 +CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=3 +CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=70 CONFIG_DM_MMC=y CONFIG_MMC_DW=y CONFIG_MTD_DEVICE=y diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index a501b5209f..a65fc804e3 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -149,32 +149,6 @@ #define CONFIG_SYS_NAND_DATA_BASE SOCFPGA_NANDDATA_ADDRESS #endif -/* - * I2C support - */ -#ifndef CONFIG_DM_I2C -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_BASE SOCFPGA_I2C0_ADDRESS -#define CONFIG_SYS_I2C_BASE1 SOCFPGA_I2C1_ADDRESS -#define CONFIG_SYS_I2C_BASE2 SOCFPGA_I2C2_ADDRESS -#define CONFIG_SYS_I2C_BASE3 SOCFPGA_I2C3_ADDRESS -/* Using standard mode which the speed up to 100Kb/s */ -#define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_SYS_I2C_SPEED1 100000 -#define CONFIG_SYS_I2C_SPEED2 100000 -#define CONFIG_SYS_I2C_SPEED3 100000 -/* Address of device when used as slave */ -#define CONFIG_SYS_I2C_SLAVE 0x02 -#define CONFIG_SYS_I2C_SLAVE1 0x02 -#define CONFIG_SYS_I2C_SLAVE2 0x02 -#define CONFIG_SYS_I2C_SLAVE3 0x02 -#ifndef __ASSEMBLY__ -/* Clock supplied to I2C controller in unit of MHz */ -unsigned int cm_get_l4_sp_clk_hz(void); -#define IC_CLK (cm_get_l4_sp_clk_hz() / 1000000) -#endif -#endif /* CONFIG_DM_I2C */ - /* * QSPI support */ diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 5517ed722d..0e547a1295 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -16,15 +16,6 @@ #define CONFIG_LOADADDR 0x01000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* I2C EEPROM */ -#ifdef CONFIG_CMD_EEPROM -#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 -#define CONFIG_SYS_I2C_EEPROM_BUS 0 -#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 -#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 70 -#endif - /* * Status LEDs: * 0 ... Top Green