Advertisement
Guest User

Untitled

a guest
Nov 7th, 2018
253
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.64 KB | None | 0 0
  1. diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
  2. index 1cdc346a0..f64a95ac9 100644
  3. --- a/arch/arm/boot/dts/mt7623.dtsi
  4. +++ b/arch/arm/boot/dts/mt7623.dtsi
  5. @@ -683,6 +683,29 @@
  6. status = "disabled";
  7. };
  8.  
  9. + consys: consys@18070000 {
  10. + compatible = "mediatek,mt7623-consys";
  11. + reg = <0 0x18070000 0 0x0200>, /*CONN_MCU_CONFIG_BASE */
  12. + <0 0x10001000 0 0x1600>; /*TOPCKGEN_BASE */
  13. + clocks = <&infracfg CLK_INFRA_CONNMCU>;
  14. + clock-names = "consysbus";
  15. + power-domains = <&scpsys MT2701_POWER_DOMAIN_CONN>;
  16. + interrupts = <GIC_SPI 185 IRQ_TYPE_LEVEL_LOW>, /* BGF_EINT */
  17. + <GIC_SPI 163 IRQ_TYPE_LEVEL_LOW>; /* WDT_EINT */
  18. + resets = <&watchdog MT2701_TOPRGU_CONN_MCU_RST>;
  19. + reset-names = "connsys";
  20. + status="disabled";
  21. + };
  22. +
  23. + wifi: wifi@180f0000 {
  24. + compatible = "mediatek,mt7623-wifi",
  25. + "mediatek,wifi";
  26. + reg = <0 0x180f0000 0 0x005c>;
  27. + interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_LOW>;
  28. + clocks = <&pericfg CLK_PERI_AP_DMA>;
  29. + clock-names = "wifi-dma";
  30. + };
  31. +
  32. hifsys: syscon@1a000000 {
  33. compatible = "mediatek,mt7623-hifsys",
  34. "mediatek,mt2701-hifsys",
  35. @@ -898,6 +921,24 @@
  36. #dma-cells = <1>;
  37. };
  38.  
  39. + consys_pins_default: consys_pins_default {
  40. + adie {
  41. + pinmux = <MT7623_PIN_60_WB_RSTB_FUNC_WB_RSTB>,
  42. + <MT7623_PIN_61_GPIO61_FUNC_TEST_FD>,
  43. + <MT7623_PIN_62_GPIO62_FUNC_TEST_FC>,
  44. + <MT7623_PIN_63_WB_SCLK_FUNC_WB_SCLK>,
  45. + <MT7623_PIN_64_WB_SDATA_FUNC_WB_SDATA>,
  46. + <MT7623_PIN_65_WB_SEN_FUNC_WB_SEN>,
  47. + <MT7623_PIN_66_WB_CRTL0_FUNC_WB_CRTL0>,
  48. + <MT7623_PIN_67_WB_CRTL1_FUNC_WB_CRTL1>,
  49. + <MT7623_PIN_68_WB_CRTL2_FUNC_WB_CRTL2>,
  50. + <MT7623_PIN_69_WB_CRTL3_FUNC_WB_CRTL3>,
  51. + <MT7623_PIN_70_WB_CRTL4_FUNC_WB_CRTL4>,
  52. + <MT7623_PIN_71_WB_CRTL5_FUNC_WB_CRTL5>;
  53. + bias-disable;
  54. + };
  55. + };
  56. +
  57. eth: ethernet@1b100000 {
  58. compatible = "mediatek,mt7623-eth",
  59. "mediatek,mt2701-eth",
  60. diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
  61. index 2b760f90f..d0c5253a4 100644
  62. --- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
  63. +++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
  64. @@ -112,6 +112,19 @@
  65. device_type = "memory";
  66. reg = <0 0x80000000 0 0x80000000>;
  67. };
  68. +
  69. + reserved-memory {
  70. + #address-cells = <2>;
  71. + #size-cells = <2>;
  72. + ranges;
  73. + consys-reserve-memory {
  74. + compatible = "mediatek,consys-reserve-memory";
  75. + no-map;
  76. + size = <0 0x100000>;
  77. + alignment = <0 0x100000>;
  78. + };
  79. + };
  80. +
  81. };
  82.  
  83. &btif {
  84. @@ -287,6 +300,17 @@
  85. status = "okay";
  86. };
  87.  
  88. +&consys {
  89. + mediatek,pwrap-regmap = <&pwrap>;
  90. + pinctrl-names = "default";
  91. + pinctrl-0 = <&consys_pins_default>;
  92. + vcn18-supply = <&mt6323_vcn18_reg>;
  93. + vcn28-supply = <&mt6323_vcn28_reg>;
  94. + vcn33_bt-supply = <&mt6323_vcn33_bt_reg>;
  95. + vcn33_wifi-supply = <&mt6323_vcn33_wifi_reg>;
  96. + status = "okay";
  97. +};
  98. +
  99. &spi0 {
  100. pinctrl-names = "default";
  101. pinctrl-0 = <&spi0_pins_a>;
  102. @@ -331,3 +355,6 @@
  103. status = "okay";
  104. };
  105.  
  106. +&watchdog {
  107. + status = "okay";
  108. +};
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement