Home Explore Help
Register Sign In
OpenWrt
/
openwrt
mirror of https://github.com/openwrt/openwrt.git
2
0
Fork 0
Files Issues 0 Wiki
Tree: ee4c47a134
Branches Tags
openwrt
/
target
/
linux
/
lantiq
/
patches-3.2
/
0031-MIPS-lantiq-convert-falcon-debug-uart-to-clkdev-api.patch

0031-MIPS-lantiq-convert-falcon-debug-uart-to-clkdev-api.patch 2.0 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566 
  1. From 96cc1d1baabe7bc6df02e90bcd78e6dde542d384 Mon Sep 17 00:00:00 2001
    2. 

  2. From: John Crispin <[email protected]>
    3. 

  3. Date: Tue, 21 Feb 2012 14:25:21 +0100
    4. 

  4. Subject: [PATCH 31/73] MIPS: lantiq: convert falcon debug uart to clkdev api
    5. 

  5. 

  6. On Falcon SoCs we have a secondary serial port that can be used to help
    7. 

  7. debug the voice core. For the port to work several clocking bits need to
    8. 

  8. be activated. We convert the code to clkdev api.
    9. 

  9. 

  10. Signed-off-by: John Crispin <[email protected]>
    11. 

  11. ---
    12. 

  12.  arch/mips/lantiq/falcon/prom.c |    4 +---
    13. 

  13.  drivers/tty/serial/lantiq.c    |    7 ++++---
    14. 

  14.  2 files changed, 5 insertions(+), 6 deletions(-)
    15. 

  15. 

  16. --- a/arch/mips/lantiq/falcon/prom.c
    17. 

  17. +++ b/arch/mips/lantiq/falcon/prom.c
    18. 

  18. @@ -43,10 +43,8 @@ ltq_soc_setup(void)
    19. 

  19.  	ltq_register_asc(0);
    20. 

  20.  	ltq_register_wdt();
    21. 

  21.  	falcon_register_gpio();
    22. 

  22. -	if (register_asc1) {
    23. 

  23. +	if (register_asc1)
    24. 

  24.  		ltq_register_asc(1);
    25. 

  25. -		ltq_sysctl_activate(SYSCTL_SYS1, ACTS_ASC1_ACT);
    26. 

  26. -	}
    27. 

  27.  }
    28. 

  28.  
    29. 

  29.  void __init
    30. 

  30. --- a/drivers/tty/serial/lantiq.c
    31. 

  31. +++ b/drivers/tty/serial/lantiq.c
    32. 

  32. @@ -117,6 +117,7 @@ static DEFINE_SPINLOCK(ltq_asc_lock);
    33. 

  33.  
    34. 

  34.  struct ltq_uart_port {
    35. 

  35.  	struct uart_port	port;
    36. 

  36. +	struct clk		*fpiclk;
    37. 

  37.  	struct clk		*clk;
    38. 

  38.  	unsigned int		tx_irq;
    39. 

  39.  	unsigned int		rx_irq;
    40. 

  40. @@ -319,7 +320,7 @@ lqasc_startup(struct uart_port *port)
    41. 

  41.  	struct ltq_uart_port *ltq_port = to_ltq_uart_port(port);
    42. 

  42.  	int retval;
    43. 

  43.  
    44. 

  44. -	port->uartclk = clk_get_rate(ltq_port->clk);
    45. 

  45. +	port->uartclk = clk_get_rate(ltq_port->fpiclk);
    46. 

  46.  
    47. 

  47.  	ltq_w32_mask(ASCCLC_DISS | ASCCLC_RMCMASK, (1 << ASCCLC_RMCOFFSET),
    48. 

  48.  		port->membase + LTQ_ASC_CLC);
    49. 

  49. @@ -646,7 +647,7 @@ lqasc_console_setup(struct console *co,
    50. 

  50.  
    51. 

  51.  	port = &ltq_port->port;
    52. 

  52.  
    53. 

  53. -	port->uartclk = clk_get_rate(ltq_port->clk);
    54. 

  54. +	port->uartclk = clk_get_rate(ltq_port->fpiclk);
    55. 

  55.  
    56. 

  56.  	if (options)
    57. 

  57.  		uart_parse_options(options, &baud, &parity, &bits, &flow);
    58. 

  58. @@ -731,7 +732,7 @@ lqasc_probe(struct platform_device *pdev
    59. 

  59.  	port->irq	= tx_irq; /* unused, just to be backward-compatibe */
    60. 

  60.  	port->mapbase	= mmres->start;
    61. 

  61.  
    62. 

  62. -	ltq_port->clk	= clk;
    63. 

  63. +	ltq_port->fpiclk = clk;
    64. 

  64.  
    65. 

  65.  	ltq_port->tx_irq = tx_irq;
    66. 

  66.  	ltq_port->rx_irq = rx_irq;
    67.