Skip to contentSkip to conversation

serial: pl011: delete reset callback

PATCH New Linus Walleij 2 participants 3 messages Sep 7, 2012

Subsystems (5)
Arm (32-bit) Arm sub-architectures TTY layer and serial drivers Arm/nomadik/Ux500 architectures +1 more subsystems
lore
Share & tools
lore

Linus Walleij

author
#0 lore raw

PATCH 2/2 serial: pl011: delete reset callback

From: Linus Walleij <[email protected]>

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 <[email protected]>
Cc Rajanikanth H.V <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
 arch/arm/mach-ux500/board-mop500.c | 21 ---------------------
 include/linux/amba/serial.h        |  1 -
 2 files changed, 22 deletions(-)
arch/arm/mach-ux500/board-mop500.c +0 -21
index dd629b7..c8922bc 100644
@@ -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 = {
include/linux/amba/serial.h +0 -1
index d117b29..f612c78 100644
@@ -205,7 +205,6 @@ struct amba_pl011_data {
 	void *dma_tx_param;
         void (*init) (void);
 	void (*exit) (void);
-	void (*reset) (void);
 };
 #endif
Signature · 1 line
1.7.11.3
#1 lore raw

PATCH 2/2 serial: pl011: delete reset callback

Quoted 10 lines · Linus Walleij

From: Linus Walleij <[email protected]>

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 <[email protected]>
Cc Rajanikanth H.V <[email protected]>
Signed-off-by Linus Walleij <[email protected]>

Didn't you send these already? Have they changed since?

Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#2 lore raw

PATCH 2/2 serial: pl011: delete reset callback

In reply to Linus Walleij
Quoted 7 lines · Linus Walleij

From: Linus Walleij <[email protected]>

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.

Quoted 7 lines
Cc Lee Jones <[email protected]>
Cc Rajanikanth H.V <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
 arch/arm/mach-ux500/board-mop500.c | 21 ---------------------
 include/linux/amba/serial.h        |  1 -
 2 files changed, 22 deletions(-)

Glad to see the back off this:

Acked-by Lee Jones <[email protected]>
Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog