Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/./mt7986a.dtsi b/./mt7986a_upstream.dtsi
- index e292c4f..a03d57d 100755
- --- a/./mt7986a.dtsi
- +++ b/./mt7986a_upstream.dtsi
- @@ -4,19 +4,19 @@
- * Author: Sam.Shih <[email protected]>
- */
- -#include <dt-bindings/clock/mt7986-clk.h>
- #include <dt-bindings/interrupt-controller/irq.h>
- #include <dt-bindings/interrupt-controller/arm-gic.h>
- -#include <dt-bindings/phy/phy.h>
- +#include <dt-bindings/clock/mt7986-clk.h>
- #include <dt-bindings/reset/mt7986-resets.h>
- -#include <dt-bindings/thermal/thermal.h>
- +#include <dt-bindings/phy/phy.h>
- / {
- + compatible = "mediatek,mt7986a";
- interrupt-parent = <&gic>;
- #address-cells = <2>;
- #size-cells = <2>;
- - clk40m: oscillator@0 {
- + clk40m: oscillator-40m {
- compatible = "fixed-clock";
- clock-frequency = <40000000>;
- #clock-cells = <0>;
- @@ -60,22 +60,14 @@
- };
- psci {
- - compatible = "arm,psci-0.2";
- - method = "smc";
- + compatible = "arm,psci-0.2";
- + method = "smc";
- };
- reserved-memory {
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
- -
- - /* 64 KiB reserved for ramoops/pstore */
- - ramoops@42ff0000 {
- - compatible = "ramoops";
- - reg = <0 0x42ff0000 0 0x10000>;
- - record-size = <0x1000>;
- - };
- -
- /* 192 KiB reserved for ARM Trusted Firmware (BL31) */
- secmon_reserved: secmon@43000000 {
- reg = <0 0x43000000 0 0x30000>;
- @@ -86,6 +78,47 @@
- no-map;
- reg = <0 0x4fc00000 0 0x00100000>;
- };
- +
- + wo_emi0: wo-emi@4fd00000 {
- + reg = <0 0x4fd00000 0 0x40000>;
- + no-map;
- + };
- +
- + wo_emi1: wo-emi@4fd40000 {
- + reg = <0 0x4fd40000 0 0x40000>;
- + no-map;
- + };
- +
- + wo_ilm0: wo-ilm@151e0000 {
- + reg = <0 0x151e0000 0 0x8000>;
- + no-map;
- + };
- +
- + wo_ilm1: wo-ilm@151f0000 {
- + reg = <0 0x151f0000 0 0x8000>;
- + no-map;
- + };
- +
- + wo_data: wo-data@4fd80000 {
- + reg = <0 0x4fd80000 0 0x240000>;
- + no-map;
- + };
- +
- + wo_dlm0: wo-dlm@151e8000 {
- + reg = <0 0x151e8000 0 0x2000>;
- + no-map;
- + };
- +
- + wo_dlm1: wo-dlm@151f8000 {
- + reg = <0 0x151f8000 0 0x2000>;
- + no-map;
- + };
- +
- + wo_boot: wo-boot@15194000 {
- + reg = <0 0x15194000 0 0x1000>;
- + no-map;
- + };
- +
- };
- timer {
- @@ -122,6 +155,12 @@
- #clock-cells = <1>;
- };
- + wed_pcie: wed-pcie@10003000 {
- + compatible = "mediatek,mt7986-wed-pcie",
- + "syscon";
- + reg = <0 0x10003000 0 0x10>;
- + };
- +
- topckgen: topckgen@1001b000 {
- compatible = "mediatek,mt7986-topckgen", "syscon";
- reg = <0 0x1001B000 0 0x1000>;
- @@ -129,11 +168,17 @@
- };
- watchdog: watchdog@1001c000 {
- - compatible = "mediatek,mt7986-wdt",
- - "mediatek,mt6589-wdt";
- + compatible = "mediatek,mt7986-wdt";
- reg = <0 0x1001c000 0 0x1000>;
- interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
- #reset-cells = <1>;
- + status = "disabled";
- + };
- +
- + apmixedsys: apmixedsys@1001e000 {
- + compatible = "mediatek,mt7986-apmixedsys";
- + reg = <0 0x1001E000 0 0x1000>;
- + #clock-cells = <1>;
- };
- pio: pinctrl@1001f000 {
- @@ -157,12 +202,6 @@
- #interrupt-cells = <2>;
- };
- - apmixedsys: apmixedsys@1001e000 {
- - compatible = "mediatek,mt7986-apmixedsys";
- - reg = <0 0x1001E000 0 0x1000>;
- - #clock-cells = <1>;
- - };
- -
- sgmiisys0: syscon@10060000 {
- compatible = "mediatek,mt7986-sgmiisys_0",
- "syscon";
- @@ -177,12 +216,13 @@
- #clock-cells = <1>;
- };
- - trng: trng@1020f000 {
- - compatible = "mediatek,mt7986-rng";
- + trng: rng@1020f000 {
- + compatible = "mediatek,mt7986-rng",
- + "mediatek,mt7623-rng";
- reg = <0 0x1020f000 0 0x100>;
- clocks = <&infracfg CLK_INFRA_TRNG_CK>;
- clock-names = "rng";
- - status = "okay";
- + status = "disabled";
- };
- crypto: crypto@10320000 {
- @@ -197,7 +237,7 @@
- clock-names = "infra_eip97_ck";
- assigned-clocks = <&topckgen CLK_TOP_EIP_B_SEL>;
- assigned-clock-parents = <&apmixedsys CLK_APMIXED_NET2PLL>;
- - status = "okay";
- + status = "disabled";
- };
- pwm: pwm@10048000 {
- @@ -206,7 +246,7 @@
- #clock-cells = <1>;
- #pwm-cells = <2>;
- interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
- - clocks = <&infracfg CLK_INFRA_PWM_HCK>,
- + clocks = <&topckgen CLK_TOP_PWM_SEL>,
- <&infracfg CLK_INFRA_PWM_STA>,
- <&infracfg CLK_INFRA_PWM1_CK>,
- <&infracfg CLK_INFRA_PWM2_CK>;
- @@ -271,6 +311,8 @@
- spi0: spi@1100a000 {
- compatible = "mediatek,mt7986-spi-ipm", "mediatek,spi-ipm";
- + #address-cells = <1>;
- + #size-cells = <0>;
- reg = <0 0x1100a000 0 0x100>;
- interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&topckgen CLK_TOP_MPLL_D2>,
- @@ -283,6 +325,8 @@
- spi1: spi@1100b000 {
- compatible = "mediatek,mt7986-spi-ipm", "mediatek,spi-ipm";
- + #address-cells = <1>;
- + #size-cells = <0>;
- reg = <0 0x1100b000 0 0x100>;
- interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&topckgen CLK_TOP_MPLL_D2>,
- @@ -294,13 +338,12 @@
- };
- auxadc: adc@1100d000 {
- - compatible = "mediatek,mt7986-auxadc",
- - "mediatek,mt7622-auxadc";
- + compatible = "mediatek,mt7986-auxadc";
- reg = <0 0x1100d000 0 0x1000>;
- - clocks = <&infracfg CLK_INFRA_ADC_26M_CK>,
- - <&infracfg CLK_INFRA_ADC_FRC_CK>;
- - clock-names = "main", "32k";
- + clocks = <&infracfg CLK_INFRA_ADC_26M_CK>;
- + clock-names = "main";
- #io-channel-cells = <1>;
- + status = "disabled";
- };
- ssusb: usb@11200000 {
- @@ -311,15 +354,15 @@
- reg-names = "mac", "ippc";
- interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&infracfg CLK_INFRA_IUSB_SYS_CK>,
- - <&topckgen CLK_TOP_U2U3_XHCI_SEL>,
- <&infracfg CLK_INFRA_IUSB_CK>,
- <&infracfg CLK_INFRA_IUSB_133_CK>,
- - <&infracfg CLK_INFRA_IUSB_66M_CK>;
- + <&infracfg CLK_INFRA_IUSB_66M_CK>,
- + <&topckgen CLK_TOP_U2U3_XHCI_SEL>;
- clock-names = "sys_ck",
- - "xhci_ck",
- "ref_ck",
- "mcu_ck",
- - "dma_ck";
- + "dma_ck",
- + "xhci_ck";
- phys = <&u2port0 PHY_TYPE_USB2>,
- <&u3port0 PHY_TYPE_USB3>,
- <&u2port1 PHY_TYPE_USB2>;
- @@ -331,15 +374,13 @@
- reg = <0 0x11230000 0 0x1000>,
- <0 0x11c20000 0 0x1000>;
- interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
- - clocks = <&infracfg CLK_INFRA_MSDC_CK>,
- + clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
- <&infracfg CLK_INFRA_MSDC_HCK_CK>,
- - <&infracfg CLK_INFRA_MSDC_66M_CK>,
- - <&infracfg CLK_INFRA_MSDC_133M_CK>;
- - clock-names = "source", "hclk", "axi_cg", "ahb_cg";
- - assigned-clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
- - <&topckgen CLK_TOP_EMMC_250M_SEL>;
- - assigned-clock-parents = <&apmixedsys CLK_APMIXED_MPLL>,
- - <&topckgen CLK_TOP_NET1PLL_D5_D2>;
- + <&infracfg CLK_INFRA_MSDC_CK>,
- + <&infracfg CLK_INFRA_MSDC_133M_CK>,
- + <&infracfg CLK_INFRA_MSDC_66M_CK>;
- + clock-names = "source", "hclk", "source_cg", "bus_clk",
- + "sys_cg";
- status = "disabled";
- };
- @@ -370,11 +411,11 @@
- bus-range = <0x00 0xff>;
- ranges = <0x82000000 0x00 0x20000000 0x00
- 0x20000000 0x00 0x10000000>;
- - clocks = <&infracfg CLK_INFRA_PCIE_SEL>,
- + clocks = <&infracfg CLK_INFRA_IPCIE_PIPE_CK>,
- <&infracfg CLK_INFRA_IPCIE_CK>,
- - <&infracfg CLK_INFRA_IPCIE_PIPE_CK>,
- <&infracfg CLK_INFRA_IPCIER_CK>,
- <&infracfg CLK_INFRA_IPCIEB_CK>;
- + clock-names = "pl_250m", "tl_26m", "peri_26m", "top_133m";
- status = "disabled";
- phys = <&pcie_port PHY_TYPE_PCIE>;
- @@ -395,7 +436,7 @@
- pcie_phy: t-phy@11c00000 {
- compatible = "mediatek,mt7986-tphy",
- - "mediatek,generic-tphy-v4";
- + "mediatek,generic-tphy-v2";
- #address-cells = <2>;
- #size-cells = <2>;
- ranges;
- @@ -406,30 +447,11 @@
- clocks = <&clk40m>;
- clock-names = "ref";
- #phy-cells = <1>;
- - auto_load_valid;
- - auto_load_valid_ln1;
- - nvmem-cells = <&pcie_intr_ln0>,
- - <&pcie_rx_imp_ln0>,
- - <&pcie_tx_imp_ln0>,
- - <&pcie_auto_load_valid_ln0>,
- - <&pcie_intr_ln1>,
- - <&pcie_rx_imp_ln1>,
- - <&pcie_tx_imp_ln1>,
- - <&pcie_auto_load_valid_ln1>;
- - nvmem-cell-names = "intr",
- - "rx_imp",
- - "tx_imp",
- - "auto_load_valid",
- - "intr_ln1",
- - "rx_imp_ln1",
- - "tx_imp_ln1",
- - "auto_load_valid_ln1";
- };
- };
- efuse: efuse@11d00000 {
- - compatible = "mediatek,mt7986-efuse",
- - "mediatek,efuse";
- + compatible = "mediatek,mt7986-efuse", "mediatek,efuse";
- reg = <0 0x11d00000 0 0x1000>;
- #address-cells = <1>;
- #size-cells = <1>;
- @@ -437,154 +459,61 @@
- thermal_calibration: calib@274 {
- reg = <0x274 0xc>;
- };
- -
- - comb_auto_load_valid: usb3-alv-imp@8da {
- - reg = <0x8da 1>;
- - bits = <0 1>;
- - };
- -
- - comb_rx_imp_p0: usb3-rx-imp@8d8 {
- - reg = <0x8d8 1>;
- - bits = <0 5>;
- - };
- -
- - comb_tx_imp_p0: usb3-tx-imp@8d8 {
- - reg = <0x8d8 2>;
- - bits = <5 5>;
- - };
- -
- - comb_intr_p0: usb3-intr@8d9 {
- - reg = <0x8d9 1>;
- - bits = <2 6>;
- - };
- -
- - u2_auto_load_valid_p0: usb2-alv-p0@8e0 {
- - reg = <0x8e0 1>;
- - bits = <0 1>;
- - };
- -
- - u2_intr_p0: usb2-intr-p0@8e0 {
- - reg = <0x8e0 1>;
- - bits = <1 5>;
- - };
- -
- - u2_auto_load_valid_p1: usb2-alv-p1@8e0 {
- - reg = <0x8e0 2>;
- - bits = <6 1>;
- - };
- -
- - u2_intr_p1: usb2-intr-p1@8e0 {
- - reg = <0x8e0 2>;
- - bits = <7 5>;
- - };
- -
- - pcie_rx_imp_ln0: pcie-rx-imp@8d0 {
- - reg = <0x8d0 1>;
- - bits = <0 5>;
- - };
- -
- - pcie_tx_imp_ln0: pcie-tx-imp@8d0 {
- - reg = <0x8d0 2>;
- - bits = <5 5>;
- - };
- -
- - pcie_intr_ln0: pcie-intr@8d1 {
- - reg = <0x8d1 1>;
- - bits = <2 6>;
- - };
- -
- - pcie_auto_load_valid_ln0: pcie-ln0-alv@8d4 {
- - reg = <0x8d4 1>;
- - bits = <0 1>;
- - };
- -
- - pcie_rx_imp_ln1: pcie-rx-imp@8d2 {
- - reg = <0x8d2 1>;
- - bits = <0 5>;
- - };
- -
- - pcie_tx_imp_ln1: pcie-tx-imp@8d2 {
- - reg = <0x8d2 2>;
- - bits = <5 5>;
- - };
- -
- - pcie_intr_ln1: pcie-intr@8d3 {
- - reg = <0x8d3 1>;
- - bits = <2 6>;
- - };
- -
- - pcie_auto_load_valid_ln1: pcie-ln1-alv@8d4 {
- - reg = <0x8d4 1>;
- - bits = <1 1>;
- - };
- };
- usb_phy: t-phy@11e10000 {
- compatible = "mediatek,mt7986-tphy",
- "mediatek,generic-tphy-v2";
- - #address-cells = <2>;
- - #size-cells = <2>;
- - ranges;
- + #address-cells = <1>;
- + #size-cells = <1>;
- + ranges = <0 0 0x11e10000 0x1700>;
- status = "disabled";
- - u2port0: usb-phy@11e10000 {
- - reg = <0 0x11e10000 0 0x700>;
- + u2port0: usb-phy@0 {
- + reg = <0x0 0x700>;
- clocks = <&topckgen CLK_TOP_DA_U2_REFSEL>,
- <&topckgen CLK_TOP_DA_U2_CK_1P_SEL>;
- clock-names = "ref", "da_ref";
- #phy-cells = <1>;
- - auto_load_valid;
- - nvmem-cells = <&u2_intr_p0>, <&u2_auto_load_valid_p0>;
- - nvmem-cell-names = "intr", "auto_load_valid";
- };
- - u3port0: usb-phy@11e10700 {
- - reg = <0 0x11e10700 0 0x900>;
- + u3port0: usb-phy@700 {
- + reg = <0x700 0x900>;
- clocks = <&topckgen CLK_TOP_USB3_PHY_SEL>;
- clock-names = "ref";
- #phy-cells = <1>;
- - auto_load_valid;
- - nvmem-cells = <&comb_intr_p0>,
- - <&comb_rx_imp_p0>,
- - <&comb_tx_imp_p0>,
- - <&comb_auto_load_valid>;
- - nvmem-cell-names = "intr", "rx_imp", "tx_imp", "auto_load_valid";
- };
- - u2port1: usb-phy@11e11000 {
- - reg = <0 0x11e11000 0 0x700>;
- + u2port1: usb-phy@1000 {
- + reg = <0x1000 0x700>;
- clocks = <&topckgen CLK_TOP_DA_U2_REFSEL>,
- <&topckgen CLK_TOP_DA_U2_CK_1P_SEL>;
- clock-names = "ref", "da_ref";
- #phy-cells = <1>;
- - auto_load_valid;
- - nvmem-cells = <&u2_intr_p1>, <&u2_auto_load_valid_p1>;
- - nvmem-cell-names = "intr", "auto_load_valid";
- };
- };
- ethsys: syscon@15000000 {
- #address-cells = <1>;
- #size-cells = <1>;
- - compatible = "mediatek,mt7986-ethsys_ck",
- + compatible = "mediatek,mt7986-ethsys",
- "syscon";
- reg = <0 0x15000000 0 0x1000>;
- #clock-cells = <1>;
- #reset-cells = <1>;
- };
- - wed_pcie: wed-pcie@10003000 {
- - compatible = "mediatek,mt7986-wed-pcie",
- - "syscon";
- - reg = <0 0x10003000 0 0x10>;
- - };
- -
- wed0: wed@15010000 {
- compatible = "mediatek,mt7986-wed",
- "syscon";
- reg = <0 0x15010000 0 0x1000>;
- interrupt-parent = <&gic>;
- interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
- + memory-region = <&wo_emi0>, <&wo_ilm0>, <&wo_dlm0>,
- + <&wo_data>, <&wo_boot>;
- + memory-region-names = "wo-emi", "wo-ilm", "wo-dlm",
- + "wo-data", "wo-boot";
- + mediatek,wo-ccif = <&wo_ccif0>;
- };
- wed1: wed@15011000 {
- @@ -593,6 +522,25 @@
- reg = <0 0x15011000 0 0x1000>;
- interrupt-parent = <&gic>;
- interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
- + memory-region = <&wo_emi1>, <&wo_ilm1>, <&wo_dlm1>,
- + <&wo_data>, <&wo_boot>;
- + memory-region-names = "wo-emi", "wo-ilm", "wo-dlm",
- + "wo-data", "wo-boot";
- + mediatek,wo-ccif = <&wo_ccif1>;
- + };
- +
- + wo_ccif0: syscon@151a5000 {
- + compatible = "mediatek,mt7986-wo-ccif", "syscon";
- + reg = <0 0x151a5000 0 0x1000>;
- + interrupt-parent = <&gic>;
- + interrupts = <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>;
- + };
- +
- + wo_ccif1: syscon@151ad000 {
- + compatible = "mediatek,mt7986-wo-ccif", "syscon";
- + reg = <0 0x151ad000 0 0x1000>;
- + interrupt-parent = <&gic>;
- + interrupts = <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>;
- };
- eth: ethernet@15100000 {
- @@ -637,95 +585,49 @@
- status = "disabled";
- };
- - consys: consys@10000000 {
- - compatible = "mediatek,mt7986-consys";
- - reg = <0 0x10000000 0 0x8600000>;
- - memory-region = <&wmcpu_emi>;
- - };
- -
- - wmac: wmac@18000000 {
- - compatible = "mediatek,mt7986-wmac", "mediatek,wbsys";
- - resets = <&watchdog MT7986_TOPRGU_CONSYS_RST>;
- + wifi: wifi@18000000 {
- + compatible = "mediatek,mt7986-wmac";
- + resets = <&watchdog MT7986_TOPRGU_CONSYS_SW_RST>;
- reset-names = "consys";
- + clocks = <&topckgen CLK_TOP_CONN_MCUSYS_SEL>,
- + <&topckgen CLK_TOP_AP2CNN_HOST_SEL>;
- + clock-names = "mcu", "ap2conn";
- reg = <0 0x18000000 0 0x1000000>,
- <0 0x10003000 0 0x1000>,
- <0 0x11d10000 0 0x1000>;
- interrupts = <GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 214 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>,
- - <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>;
- - clocks = <&topckgen CLK_TOP_CONN_MCUSYS_SEL>,
- - <&topckgen CLK_TOP_AP2CNN_HOST_SEL>;
- - clock-names = "mcu", "ap2conn";
- + <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
- memory-region = <&wmcpu_emi>;
- - status = "disabled";
- };
- };
- - fan: pwm-fan {
- - compatible = "pwm-fan";
- - /* cooling level (0, 1, 2, 3) : (0% duty, 33% duty, 66% duty, 100% duty) */
- - cooling-levels = <0 86 172 255>;
- - #cooling-cells = <2>;
- - status = "disabled";
- - };
- -
- thermal-zones {
- cpu_thermal: cpu-thermal {
- polling-delay-passive = <1000>;
- polling-delay = <1000>;
- thermal-sensors = <&thermal 0>;
- - trips {
- - cpu_trip_crit: crit {
- - temperature = <125000>;
- - hysteresis = <2000>;
- - type = "critical";
- - };
- -
- - cpu_trip_hot: hot {
- - temperature = <120000>;
- - hysteresis = <2000>;
- - type = "hot";
- - };
- + trips {
- cpu_trip_active_high: active-high {
- temperature = <115000>;
- hysteresis = <2000>;
- type = "active";
- };
- - cpu_trip_active_med: active-med {
- + cpu_trip_active_low: active-low {
- temperature = <85000>;
- hysteresis = <2000>;
- type = "active";
- };
- - cpu_trip_active_low: active-low {
- - temperature = <60000>;
- + cpu_trip_passive: passive {
- + temperature = <40000>;
- hysteresis = <2000>;
- type = "passive";
- };
- };
- -
- - cooling-maps {
- - cpu-active-high {
- - /* active: set fan to cooling level 3 */
- - cooling-device = <&fan 3 3>;
- - trip = <&cpu_trip_active_high>;
- - };
- -
- - cpu-active-med {
- - /* active: set fan to cooling level 2 */
- - cooling-device = <&fan 2 2>;
- - trip = <&cpu_trip_active_med>;
- - };
- -
- - cpu-active-low {
- - /* passive: set fan to cooling level 1 */
- - cooling-device = <&fan 1 1>;
- - trip = <&cpu_trip_active_low>;
- - };
- - };
- };
- };
- };
- \ No newline at end of file
Advertisement
Add Comment
Please, Sign In to add comment