diff options
-rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 21 | ||||
-rw-r--r-- | include/linux/amba/serial.h | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 8674a890fd1..f216c302beb 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 | ||
529 | static 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 | |||
547 | static struct amba_pl011_data uart0_plat = { | 527 | static 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 | ||
556 | static struct amba_pl011_data uart1_plat = { | 535 | static struct amba_pl011_data uart1_plat = { |
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h index d117b29d106..f612c783170 100644 --- a/include/linux/amba/serial.h +++ b/include/linux/amba/serial.h | |||
@@ -205,7 +205,6 @@ struct amba_pl011_data { | |||
205 | void *dma_tx_param; | 205 | void *dma_tx_param; |
206 | void (*init) (void); | 206 | void (*init) (void); |
207 | void (*exit) (void); | 207 | void (*exit) (void); |
208 | void (*reset) (void); | ||
209 | }; | 208 | }; |
210 | #endif | 209 | #endif |
211 | 210 | ||