From patchwork Fri Dec 1 05:39:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 843359 X-Patchwork-Delegate: hs@denx.de 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nigauri-org.20150623.gappssmtp.com header.i=@nigauri-org.20150623.gappssmtp.com header.b="Zlvd3QV9"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yp35B2HGbz9t3v for ; Fri, 1 Dec 2017 16:40:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 311A1C21F03; Fri, 1 Dec 2017 05:40:02 +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, 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 806FFC21E01; Fri, 1 Dec 2017 05:40:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 24704C21D6A; Fri, 1 Dec 2017 05:39:58 +0000 (UTC) Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by lists.denx.de (Postfix) with ESMTPS id B1AE3C21E01 for ; Fri, 1 Dec 2017 05:39:56 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id f12so4049333pgo.5 for ; Thu, 30 Nov 2017 21:39:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nigauri-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Wwq4oq2LUGa+OJv/ml6ceEo4n7ytVCvOH8iW+WkvM9c=; b=Zlvd3QV9qRJJO4FT/ZqpxWnmaxi640L1fl/59owinsvwWrVYrObJBb65IszOym82Cd iOqmr0bm7jUMU4SA7u1ql5M7Htro8mStnfRteAhDNt8l2yn2CEf4b0ZQ92apQkKcV6r1 mNI/pGDUGGf3+QirGbM2eyKm6e+QXFKcAGpzWiIZkx7Ixr9XTw7LLapPCfVie9ReNaO9 ryZ4M3NCslFk4xlrXmD6mHsmGVh0gSFsEujATh2ziHVQTAhQaAVWa939SBSwz9iecmBk zCmOwGmJtdsjQXa6XwgYS+TUwUz0lnxetPUXBtVR6Un7VevZQZzGKzLZ0C1iLo2hkWLm a+7g== 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=Wwq4oq2LUGa+OJv/ml6ceEo4n7ytVCvOH8iW+WkvM9c=; b=hro4NrO8GkFI9nALuUM3nrA5WGhAMfyGHILAn7XijpbUiSqHcWg7vKSdt+yZ022KW1 Zk4SwizYiKkDCAmZel9ClZUm/eUOXjm80qLgvawVB53yqU9uQdvDWXkrHfMqMF6Tz77C jzW2O3zRFytNlPU9Qn/xzc25kvA5PoVNcY/rOcDRqHcCDDkoEPtOr2ZW6m206zFPwEVX dHo9vsquu+6NdON//nlQxdRv+8xJkXTgF00zCfcew/LN647BtvKCKg7z7kWUZeyiB9CP obllFn8V3h/5yCvkqa/iHbkGqutGR8SddmwuTPFpQdgnsWn8H61Phv0QtssrJphBEejz GghA== X-Gm-Message-State: AJaThX6otWWJxyUpIp/+Eoo3gi9pysU6AgISGehZ2zo/26VRwbXCxBDN sEaSctVynxzsP8tGXm3XiWZ54lE= X-Google-Smtp-Source: AGs4zMblH0mU1YjaAarQWk0238FzHXr2peWM/VEm2pISOs7g6S5n9P33EwyqbL0BqiCIstjlYaAmOQ== X-Received: by 10.99.108.67 with SMTP id h64mr4781177pgc.119.1512106794998; Thu, 30 Nov 2017 21:39:54 -0800 (PST) Received: from chimu ([2405:6581:5360:1800:acc6:1cf0:e7a4:d7e8]) by smtp.gmail.com with ESMTPSA id b9sm8728944pgu.20.2017.11.30.21.39.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Nov 2017 21:39:54 -0800 (PST) Received: by chimu (sSMTP sendmail emulation); Fri, 01 Dec 2017 14:39:50 +0900 From: Nobuhiro Iwamatsu To: u-boot@lists.denx.de, Heiko Schocher Date: Fri, 1 Dec 2017 14:39:40 +0900 Message-Id: <20171201053940.9539-1-iwamatsu@nigauri.org> X-Mailer: git-send-email 2.15.0 Subject: [U-Boot] [PATCH] cmd: i2c: Fix use sdram sub command with CONFIG_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" sdram sub command of i2c command does not support Drivers Model. This adds Drivers Model support to sdram sub command. Signed-off-by: Nobuhiro Iwamatsu Reviewed-by: Simon Glass Reviewed-by: Heiko Schocher --- cmd/i2c.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cmd/i2c.c b/cmd/i2c.c index 3dd7c6ba4d..bfddf8be1b 100644 --- a/cmd/i2c.c +++ b/cmd/i2c.c @@ -1156,7 +1156,10 @@ static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) uint chip; u_char data[128]; u_char cksum; - int j; + int j, ret; +#ifdef CONFIG_DM_I2C + struct udevice *dev; +#endif static const char *decode_CAS_DDR2[] = { " TBD", " 6", " 5", " 4", " 3", " 2", " TBD", " TBD" @@ -1210,7 +1213,14 @@ static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) */ chip = simple_strtoul (argv[1], NULL, 16); - if (i2c_read (chip, 0, 1, data, sizeof (data)) != 0) { +#ifdef CONFIG_DM_I2C + ret = i2c_get_cur_bus_chip(chip, &dev); + if (!ret) + ret = dm_i2c_read(dev, 0, data, sizeof(data)); +#else + ret = i2c_read(chip, 0, 1, data, sizeof(data)); +#endif + if (ret) { puts ("No SDRAM Serial Presence Detect found.\n"); return 1; }