From patchwork Fri Apr 19 06:48:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 239 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4D1623F067 for ; Fri, 19 Apr 2019 08:49:20 +0200 (CEST) Received: by mail-pf1-f197.google.com with SMTP id y2sf2938399pfl.16 for ; Thu, 18 Apr 2019 23:49:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1555656556; cv=pass; d=google.com; s=arc-20160816; b=wxpWC9jEjOFgI2U4o4zErBLhP6uro4U6PvKe0j30frBFhz0zIAq8yL4izKyhR2D+xl uuv7/9QQLSY+VIHLbBnLglrvHzctVZ22j8xq5Ij4RO2ThnEJixe354DNFuHaskhztwDz Md6p6fnB0yMqDGPPT01nhGfIcsWYy5kPNFWJidktLtQqXrmtuMeazlPX7zrN4/YZyokq ewTh+W+6QX4JK5O2tW15ZskT0OFFaUr3o4JVXGtCJLKiAKO6MpjOuONrKCEoAou2Im96 h3bgjGF9W4rqcc+LDvvJ/CxA2vfIm4B0Jv7lsrSO57hk7R2yVhntDcqYXM3FC/haOGNm /0+w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=scuROnV2TMU8hSoFH1ym1IXQXPoIK4b8rlp9xKVhZxM=; b=PYJ4WHQ4/UxyZ8zFcaP+lw9UVuj2GoONw7lALOXNmBounmxb7RO2rE6SjDgYU4T3z/ 1ltuVawaxdgKXrw90l7D0LSNbKp6on6+XKy914syIktmdHyOZ3fx9TJSaN8l3HsCFBzK o/utS4uqhO5pXBavid1xdkNwET2v5i6A90vP3BuqsZpqwKXQw/+8RvXWtOKxJc2Tg3JL ccOxw06LMAUz1rf1ZgtgKLPK6Ta5LYeEwGafsb7esExNSHgeEaiOc4n86ErTF8WFVmof S/hUfDQPHcjnvu99wwYQN3gp8bQjUoSvqZLcXOGltHfdZRjTpX3EPdeDi8myPw7I+OOM zaBw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TOjeSYTD; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=scuROnV2TMU8hSoFH1ym1IXQXPoIK4b8rlp9xKVhZxM=; b=TsQEJoabSpyiV0C0Jq47HULE+wfkZMWx+iWZ04MC15Bn4E5Lu0U3w5zJxRINJ4PMED 8yN925X06HoJEhHXc2r3R7zJl8+ut1txrjX2+Y76faQvzopPq2gycXbSu+8iCgdOX2ll a6mAh9HqplKXU8vJ5REJe1R5jtF/j0CytL+TU= 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:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-unsubscribe; bh=scuROnV2TMU8hSoFH1ym1IXQXPoIK4b8rlp9xKVhZxM=; b=uZDN2WRImE2tRBfqiUmu8FimBRuxBdaAfq+CM3yxlV/QjrHSxcOtNPL1W+qKfgzFOc nei91+aF2G9ScDxQZoWxjz92Fp1oP23q9axVe/IJaJIGSzycsIWx4aA3JE4aDWSHXoy6 wSLD3jOsgHmX6bwa0rZ0XsZNCwKLzqhGayNMAYfIjqKlEl9WPwzL3ixHQj+G8+AUYwra Xhmz+wcbxX8GRGti6gxfk0b8j00uY3Gp+U2abx7FEmzJYA1m5fhtC2tfxlSMWCWY/3Ls 7QLFz23x1f65ctYUG3D4RZQl298XuEcVitGvXRbNKOT51ZMFTp9e+tFuQtABdFFcwA/m IoGA== X-Gm-Message-State: APjAAAVw+LXWlu8WKZ/Aw+p7zrYHSjGrNCV74rTQzZSfygO93B2OUxtb yu+e+iw8RqqTy6o1eXy3b7fpPWJz X-Google-Smtp-Source: APXvYqzgEqou5h4LJtRpn0LDm0O19pBEy/uXVOXGIlmATcZukrcsnRNmfvcmHgVpfwgGG7y1fOfUtA== X-Received: by 2002:a17:902:61:: with SMTP id 88mr2086443pla.166.1555656554752; Thu, 18 Apr 2019 23:49:14 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:4186:: with SMTP id g6ls1346712pfd.10.gmail; Thu, 18 Apr 2019 23:49:14 -0700 (PDT) X-Received: by 2002:a63:df43:: with SMTP id h3mr2351865pgj.294.1555656554308; Thu, 18 Apr 2019 23:49:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555656554; cv=none; d=google.com; s=arc-20160816; b=GWq6k4fLXCYu9nTCk1+PopPeloIWhqeDVDNDy81w2H7hIQzq5MIq3dFLoU+o7SRh22 LXR1QJWHahl3wx8Xg7N4vemQjIpoJWlu9d1PMmSjQ4G5DWdwfj4Ztsulub3r+fcZB/zR y9yIzb2E/s7o/EQW7HcsQtYSLZns3leTWIBEiLVM3Gr8TUhrNQHU5qpbCHjQSDqd5iG3 8eTX68xpDkubaOwGs1sEpE4p5yZL+Ha32cbAGtSbfzBPGwCpdy39E/y9620BolJDTu+O kSJt4OmE3RkXoWj9XK4OSZFuJXI7gl6lgUBB3SaBqrOXDKvIAYj6HdzLeA1aXIp/1Rfp fZXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=7a2Ctlh79OnU30i7r5S6T1HP51kKXok+a7ETv5gN73I=; b=lg+jU0dIHVRBomnN3fKYdVMNAbMLoftFkpXy203i9H5WO34T0Q9E3GGa4uPha5tV4s 1gWNCtnl5oaJRblbHARPJ+aK6H1t7iS7sy1g2rS+jS1mzVXUwIGSaJFFM+045g49MRIk THX0C53u7p/2knc4H4yYo1XfKKnzL6lOoyFQGawmbAxJBU0AXoVIaHU31DZXfwJdWBcq nc0hlseEi1ZMDv4NHME1YypSRqWq5negSz0pbwPFuvQbQtkEYaZMMzsacZyRhvXsIAn1 kZf4ERRWQOoSZQaSpVbq/ldIjtdVUnaWW3EWb41WwRuC5Gvo+IGt4MU5Yy4cJgSiRjmd cVGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TOjeSYTD; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id q144sor4684460pfc.44.2019.04.18.23.49.14 for (Google Transport Security); Thu, 18 Apr 2019 23:49:14 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:aa7:8515:: with SMTP id v21mr2192918pfn.253.1555656552766; Thu, 18 Apr 2019 23:49:12 -0700 (PDT) Received: from localhost.localdomain ([115.97.185.144]) by smtp.gmail.com with ESMTPSA id q87sm6127084pfa.133.2019.04.18.23.49.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 23:49:12 -0700 (PDT) From: Jagan Teki To: Tom Rini , u-boot@lists.denx.de Cc: linux-amarula@amarulasolutions.com, Jagan Teki , Vladimir Zapolskiy , Albert ARIBAUD Subject: [PATCH] spi: Zap lpc32xx_ssp driver-related code Date: Fri, 19 Apr 2019 12:18:59 +0530 Message-Id: <20190419064859.7744-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=TOjeSYTD; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Dropped - lpc32xx_ssp driver - CONFIG_LPC32XX_SSP, LPC32XX_SSP_TIMEOUT items Dropped due to: - no active updates - no dm conversion - multiple pings for asking dm-conversion - no response for dm converted patch - driver-model migration expiry Cc: Vladimir Zapolskiy Cc: Albert ARIBAUD Signed-off-by: Jagan Teki --- configs/devkit3250_defconfig | 1 - configs/work_92105_defconfig | 1 - drivers/spi/Kconfig | 5 -- drivers/spi/Makefile | 1 - drivers/spi/lpc32xx_ssp.c | 134 ----------------------------------- include/configs/devkit3250.h | 5 -- include/configs/work_92105.h | 5 -- scripts/config_whitelist.txt | 1 - 8 files changed, 153 deletions(-) delete mode 100644 drivers/spi/lpc32xx_ssp.c diff --git a/configs/devkit3250_defconfig b/configs/devkit3250_defconfig index b739f27803..8fc7763c3a 100644 --- a/configs/devkit3250_defconfig +++ b/configs/devkit3250_defconfig @@ -42,7 +42,6 @@ CONFIG_PHY_ADDR_ENABLE=y CONFIG_PHY_ADDR=31 CONFIG_SYS_NS16550=y CONFIG_SPI=y -CONFIG_LPC32XX_SSP=y CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/configs/work_92105_defconfig b/configs/work_92105_defconfig index 105e51a400..61863abeb7 100644 --- a/configs/work_92105_defconfig +++ b/configs/work_92105_defconfig @@ -38,4 +38,3 @@ CONFIG_PHYLIB=y CONFIG_PHY_ADDR_ENABLE=y CONFIG_SYS_NS16550=y CONFIG_SPI=y -CONFIG_LPC32XX_SSP=y diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index fb794adae7..7043b5c0f6 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -359,11 +359,6 @@ config KIRKWOOD_SPI Enable support for SPI on various Marvell SoCs, such as Kirkwood and Armada 375. -config LPC32XX_SSP - bool "LPC32XX SPI Driver" - help - Enable support for SPI on LPC32xx - config MPC8XXX_SPI bool "MPC8XXX SPI Driver" help diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 8be9a4baa2..25add2812d 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -32,7 +32,6 @@ obj-$(CONFIG_FSL_ESPI) += fsl_espi.o obj-$(CONFIG_FSL_QSPI) += fsl_qspi.o obj-$(CONFIG_ICH_SPI) += ich.o obj-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o -obj-$(CONFIG_LPC32XX_SSP) += lpc32xx_ssp.o obj-$(CONFIG_MESON_SPIFC) += meson_spifc.o obj-$(CONFIG_MPC8XX_SPI) += mpc8xx_spi.o obj-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o diff --git a/drivers/spi/lpc32xx_ssp.c b/drivers/spi/lpc32xx_ssp.c deleted file mode 100644 index 4b09366317..0000000000 --- a/drivers/spi/lpc32xx_ssp.c +++ /dev/null @@ -1,134 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * LPC32xx SSP interface (SPI mode) - * - * (C) Copyright 2014 DENX Software Engineering GmbH - * Written-by: Albert ARIBAUD - */ - -#include -#include -#include -#include -#include -#include - -/* SSP chip registers */ -struct ssp_regs { - u32 cr0; - u32 cr1; - u32 data; - u32 sr; - u32 cpsr; - u32 imsc; - u32 ris; - u32 mis; - u32 icr; - u32 dmacr; -}; - -/* CR1 register defines */ -#define SSP_CR1_SSP_ENABLE 0x0002 - -/* SR register defines */ -#define SSP_SR_TNF 0x0002 -/* SSP status RX FIFO not empty bit */ -#define SSP_SR_RNE 0x0004 - -/* lpc32xx spi slave */ -struct lpc32xx_spi_slave { - struct spi_slave slave; - struct ssp_regs *regs; -}; - -static inline struct lpc32xx_spi_slave *to_lpc32xx_spi_slave( - struct spi_slave *slave) -{ - return container_of(slave, struct lpc32xx_spi_slave, slave); -} - -/* the following is called in sequence by do_spi_xfer() */ - -struct spi_slave *spi_setup_slave(uint bus, uint cs, uint max_hz, uint mode) -{ - struct lpc32xx_spi_slave *lslave; - - /* we only set up SSP0 for now, so ignore bus */ - - if (mode & SPI_3WIRE) { - pr_err("3-wire mode not supported"); - return NULL; - } - - if (mode & SPI_SLAVE) { - pr_err("slave mode not supported\n"); - return NULL; - } - - if (mode & SPI_PREAMBLE) { - pr_err("preamble byte skipping not supported\n"); - return NULL; - } - - lslave = spi_alloc_slave(struct lpc32xx_spi_slave, bus, cs); - if (!lslave) { - printf("SPI_error: Fail to allocate lpc32xx_spi_slave\n"); - return NULL; - } - - lslave->regs = (struct ssp_regs *)SSP0_BASE; - - /* - * 8 bit frame, SPI fmt, 500kbps -> clock divider is 26. - * Set SCR to 0 and CPSDVSR to 26. - */ - - writel(0x7, &lslave->regs->cr0); /* 8-bit chunks, SPI, 1 clk/bit */ - writel(26, &lslave->regs->cpsr); /* SSP clock = HCLK/26 = 500kbps */ - writel(0, &lslave->regs->imsc); /* do not raise any interrupts */ - writel(0, &lslave->regs->icr); /* clear any pending interrupt */ - writel(0, &lslave->regs->dmacr); /* do not do DMAs */ - writel(SSP_CR1_SSP_ENABLE, &lslave->regs->cr1); /* enable SSP0 */ - return &lslave->slave; -} - -void spi_free_slave(struct spi_slave *slave) -{ - struct lpc32xx_spi_slave *lslave = to_lpc32xx_spi_slave(slave); - - debug("(lpc32xx) spi_free_slave: 0x%08x\n", (u32)lslave); - free(lslave); -} - -int spi_claim_bus(struct spi_slave *slave) -{ - /* only one bus and slave so far, always available */ - return 0; -} - -int spi_xfer(struct spi_slave *slave, unsigned int bitlen, - const void *dout, void *din, unsigned long flags) -{ - struct lpc32xx_spi_slave *lslave = to_lpc32xx_spi_slave(slave); - int bytelen = bitlen >> 3; - int idx_out = 0; - int idx_in = 0; - int start_time; - - start_time = get_timer(0); - while ((idx_out < bytelen) || (idx_in < bytelen)) { - int status = readl(&lslave->regs->sr); - if ((idx_out < bytelen) && (status & SSP_SR_TNF)) - writel(((u8 *)dout)[idx_out++], &lslave->regs->data); - if ((idx_in < bytelen) && (status & SSP_SR_RNE)) - ((u8 *)din)[idx_in++] = readl(&lslave->regs->data); - if (get_timer(start_time) >= CONFIG_LPC32XX_SSP_TIMEOUT) - return -1; - } - return 0; -} - -void spi_release_bus(struct spi_slave *slave) -{ - /* do nothing */ -} diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 2f8c655b2c..e1f729a854 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -58,11 +58,6 @@ */ #define CONFIG_LPC32XX_GPIO -/* - * SSP/SPI - */ -#define CONFIG_LPC32XX_SSP_TIMEOUT 100000 - /* * Ethernet */ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 67b5e9aa11..9d9a53ef09 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -109,11 +109,6 @@ #define CONFIG_LPC32XX_GPIO -/* - * SSP/SPI/DISPLAY - */ - -#define CONFIG_LPC32XX_SSP_TIMEOUT 100000 /* * Environment */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5092c3fb4c..e394e03726 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1149,7 +1149,6 @@ CONFIG_LPC32XX_NAND_SLC_WDR_CLKS CONFIG_LPC32XX_NAND_SLC_WHOLD CONFIG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH -CONFIG_LPC32XX_SSP_TIMEOUT CONFIG_LPC_BASE CONFIG_LPC_IO_BASE CONFIG_LPUART