From patchwork Fri Sep 7 08:02:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11223 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id BF4CE23E29 for ; Fri, 7 Sep 2012 08:03:10 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 76F75A18D3B for ; Fri, 7 Sep 2012 08:03:10 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so4269094iea.11 for ; Fri, 07 Sep 2012 01:03:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=/Aea0WWzKaXlhkHtJ93g87g6AFC2PXqdfasG8DfonfY=; b=An6wpHRqJFwMUwmexNBNFZ7hivmejdbvuSV3meBEb86q2Augpk4iS2MI49BX1Bvd4/ GN7kWUCwhwJS3ljNjY9yOuKSXJzrkTAqG9CiBWZhFl8D5VoF1hoqso39DJSbchmQHLBo IoHj4uF34wKLNEPnxbDJhwmzE8xEXuntijjmKt9BceijIVywTRpaHhre7hD+GcMzZ7s7 kjrxzxdL0S+65tpM6PxIbD1131LxbK5zvvIXK3qVsn7Dpuehoko3v45gn73CdnBszGVf TwZyMmgYoRJcRZ0thatt2Pn65hEwHHyqOx/zldI7FquRHEYrFnVSdgdDK8E23Mc8Wqgb PgfQ== Received: by 10.50.45.162 with SMTP id o2mr7296211igm.0.1347004990206; Fri, 07 Sep 2012 01:03:10 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp365748igc; Fri, 7 Sep 2012 01:03:09 -0700 (PDT) Received: by 10.14.0.198 with SMTP id 46mr6528864eeb.30.1347004988731; Fri, 07 Sep 2012 01:03:08 -0700 (PDT) Received: from eu1sys200aog110.obsmtp.com (eu1sys200aog110.obsmtp.com [207.126.144.129]) by mx.google.com with SMTP id c41si3664576eem.98.2012.09.07.01.02.58 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Sep 2012 01:03:08 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.129 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.129; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.129 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob110.postini.com ([207.126.147.11]) with SMTP ID DSNKUEmqMuT9BwYUJCqiyB9yD3XB2Mg9W+LJ@postini.com; Fri, 07 Sep 2012 08:03:08 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id AAEA84E; Fri, 7 Sep 2012 08:02:23 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 4BEDE54; Fri, 7 Sep 2012 04:07:24 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id DCEAFA8074; Fri, 7 Sep 2012 10:02:47 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 7 Sep 2012 10:02:50 +0200 From: Linus Walleij To: Greg Kroah-Hartman , Cc: , Anmar Oueja , Linus Walleij , Lee Jones , Rajanikanth H.V Subject: [PATCH 2/2] serial: pl011: delete reset callback Date: Fri, 7 Sep 2012 10:02:48 +0200 Message-ID: <1347004968-15329-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkcBXFmyWWw1zLQsQL6/yA/rbcOy8TPq/wQen9iAswPl/f+wUSIK0d36IRosGxvD6FbeQbD From: Linus Walleij Since commit 4fd0690bb0c3955983560bb2767ee82e2b197f9b "serial: pl011: implement workaround for CTS clear event issue" the PL011 UART is no longer at risk to hang up, so get rid of the callback altogether. Cc: Lee Jones Cc: Rajanikanth H.V Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/board-mop500.c | 21 --------------------- include/linux/amba/serial.h | 1 - 2 files changed, 22 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index dd629b7..c8922bc 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -542,33 +542,12 @@ static struct stedma40_chan_cfg uart2_dma_cfg_tx = { }; #endif -#define PRCC_K_SOFTRST_SET 0x18 -#define PRCC_K_SOFTRST_CLEAR 0x1C -static void ux500_uart0_reset(void) -{ - void __iomem *prcc_rst_set, *prcc_rst_clr; - - prcc_rst_set = (void __iomem *)IO_ADDRESS(U8500_CLKRST1_BASE + - PRCC_K_SOFTRST_SET); - prcc_rst_clr = (void __iomem *)IO_ADDRESS(U8500_CLKRST1_BASE + - PRCC_K_SOFTRST_CLEAR); - - /* Activate soft reset PRCC_K_SOFTRST_CLEAR */ - writel((readl(prcc_rst_clr) | 0x1), prcc_rst_clr); - udelay(1); - - /* Release soft reset PRCC_K_SOFTRST_SET */ - writel((readl(prcc_rst_set) | 0x1), prcc_rst_set); - udelay(1); -} - static struct amba_pl011_data uart0_plat = { #ifdef CONFIG_STE_DMA40 .dma_filter = stedma40_filter, .dma_rx_param = &uart0_dma_cfg_rx, .dma_tx_param = &uart0_dma_cfg_tx, #endif - .reset = ux500_uart0_reset, }; static struct amba_pl011_data uart1_plat = { diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h index d117b29..f612c78 100644 --- a/include/linux/amba/serial.h +++ b/include/linux/amba/serial.h @@ -205,7 +205,6 @@ struct amba_pl011_data { void *dma_tx_param; void (*init) (void); void (*exit) (void); - void (*reset) (void); }; #endif