From patchwork Sun Apr 23 15:35:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 753938 X-Patchwork-Delegate: hs@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3w9txN2rz1z9s03 for ; Mon, 24 Apr 2017 01:41:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="aKEiTRK6"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 04564C21C6E; Sun, 23 Apr 2017 15:39:43 +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_NONE, 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 AAEC3C21C6E; Sun, 23 Apr 2017 15:36:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CAC30C21C80; Sun, 23 Apr 2017 15:35:49 +0000 (UTC) Received: from mail-io0-f170.google.com (mail-io0-f170.google.com [209.85.223.170]) by lists.denx.de (Postfix) with ESMTPS id 1B7F6C21C6B for ; Sun, 23 Apr 2017 15:35:44 +0000 (UTC) Received: by mail-io0-f170.google.com with SMTP id r16so153168698ioi.2 for ; Sun, 23 Apr 2017 08:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=xPL+MhWg4ri2ZmLL9RJbY/SdoVJxMhSSbE0FBlVotm8=; b=aKEiTRK6zVsu+ZDp6HuOPbyw+ZE112beIirAnavUm/EIpZY5hETfsUoBeB5b4hDSkK lpr3v9VR2KJ9iUTDUeTSs4CEnlMrNtFwaMj4m4Ojcfc7r1caBSLF0sauy14lYdUb/Vll mWYJgnzUAN/20u36etPrGi1OzG3ftwno5C1bpkxbd6ASD5Hjw6aIRKQ/bZCFtp7YntiW iTOIBudUxZxFOZxPY9wXSRzn+XXAy7LQwOsiAvv59O8VDBMvfJkq8pIrMjJ7qf8BaPbN IpcyNveGidb7rhWJuOKYWt1JnjFkA1JWSxPxXPSn3wnjdMjvZRyxkE7VmJLscOjQ9qmO BFZw== 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; bh=xPL+MhWg4ri2ZmLL9RJbY/SdoVJxMhSSbE0FBlVotm8=; b=J+jLdWMNuKRNliEfnUodN+DoFsH9Cwee+e150xNV8LLEPdNOSPlPjVVJYwN9LKhVhg ges/0V1//vVOKovAfFPOBva/4rV/1Y2uc5jVALfuNnyXGL0lfzS2mfbESnSjBcflOJIm tkpI+1oqP8xZFHTBhhI/z6jQvSD4L2qGb8cOHnspUd6EuQZJt1Iif4ha2/El3U6jNJfx HgbQqjab/5Ci5B9T8zwVQcqqpe8bPOiJ5y4S7Qrl5jOWan9KJC79iXKIsLqMucc63Tok 4NPlBtXB0QJf0JztkDZ8wKf1jkGBaoGETwWiDOjHst2l23CIVHkwyTZevSIEvfChyEYP g7lA== X-Gm-Message-State: AN3rC/68bmM0C5KV/2E3OAZd2/omTCsVpsgJI2UIKMO7y0dPjD+8oebV MfyTvOB6UAZQhsNz X-Received: by 10.202.212.151 with SMTP id l145mr12911472oig.88.1492961742789; Sun, 23 Apr 2017 08:35:42 -0700 (PDT) Received: from kaki.bld.corp.google.com ([100.100.184.96]) by smtp.gmail.com with ESMTPSA id g39sm6949645otb.16.2017.04.23.08.35.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Apr 2017 08:35:42 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 7E59F40081; Sun, 23 Apr 2017 09:35:41 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 23 Apr 2017 09:35:23 -0600 Message-Id: <20170423153525.14882-10-sjg@chromium.org> X-Mailer: git-send-email 2.12.2.816.g2cccc81164-goog In-Reply-To: <20170423153525.14882-1-sjg@chromium.org> References: <20170423153525.14882-1-sjg@chromium.org> Cc: Marek Vasut , Tom Rini , Jagan Teki Subject: [U-Boot] [PATCH 09/11] i2c: Drop CONFIG_SYS_I2C_BOARD_LATE_INIT 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 option is not used by any boards. Drop it. Signed-off-by: Simon Glass Reviewed-by: Heiko Schocher --- README | 11 ----------- drivers/i2c/fsl_i2c.c | 9 --------- drivers/i2c/fti2c010.c | 9 --------- include/i2c.h | 3 --- scripts/config_whitelist.txt | 1 - 5 files changed, 33 deletions(-) diff --git a/README b/README index f75dc0f2f6..aee17cb35d 100644 --- a/README +++ b/README @@ -2333,17 +2333,6 @@ The following options need to be configured: custom i2c_init_board() routine in boards/xxx/board.c is run early in the boot sequence. - CONFIG_SYS_I2C_BOARD_LATE_INIT - - An alternative to CONFIG_SYS_I2C_INIT_BOARD. If this option is - defined a custom i2c_board_late_init() routine in - boards/xxx/board.c is run AFTER the operations in i2c_init() - is completed. This callpoint can be used to unreset i2c bus - using CPU i2c controller register accesses for CPUs whose i2c - controller provide such a method. It is called at the end of - i2c_init() to allow i2c_init operations to setup the i2c bus - controller on the CPU (e.g. setting bus speed & slave address). - CONFIG_I2CFAST (PPC405GP|PPC405EP only) This option enables configuration of bi_iic_fast[] flags diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index a1406baa87..ff3dc25927 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -284,15 +284,6 @@ static void __i2c_init(const struct fsl_i2c_base *base, int speed, int break; } - -#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT - /* Call board specific i2c bus reset routine AFTER the bus has been - * initialized. Use either this callpoint or i2c_init_board; - * which is called before i2c_init operations. - * For details about this problem see doc/I2C_Edge_Conditions. - */ - i2c_board_late_init(); -#endif } static int diff --git a/drivers/i2c/fti2c010.c b/drivers/i2c/fti2c010.c index b35d0d2d9c..4da959fa53 100644 --- a/drivers/i2c/fti2c010.c +++ b/drivers/i2c/fti2c010.c @@ -146,15 +146,6 @@ static void fti2c010_init(struct i2c_adapter *adap, int speed, int slaveaddr) set_i2c_bus_speed(chip, speed); /* slave init, don't care */ - -#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT - /* Call board specific i2c bus reset routine AFTER the bus has been - * initialized. Use either this callpoint or i2c_init_board; - * which is called before fti2c010_init operations. - * For details about this problem see doc/I2C_Edge_Conditions. - */ - i2c_board_late_init(); -#endif } /* diff --git a/include/i2c.h b/include/i2c.h index cd7f61e1c1..a88cc7cddf 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -706,9 +706,6 @@ void i2c_early_init_f(void); #endif void i2c_init(int speed, int slaveaddr); void i2c_init_board(void); -#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT -void i2c_board_late_init(void); -#endif #ifdef CONFIG_SYS_I2C /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d18497c448..837c75f500 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4358,7 +4358,6 @@ CONFIG_SYS_I2C_BASE2 CONFIG_SYS_I2C_BASE3 CONFIG_SYS_I2C_BASE4 CONFIG_SYS_I2C_BASE5 -CONFIG_SYS_I2C_BOARD_LATE_INIT CONFIG_SYS_I2C_BOOT_EEPROM_ADDR CONFIG_SYS_I2C_BUSES CONFIG_SYS_I2C_BUS_MAX