001-fix_gpio_config_on_linksys_boards.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. Some of the GPIO configs were wrong in the submitted DTS files,
  2. this patch fixes all affected boards.
  3. Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  4. Cc: <stable@vger.kernel.org> # v4.1 +
  5. ---
  6. arch/arm/boot/dts/armada-385-linksys.dtsi | 6 +++---
  7. arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 ++--
  8. 2 files changed, 5 insertions(+), 5 deletions(-)
  9. --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
  10. +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
  11. @@ -243,7 +243,7 @@
  12. button@2 {
  13. label = "Factory Reset Button";
  14. linux,code = <KEY_RESTART>;
  15. - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
  16. + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
  17. };
  18. };
  19. @@ -258,7 +258,7 @@
  20. };
  21. sata {
  22. - gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
  23. + gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
  24. default-state = "off";
  25. };
  26. };
  27. @@ -311,7 +311,7 @@
  28. &pinctrl {
  29. keys_pin: keys-pin {
  30. - marvell,pins = "mpp24", "mpp47";
  31. + marvell,pins = "mpp24", "mpp29";
  32. marvell,function = "gpio";
  33. };
  34. --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
  35. +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
  36. @@ -302,13 +302,13 @@
  37. button@1 {
  38. label = "WPS";
  39. linux,code = <KEY_WPS_BUTTON>;
  40. - gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
  41. + gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
  42. };
  43. button@2 {
  44. label = "Factory Reset Button";
  45. linux,code = <KEY_RESTART>;
  46. - gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
  47. + gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
  48. };
  49. };