100-dts-update-mt7622-rfb1.patch 2.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107
  1. --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
  2. +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
  3. @@ -1,7 +1,6 @@
  4. /*
  5. - * Copyright (c) 2017 MediaTek Inc.
  6. - * Author: Ming Huang <[email protected]>
  7. - * Sean Wang <[email protected]>
  8. + * Copyright (c) 2018 MediaTek Inc.
  9. + * Author: Ryder Lee <[email protected]>
  10. *
  11. * SPDX-License-Identifier: (GPL-2.0 OR MIT)
  12. */
  13. @@ -24,7 +23,7 @@
  14. chosen {
  15. stdout-path = "serial0:115200n8";
  16. - bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512";
  17. + bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512";
  18. };
  19. cpus {
  20. @@ -45,18 +44,18 @@
  21. key-factory {
  22. label = "factory";
  23. linux,code = <BTN_0>;
  24. - gpios = <&pio 0 0>;
  25. + gpios = <&pio 0 GPIO_ACTIVE_LOW>;
  26. };
  27. key-wps {
  28. label = "wps";
  29. linux,code = <KEY_WPS_BUTTON>;
  30. - gpios = <&pio 102 0>;
  31. + gpios = <&pio 102 GPIO_ACTIVE_LOW>;
  32. };
  33. };
  34. memory@40000000 {
  35. - reg = <0 0x40000000 0 0x20000000>;
  36. + reg = <0 0x40000000 0 0x40000000>;
  37. };
  38. reg_1p8v: regulator-1p8v {
  39. @@ -132,22 +131,22 @@
  40. port@0 {
  41. reg = <0>;
  42. - label = "lan0";
  43. + label = "lan1";
  44. };
  45. port@1 {
  46. reg = <1>;
  47. - label = "lan1";
  48. + label = "lan2";
  49. };
  50. port@2 {
  51. reg = <2>;
  52. - label = "lan2";
  53. + label = "lan3";
  54. };
  55. port@3 {
  56. reg = <3>;
  57. - label = "lan3";
  58. + label = "lan4";
  59. };
  60. port@4 {
  61. @@ -240,7 +239,22 @@
  62. status = "okay";
  63. };
  64. +&pcie1 {
  65. + pinctrl-names = "default";
  66. + pinctrl-0 = <&pcie1_pins>;
  67. + status = "okay";
  68. +};
  69. +
  70. &pio {
  71. + /* Attention: GPIO 90 is used to switch between PCIe@1,0 and
  72. + * SATA functions. i.e. output-high: PCIe, output-low: SATA
  73. + */
  74. + asm_sel {
  75. + gpio-hog;
  76. + gpios = <90 GPIO_ACTIVE_HIGH>;
  77. + output-high;
  78. + };
  79. +
  80. /* eMMC is shared pin with parallel NAND */
  81. emmc_pins_default: emmc-pins-default {
  82. mux {
  83. @@ -517,11 +531,11 @@
  84. };
  85. &sata {
  86. - status = "okay";
  87. + status = "disabled";
  88. };
  89. &sata_phy {
  90. - status = "okay";
  91. + status = "disabled";
  92. };
  93. &spi0 {