Home Explore Help
Sign In
RISCI_ATOM
/
libreCMC-RISCi
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
libreCMC-RISCi
/
target
/
linux
/
ar71xx
/
patches-4.14
/
603-MIPS-ath79-ap121-fixes.patch

603-MIPS-ath79-ap121-fixes.patch 4.0 KB
Permalink History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149 
  1. --- a/arch/mips/ath79/mach-ap121.c
    2. 

  2. +++ b/arch/mips/ath79/mach-ap121.c
    3. 

  3. @@ -1,19 +1,21 @@
    4. 

  4.  /*
    5. 

  5.   *  Atheros AP121 board support
    6. 

  6.   *
    7. 

  7. - *  Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
    8. 

  8. + *  Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
    9. 

  9.   *
    10. 

  10.   *  This program is free software; you can redistribute it and/or modify it
    11. 

  11.   *  under the terms of the GNU General Public License version 2 as published
    12. 

  12.   *  by the Free Software Foundation.
    13. 

  13.   */
    14. 

  14.  
    15. 

  15. -#include "machtypes.h"
    16. 

  16. +#include "dev-eth.h"
    17. 

  17.  #include "dev-gpio-buttons.h"
    18. 

  18.  #include "dev-leds-gpio.h"
    19. 

  19. +#include "dev-m25p80.h"
    20. 

  20.  #include "dev-spi.h"
    21. 

  21.  #include "dev-usb.h"
    22. 

  22.  #include "dev-wmac.h"
    23. 

  23. +#include "machtypes.h"
    24. 

  24.  
    25. 

  25.  #define AP121_GPIO_LED_WLAN		0
    26. 

  26.  #define AP121_GPIO_LED_USB		1
    27. 

  27. @@ -24,7 +26,14 @@
    28. 

  28.  #define AP121_KEYS_POLL_INTERVAL	20	/* msecs */
    29. 

  29.  #define AP121_KEYS_DEBOUNCE_INTERVAL	(3 * AP121_KEYS_POLL_INTERVAL)
    30. 

  30.  
    31. 

  31. -#define AP121_CAL_DATA_ADDR	0x1fff1000
    32. 

  32. +#define AP121_MAC0_OFFSET		0x0000
    33. 

  33. +#define AP121_MAC1_OFFSET		0x0006
    34. 

  34. +#define AP121_CALDATA_OFFSET		0x1000
    35. 

  35. +#define AP121_WMAC_MAC_OFFSET		0x1002
    36. 

  36. +
    37. 

  37. +#define AP121_MINI_GPIO_LED_WLAN	0
    38. 

  38. +#define AP121_MINI_GPIO_BTN_JUMPSTART	12
    39. 

  39. +#define AP121_MINI_GPIO_BTN_RESET	11
    40. 

  40.  
    41. 

  41.  static struct gpio_led ap121_leds_gpio[] __initdata = {
    42. 

  42.  	{
    43. 

  43. @@ -58,35 +67,78 @@ static struct gpio_keys_button ap121_gpi
    44. 

  44.  	}
    45. 

  45.  };
    46. 

  46.  
    47. 

  47. -static struct spi_board_info ap121_spi_info[] = {
    48. 

  48. +static struct gpio_led ap121_mini_leds_gpio[] __initdata = {
    49. 

  49.  	{
    50. 

  50. -		.bus_num	= 0,
    51. 

  51. -		.chip_select	= 0,
    52. 

  52. -		.max_speed_hz	= 25000000,
    53. 

  53. -		.modalias	= "mx25l1606e",
    54. 

  54. -	}
    55. 

  55. +		.name		= "ap121:green:wlan",
    56. 

  56. +		.gpio		= AP121_MINI_GPIO_LED_WLAN,
    57. 

  57. +		.active_low	= 0,
    58. 

  58. +	},
    59. 

  59.  };
    60. 

  60.  
    61. 

  61. -static struct ath79_spi_platform_data ap121_spi_data = {
    62. 

  62. -	.bus_num	= 0,
    63. 

  63. -	.num_chipselect = 1,
    64. 

  64. +static struct gpio_keys_button ap121_mini_gpio_keys[] __initdata = {
    65. 

  65. +	{
    66. 

  66. +		.desc		= "jumpstart button",
    67. 

  67. +		.type		= EV_KEY,
    68. 

  68. +		.code		= KEY_WPS_BUTTON,
    69. 

  69. +		.debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,
    70. 

  70. +		.gpio		= AP121_MINI_GPIO_BTN_JUMPSTART,
    71. 

  71. +		.active_low	= 1,
    72. 

  72. +	},
    73. 

  73. +	{
    74. 

  74. +		.desc		= "reset button",
    75. 

  75. +		.type		= EV_KEY,
    76. 

  76. +		.code		= KEY_RESTART,
    77. 

  77. +		.debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,
    78. 

  78. +		.gpio		= AP121_MINI_GPIO_BTN_RESET,
    79. 

  79. +		.active_low	= 1,
    80. 

  80. +	}
    81. 

  81.  };
    82. 

  82.  
    83. 

  83. +static void __init ap121_common_setup(void)
    84. 

  84. +{
    85. 

  85. +	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
    86. 

  86. +
    87. 

  87. +	ath79_register_m25p80(NULL);
    88. 

  88. +	ath79_register_wmac(art + AP121_CALDATA_OFFSET,
    89. 

  89. +			    art + AP121_WMAC_MAC_OFFSET);
    90. 

  90. +
    91. 

  91. +	ath79_init_mac(ath79_eth0_data.mac_addr, art + AP121_MAC0_OFFSET, 0);
    92. 

  92. +	ath79_init_mac(ath79_eth1_data.mac_addr, art + AP121_MAC1_OFFSET, 0);
    93. 

  93. +
    94. 

  94. +	ath79_register_mdio(0, 0x0);
    95. 

  95. +
    96. 

  96. +	/* LAN ports */
    97. 

  97. +	ath79_register_eth(1);
    98. 

  98. +
    99. 

  99. +	/* WAN port */
    100. 

  100. +	ath79_register_eth(0);
    101. 

  101. +}
    102. 

  102. +
    103. 

  103.  static void __init ap121_setup(void)
    104. 

  104.  {
    105. 

  105. -	u8 *cal_data = (u8 *) KSEG1ADDR(AP121_CAL_DATA_ADDR);
    106. 

  106. +	ap121_common_setup();
    107. 

  107.  
    108. 

  108.  	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap121_leds_gpio),
    109. 

  109.  				 ap121_leds_gpio);
    110. 

  110.  	ath79_register_gpio_keys_polled(-1, AP121_KEYS_POLL_INTERVAL,
    111. 

  111.  					ARRAY_SIZE(ap121_gpio_keys),
    112. 

  112.  					ap121_gpio_keys);
    113. 

  113. -
    114. 

  114. -	ath79_register_spi(&ap121_spi_data, ap121_spi_info,
    115. 

  115. -			   ARRAY_SIZE(ap121_spi_info));
    116. 

  116.  	ath79_register_usb();
    117. 

  117. -	ath79_register_wmac(cal_data, NULL);
    118. 

  118.  }
    119. 

  119.  
    120. 

  120.  MIPS_MACHINE(ATH79_MACH_AP121, "AP121", "Atheros AP121 reference board",
    121. 

  121.  	     ap121_setup);
    122. 

  122. +
    123. 

  123. +static void __init ap121_mini_setup(void)
    124. 

  124. +{
    125. 

  125. +	ap121_common_setup();
    126. 

  126. +
    127. 

  127. +	ath79_register_leds_gpio(-1, ARRAY_SIZE(ap121_mini_leds_gpio),
    128. 

  128. +				 ap121_mini_leds_gpio);
    129. 

  129. +	ath79_register_gpio_keys_polled(-1, AP121_KEYS_POLL_INTERVAL,
    130. 

  130. +					ARRAY_SIZE(ap121_mini_gpio_keys),
    131. 

  131. +					ap121_mini_gpio_keys);
    132. 

  132. +}
    133. 

  133. +
    134. 

  134. +MIPS_MACHINE(ATH79_MACH_AP121_MINI, "AP121-MINI", "Atheros AP121-MINI",
    135. 

  135. +	     ap121_mini_setup);
    136. 

  136. --- a/arch/mips/ath79/Kconfig
    137. 

  137. +++ b/arch/mips/ath79/Kconfig
    138. 

  138. @@ -6,9 +6,10 @@ menu "Atheros AR71XX/AR724X/AR913X machi
    139. 

  139.  config ATH79_MACH_AP121
    140. 

  140.  	bool "Atheros AP121 reference board"
    141. 

  141.  	select SOC_AR933X
    142. 

  142. +	select ATH79_DEV_ETH
    143. 

  143.  	select ATH79_DEV_GPIO_BUTTONS
    144. 

  144.  	select ATH79_DEV_LEDS_GPIO
    145. 

  145. -	select ATH79_DEV_SPI
    146. 

  146. +	select ATH79_DEV_M25P80
    147. 

  147.  	select ATH79_DEV_USB
    148. 

  148.  	select ATH79_DEV_WMAC
    149. 

  149.  	help
    150.