From patchwork Sun Jan 25 15:27:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 432550 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id E802D1401DA for ; Mon, 26 Jan 2015 02:30:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B76F54B885; Sun, 25 Jan 2015 16:29:30 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Pzq0FY+bo9DJ; Sun, 25 Jan 2015 16:29:30 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3BF154B892; Sun, 25 Jan 2015 16:28:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B532A4B779 for ; Sun, 25 Jan 2015 16:27:56 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B09trfjxzUJQ for ; Sun, 25 Jan 2015 16:27:56 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ie0-f202.google.com (mail-ie0-f202.google.com [209.85.223.202]) by theia.denx.de (Postfix) with ESMTPS id C95814B75D for ; Sun, 25 Jan 2015 16:27:51 +0100 (CET) Received: by mail-ie0-f202.google.com with SMTP id rl12so649518iec.1 for ; Sun, 25 Jan 2015 07:27:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DU00dY32z83kOja6/4Yuvpoc1LyQ6J6RKFxsAzVvfXU=; b=REPXo/xtapE9ASaDFahRt4aQ7yV9e0Q3wNNzdZFwQMWe9Q93wrnZzLWZHj37JGnMXi 2UiFXq78HK6kQewXXy4c/jclloC1v1zaW2EaV8wl9brvCVPBM8zRZ31STptIguV/DvIV beK9688/AX2bWzhyMXKsmbAkHqTwu22fuEO8yV+ChDZyjNFTTt+yIL8Sm7wC7ELKdzWe u03+maPt4rlykxVtAksP4f7lT+gIvFX1kMw1wzEuAbPiqU2w4vMoNQAGF6iwdl2LKlWD YhZ9FXabUG0IFODnXNUL+93VuDfMwWI58+Ke/UY/2Smlh9/BvLMf6y/EKjFXjXaA8pYH v20g== X-Gm-Message-State: ALoCoQmdN1JArlmUMChzgzSzHdvnCuaVQonaUGweqBkWLwjfkNO99QKCrFJ2AHMPaJaUW+NdxeKx X-Received: by 10.43.83.196 with SMTP id ah4mr14489681icc.25.1422199670660; Sun, 25 Jan 2015 07:27:50 -0800 (PST) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id u27si214232yhu.4.2015.01.25.07.27.50 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2015 07:27:50 -0800 (PST) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id 82QrqW1i.3; Sun, 25 Jan 2015 07:27:50 -0800 Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 2E0FD2205FB; Sun, 25 Jan 2015 08:27:50 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 25 Jan 2015 08:27:19 -0700 Message-Id: <1422199640-25811-26-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1422199640-25811-1-git-send-email-sjg@chromium.org> References: <1422199640-25811-1-git-send-email-sjg@chromium.org> Subject: [U-Boot] [PATCH v3 25/26] dm: cros_ec_spi: Remove old pre-driver-model code X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This is no-longer needed since all platforms use SPI for cros_ec. Signed-off-by: Simon Glass --- Changes in v3: None Changes in v2: - Add patches to tidy up cros_ec using new I2C/SPI features drivers/misc/cros_ec_spi.c | 51 ++-------------------------------------------- 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c index 25a5a04..9359c56 100644 --- a/drivers/misc/cros_ec_spi.c +++ b/drivers/misc/cros_ec_spi.c @@ -21,14 +21,9 @@ DECLARE_GLOBAL_DATA_PTR; -#ifdef CONFIG_DM_CROS_EC int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes) { struct cros_ec_dev *dev = udev->uclass_priv; -#else -int cros_ec_spi_packet(struct cros_ec_dev *dev, int out_bytes, int in_bytes) -{ -#endif struct spi_slave *slave = dev_get_parentdata(dev->dev); int rv; @@ -67,18 +62,11 @@ int cros_ec_spi_packet(struct cros_ec_dev *dev, int out_bytes, int in_bytes) * @param din_len Maximum size of response in bytes * @return number of bytes in response, or -1 on error */ -#ifdef CONFIG_DM_CROS_EC int cros_ec_spi_command(struct udevice *udev, uint8_t cmd, int cmd_version, const uint8_t *dout, int dout_len, uint8_t **dinp, int din_len) { struct cros_ec_dev *dev = udev->uclass_priv; -#else -int cros_ec_spi_command(struct cros_ec_dev *dev, uint8_t cmd, int cmd_version, - const uint8_t *dout, int dout_len, - uint8_t **dinp, int din_len) -{ -#endif struct spi_slave *slave = dev_get_parentdata(dev->dev); int in_bytes = din_len + 4; /* status, length, checksum, trailer */ uint8_t *out; @@ -166,46 +154,12 @@ int cros_ec_spi_command(struct cros_ec_dev *dev, uint8_t cmd, int cmd_version, return len; } -#ifndef CONFIG_DM_CROS_EC -int cros_ec_spi_decode_fdt(struct cros_ec_dev *dev, const void *blob) -{ - /* Decode interface-specific FDT params */ - dev->max_frequency = fdtdec_get_int(blob, dev->node, - "spi-max-frequency", 500000); - dev->cs = fdtdec_get_int(blob, dev->node, "reg", 0); - - return 0; -} - -/** - * Initialize SPI protocol. - * - * @param dev CROS_EC device - * @param blob Device tree blob - * @return 0 if ok, -1 on error - */ -int cros_ec_spi_init(struct cros_ec_dev *dev, const void *blob) -{ - int ret; - - ret = spi_setup_slave_fdt(blob, dev->node, dev->parent_node, - &slave); - if (ret) { - debug("%s: Could not setup SPI slave\n", __func__); - return ret; - } - - return 0; -} -#endif - -#ifdef CONFIG_DM_CROS_EC -int cros_ec_probe(struct udevice *dev) +static int cros_ec_probe(struct udevice *dev) { return cros_ec_register(dev); } -struct dm_cros_ec_ops cros_ec_ops = { +static struct dm_cros_ec_ops cros_ec_ops = { .packet = cros_ec_spi_packet, .command = cros_ec_spi_command, }; @@ -222,4 +176,3 @@ U_BOOT_DRIVER(cros_ec_spi) = { .probe = cros_ec_probe, .ops = &cros_ec_ops, }; -#endif