Home Explore Help
Register Sign In
wareck
/
openwrt-archive
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
openwrt-archive
/
target
/
linux
/
ar71xx
/
patches-4.1
/
739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch

739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch 1.3 KB
Permalink History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445 
  1. --- a/arch/mips/ath79/gpio.c
    2. 

  2. +++ b/arch/mips/ath79/gpio.c
    3. 

  3. @@ -186,6 +186,7 @@ static void __iomem *ath79_gpio_get_func
    4. 

  4.  		reg = AR71XX_GPIO_REG_FUNC;
    5. 

  5.  	else if (soc_is_ar934x() ||
    6. 

  6.  		 soc_is_qca953x() ||
    7. 

  7. +		 soc_is_qca955x() ||
    8. 

  8.  		 soc_is_qca956x() ||
    9. 

  9.  		 soc_is_tp9343())
    10. 

  10.  		reg = AR934X_GPIO_REG_FUNC;
    11. 

  11. @@ -223,15 +224,30 @@ void __init ath79_gpio_output_select(uns
    12. 

  12.  {
    13. 

  13.  	void __iomem *base = ath79_gpio_base;
    14. 

  14.  	unsigned long flags;
    15. 

  15. -	unsigned int reg;
    16. 

  16. +	unsigned int reg, reg_base;
    17. 

  17. +	unsigned long gpio_count;
    18. 

  18.  	u32 t, s;
    19. 

  19.  
    20. 

  20. -	BUG_ON(!soc_is_ar934x() && !soc_is_qca953x() && !soc_is_qca956x());
    21. 

  21. +	if (soc_is_ar934x()) {
    22. 

  22. +		gpio_count = AR934X_GPIO_COUNT;
    23. 

  23. +		reg_base = AR934X_GPIO_REG_OUT_FUNC0;
    24. 

  24. +	} else if (soc_is_qca953x()) {
    25. 

  25. +		gpio_count = QCA953X_GPIO_COUNT;
    26. 

  26. +		reg_base = QCA953X_GPIO_REG_OUT_FUNC0;
    27. 

  27. +	} else if (soc_is_qca955x()) {
    28. 

  28. +		gpio_count = QCA955X_GPIO_COUNT;
    29. 

  29. +		reg_base = QCA955X_GPIO_REG_OUT_FUNC0;
    30. 

  30. +	} else if (soc_is_qca956x()) {
    31. 

  31. +		gpio_count = QCA956X_GPIO_COUNT;
    32. 

  32. +		reg_base = QCA956X_GPIO_REG_OUT_FUNC0;
    33. 

  33. +	} else {
    34. 

  34. +		BUG();
    35. 

  35. +	}
    36. 

  36.  
    37. 

  37. -	if (gpio >= AR934X_GPIO_COUNT)
    38. 

  38. +	if (gpio >= gpio_count)
    39. 

  39.  		return;
    40. 

  40.  
    41. 

  41. -	reg = AR934X_GPIO_REG_OUT_FUNC0 + 4 * (gpio / 4);
    42. 

  42. +	reg = reg_base + 4 * (gpio / 4);
    43. 

  43.  	s = 8 * (gpio % 4);
    44. 

  44.  
    45. 

  45.  	spin_lock_irqsave(&ath79_gpio_lock, flags);
    46.