PageRenderTime 44ms CodeModel.GetById 16ms RepoModel.GetById 0ms app.codeStats 0ms

/bootloader/u-boot-2009.08/patches/0318-ENGR00151310-mx53-smd-force-warm-reset-as-cold-reset.patch

https://github.com/red-root/PortingARMLinux
Patch | 78 lines | 70 code | 8 blank | 0 comment | 0 complexity | 0d898547f174130508de6e6f8b68af72 MD5 | raw file
Possible License(s): AGPL-1.0 
    

  1. From 6667da86ca1582222416defdcbf8e6d41bc03d28 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Lily Zhang <r58066@freescale.com>
    3. 

  3. Date: Thu, 21 Jul 2011 18:08:07 +0800
    4. 

  4. Subject: [PATCH 318/678] ENGR00151310 mx53 smd: force warm reset as cold
    5. 

  5.  reset
    6. 

  6. 

  7. This patch is used to support watchdog timeout in SMD RevA, RevB
    8. 

  8. board.
    9. 

  9. 1. Revert "ENGR00143469 mx53 smd: pull down GPIO_9 to reset the
    10. 

  10. board".
    11. 

  11. 2. Force warm reset as cold reset.
    12. 

  12. 

  13. Signed-off-by: Lily Zhang <r58066@freescale.com>
    14. 

  14. ---
    15. 

  15.  board/freescale/mx53_smd/mx53_smd.c |    9 +++++++++
    16. 

  16.  cpu/arm_cortexa8/mx53/interrupts.c  |   15 ---------------
    17. 

  17.  2 files changed, 9 insertions(+), 15 deletions(-)
    18. 

  18. 

  19. diff --git a/board/freescale/mx53_smd/mx53_smd.c b/board/freescale/mx53_smd/mx53_smd.c
    20. 

  20. index aff0364..b698fd3 100644
    21. 

  21. --- a/board/freescale/mx53_smd/mx53_smd.c
    22. 

  22. +++ b/board/freescale/mx53_smd/mx53_smd.c
    23. 

  23. @@ -799,6 +799,7 @@ void setup_splash_image(void)
    24. 

  24.  
    25. 

  25.  int board_init(void)
    26. 

  26.  {
    27. 

  27. +	unsigned int val;
    28. 

  28.  #ifdef CONFIG_MFG
    29. 

  29.  /* MFG firmware need reset usb to avoid host crash firstly */
    30. 

  30.  #define USBCMD 0x140
    31. 

  31. @@ -806,6 +807,14 @@ int board_init(void)
    32. 

  32.  	val &= ~0x1; /*RS bit*/
    33. 

  33.  	writel(val, OTG_BASE_ADDR + USBCMD);
    34. 

  34.  #endif
    35. 

  35. +
    36. 

  36. +	/* Workaround: To make watchdog timeout work in mx53
    37. 

  37. +	 * SMD, force warm reset as cold reset
    38. 

  38. +	 */
    39. 

  39. +	val = readl(SRC_BASE_ADDR);
    40. 

  40. +	val &= 0xFFFFFFFE;
    41. 

  41. +	writel(val, SRC_BASE_ADDR);
    42. 

  42. +
    43. 

  43.  	setup_boot_device();
    44. 

  44.  	setup_soc_rev();
    45. 

  45.  
    46. 

  46. diff --git a/cpu/arm_cortexa8/mx53/interrupts.c b/cpu/arm_cortexa8/mx53/interrupts.c
    47. 

  47. index a39e7ff..0cc24db 100644
    48. 

  48. --- a/cpu/arm_cortexa8/mx53/interrupts.c
    49. 

  49. +++ b/cpu/arm_cortexa8/mx53/interrupts.c
    50. 

  50. @@ -36,25 +36,10 @@ int interrupt_init(void)
    51. 

  51.  
    52. 

  52.  void reset_cpu(ulong addr)
    53. 

  53.  {
    54. 

  54. -#if defined(CONFIG_MX53_SMD)
    55. 

  55. -	unsigned int reg;
    56. 

  56. -#endif
    57. 

  57. -
    58. 

  58.  	/* de-select SS0 of instance: eCSPI1 */
    59. 

  59.  	mxc_request_iomux(MX53_PIN_EIM_EB2, IOMUX_CONFIG_ALT1);
    60. 

  60.  	/* de-select SS1 of instance: eCSPI1 */
    61. 

  61.  	mxc_request_iomux(MX53_PIN_EIM_D19, IOMUX_CONFIG_ALT1);
    62. 

  62.  
    63. 

  63. -#if defined(CONFIG_MX53_SMD)
    64. 

  64. -	/* GPIO_1_9 */
    65. 

  65. -	reg = readl(GPIO1_BASE_ADDR + 0x4);
    66. 

  66. -	reg |= (0x1 << 9);
    67. 

  67. -	writel(reg, GPIO1_BASE_ADDR + 0x4);
    68. 

  68. -
    69. 

  69. -	reg = readl(GPIO1_BASE_ADDR);
    70. 

  70. -	reg &= ~0x200;
    71. 

  71. -	writel(reg, GPIO1_BASE_ADDR);
    72. 

  72. -#else
    73. 

  73.  	__REG16(WDOG1_BASE_ADDR) = 4;
    74. 

  74. -#endif
    75. 

  75.  }
    76. 

  76. -- 
    77. 

  77. 1.7.7.4
    78. 

  78. 

  79.