1
0

820-MIPS-ath79-add_gpio_function2_setup.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  1. Add access to the function2 gpio register. This probably has to be
  2. converted into a pimux driver later on. This is needed for some setup
  3. functions on the Arduino Yun.
  4. --- a/arch/mips/ath79/common.h
  5. +++ b/arch/mips/ath79/common.h
  6. @@ -30,6 +30,7 @@ void ath79_ddr_wb_flush(unsigned int reg
  7. void ath79_gpio_function_enable(u32 mask);
  8. void ath79_gpio_function_disable(u32 mask);
  9. void ath79_gpio_function_setup(u32 set, u32 clear);
  10. +void ath79_gpio_function2_setup(u32 set, u32 clear);
  11. void ath79_gpio_output_select(unsigned gpio, u8 val);
  12. int ath79_gpio_direction_select(unsigned gpio, bool oe);
  13. void ath79_gpio_init(void);
  14. --- a/arch/mips/ath79/gpio.c
  15. +++ b/arch/mips/ath79/gpio.c
  16. @@ -43,6 +43,31 @@ static void __iomem *ath79_gpio_get_func
  17. return ath79_gpio_base + reg;
  18. }
  19. +static void __iomem *ath79_gpio_get_function2_reg(void)
  20. +{
  21. + u32 reg = 0;
  22. +
  23. + if (soc_is_ar71xx() ||
  24. + soc_is_ar724x() ||
  25. + soc_is_ar913x() ||
  26. + soc_is_ar933x())
  27. + reg = AR71XX_GPIO_REG_FUNC_2;
  28. + else
  29. + BUG();
  30. +
  31. + return ath79_gpio_base + reg;
  32. +}
  33. +
  34. +
  35. +void ath79_gpio_function2_setup(u32 set, u32 clear)
  36. +{
  37. + void __iomem *reg = ath79_gpio_get_function2_reg();
  38. +
  39. + __raw_writel((__raw_readl(reg) & ~clear) | set, reg);
  40. + /* flush write */
  41. + __raw_readl(reg);
  42. +}
  43. +
  44. void ath79_gpio_function_setup(u32 set, u32 clear)
  45. {
  46. void __iomem *reg = ath79_gpio_get_function_reg();
  47. --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
  48. +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
  49. @@ -855,6 +855,7 @@
  50. #define AR71XX_GPIO_REG_INT_PENDING 0x20
  51. #define AR71XX_GPIO_REG_INT_ENABLE 0x24
  52. #define AR71XX_GPIO_REG_FUNC 0x28
  53. +#define AR71XX_GPIO_REG_FUNC_2 0x30
  54. #define AR934X_GPIO_REG_OUT_FUNC0 0x2c
  55. #define AR934X_GPIO_REG_OUT_FUNC1 0x30
  56. @@ -979,6 +980,8 @@
  57. #define AR724X_GPIO_FUNC_UART_EN BIT(1)
  58. #define AR724X_GPIO_FUNC_JTAG_DISABLE BIT(0)
  59. +#define AR933X_GPIO_FUNC2_JUMPSTART_DISABLE BIT(9)
  60. +
  61. #define AR913X_GPIO_FUNC_WMAC_LED_EN BIT(22)
  62. #define AR913X_GPIO_FUNC_EXP_PORT_CS_EN BIT(21)
  63. #define AR913X_GPIO_FUNC_I2S_REFCLKEN BIT(20)