aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-09-07 04:02:48 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-10 19:33:02 -0400
commit43b5f0d69291374f602ad8e1817f329573a59010 (patch)
treeb9b46199c998d13e43b16eb0328536216d60d0e6 /arch/arm
parentfe0ed5b3158b6c5b6e2653348575de8f62f97d27 (diff)
serial: pl011: delete reset callback
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: Rajanikanth H.V <rajanikanth.hv@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ux500/board-mop500.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 8674a890fd1c..f216c302beb6 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -524,33 +524,12 @@ static struct stedma40_chan_cfg uart2_dma_cfg_tx = {
524}; 524};
525#endif 525#endif
526 526
527#define PRCC_K_SOFTRST_SET 0x18
528#define PRCC_K_SOFTRST_CLEAR 0x1C
529static void ux500_uart0_reset(void)
530{
531 void __iomem *prcc_rst_set, *prcc_rst_clr;
532
533 prcc_rst_set = (void __iomem *)IO_ADDRESS(U8500_CLKRST1_BASE +
534 PRCC_K_SOFTRST_SET);
535 prcc_rst_clr = (void __iomem *)IO_ADDRESS(U8500_CLKRST1_BASE +
536 PRCC_K_SOFTRST_CLEAR);
537
538 /* Activate soft reset PRCC_K_SOFTRST_CLEAR */
539 writel((readl(prcc_rst_clr) | 0x1), prcc_rst_clr);
540 udelay(1);
541
542 /* Release soft reset PRCC_K_SOFTRST_SET */
543 writel((readl(prcc_rst_set) | 0x1), prcc_rst_set);
544 udelay(1);
545}
546
547static struct amba_pl011_data uart0_plat = { 527static struct amba_pl011_data uart0_plat = {
548#ifdef CONFIG_STE_DMA40 528#ifdef CONFIG_STE_DMA40
549 .dma_filter = stedma40_filter, 529 .dma_filter = stedma40_filter,
550 .dma_rx_param = &uart0_dma_cfg_rx, 530 .dma_rx_param = &uart0_dma_cfg_rx,
551 .dma_tx_param = &uart0_dma_cfg_tx, 531 .dma_tx_param = &uart0_dma_cfg_tx,
552#endif 532#endif
553 .reset = ux500_uart0_reset,
554}; 533};
555 534
556static struct amba_pl011_data uart1_plat = { 535static struct amba_pl011_data uart1_plat = {