| From be48305fd2e3ecd9a9853f2ae11fb9432e40b299 Mon Sep 17 00:00:00 2001 |
| From: Bo Jiao <Bo.Jiao@mediatek.com> |
| Date: Mon, 18 Sep 2023 10:55:08 +0800 |
| Subject: [PATCH 03/22] dts mt7986 wed changes |
| |
| --- |
| arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 33 ++++++++--------------- |
| arch/arm64/boot/dts/mediatek/mt7986b.dtsi | 33 ++++++++--------------- |
| 2 files changed, 22 insertions(+), 44 deletions(-) |
| |
| diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi |
| index e43c306..e5d4e12 100644 |
| --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi |
| +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi |
| @@ -58,32 +58,20 @@ |
| }; |
| }; |
| |
| - wed: wed@15010000 { |
| - compatible = "mediatek,wed"; |
| - wed_num = <2>; |
| - /* add this property for wed get the pci slot number. */ |
| - pci_slot_map = <0>, <1>; |
| - reg = <0 0x15010000 0 0x1000>, |
| - <0 0x15011000 0 0x1000>; |
| + wed0: wed@15010000 { |
| + compatible = "mediatek,mt7986-wed", |
| + "syscon"; |
| + reg = <0 0x15010000 0 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>, |
| - <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>; |
| + interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| - wed2: wed2@15011000 { |
| - compatible = "mediatek,wed2"; |
| - wed_num = <2>; |
| - reg = <0 0x15010000 0 0x1000>, |
| - <0 0x15011000 0 0x1000>; |
| + wed1: wed@15011000 { |
| + compatible = "mediatek,mt7986-wed", |
| + "syscon"; |
| + reg = <0 0x15011000 0 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>, |
| - <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>; |
| - }; |
| - |
| - wdma: wdma@15104800 { |
| - compatible = "mediatek,wed-wdma"; |
| - reg = <0 0x15104800 0 0x400>, |
| - <0 0x15104c00 0 0x400>; |
| + interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| ap2woccif: ap2woccif@151A5000 { |
| @@ -507,6 +495,7 @@ |
| <&topckgen CK_TOP_CB_SGM_325M>; |
| mediatek,ethsys = <ðsys>; |
| mediatek,sgmiisys = <&sgmiisys0>, <&sgmiisys1>; |
| + mediatek,wed = <&wed0>, <&wed1>; |
| #reset-cells = <1>; |
| #address-cells = <1>; |
| #size-cells = <0>; |
| diff --git a/arch/arm64/boot/dts/mediatek/mt7986b.dtsi b/arch/arm64/boot/dts/mediatek/mt7986b.dtsi |
| index 21d8357..2d2207f 100644 |
| --- a/arch/arm64/boot/dts/mediatek/mt7986b.dtsi |
| +++ b/arch/arm64/boot/dts/mediatek/mt7986b.dtsi |
| @@ -58,32 +58,20 @@ |
| }; |
| }; |
| |
| - wed: wed@15010000 { |
| - compatible = "mediatek,wed"; |
| - wed_num = <2>; |
| - /* add this property for wed get the pci slot number. */ |
| - pci_slot_map = <0>, <1>; |
| - reg = <0 0x15010000 0 0x1000>, |
| - <0 0x15011000 0 0x1000>; |
| + wed0: wed@15010000 { |
| + compatible = "mediatek,mt7986-wed", |
| + "syscon"; |
| + reg = <0 0x15010000 0 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>, |
| - <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>; |
| + interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| - wed2: wed2@15011000 { |
| - compatible = "mediatek,wed2"; |
| - wed_num = <2>; |
| - reg = <0 0x15010000 0 0x1000>, |
| - <0 0x15011000 0 0x1000>; |
| + wed1: wed@15011000 { |
| + compatible = "mediatek,mt7986-wed", |
| + "syscon"; |
| + reg = <0 0x15011000 0 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>, |
| - <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>; |
| - }; |
| - |
| - wdma: wdma@15104800 { |
| - compatible = "mediatek,wed-wdma"; |
| - reg = <0 0x15104800 0 0x400>, |
| - <0 0x15104c00 0 0x400>; |
| + interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| ap2woccif: ap2woccif@151A5000 { |
| @@ -409,6 +397,7 @@ |
| <&topckgen CK_TOP_CB_SGM_325M>; |
| mediatek,ethsys = <ðsys>; |
| mediatek,sgmiisys = <&sgmiisys0>, <&sgmiisys1>; |
| + mediatek,wed = <&wed0>, <&wed1>; |
| #reset-cells = <1>; |
| #address-cells = <1>; |
| #size-cells = <0>; |
| diff --git a/arch/arm64/boot/dts/mediatek/mt7981.dtsi b/arch/arm64/boot/dts/mediatek/mt7981.dtsi |
| index ccaf0ad0..b2f53b13 100644 |
| --- a/arch/arm64/boot/dts/mediatek/mt7981.dtsi |
| +++ b/arch/arm64/boot/dts/mediatek/mt7981.dtsi |
| @@ -90,22 +90,12 @@ |
| #io-channel-cells = <1>; |
| }; |
| |
| - wed: wed@15010000 { |
| - compatible = "mediatek,wed"; |
| - wed_num = <2>; |
| - /* add this property for wed get the pci slot number. */ |
| - pci_slot_map = <0>, <1>; |
| - reg = <0 0x15010000 0 0x1000>, |
| - <0 0x15011000 0 0x1000>; |
| + wed0: wed@15010000 { |
| + compatible = "mediatek,mt7981-wed", |
| + "syscon"; |
| + reg = <0 0x15010000 0 0x1000>; |
| interrupt-parent = <&gic>; |
| - interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>, |
| - <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>; |
| - }; |
| - |
| - wdma: wdma@15104800 { |
| - compatible = "mediatek,wed-wdma"; |
| - reg = <0 0x15104800 0 0x400>, |
| - <0 0x15104c00 0 0x400>; |
| + interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>; |
| }; |
| |
| ap2woccif: ap2woccif@151A5000 { |
| @@ -423,6 +413,7 @@ |
| mediatek,ethsys = <ðsys>; |
| mediatek,sgmiisys = <&sgmiisys0>, <&sgmiisys1>; |
| mediatek,infracfg = <&topmisc>; |
| + mediatek,wed = <&wed0>; |
| #reset-cells = <1>; |
| #address-cells = <1>; |
| #size-cells = <0>; |
| diff --git a/arch/arm64/boot/dts/mediatek/mt7981-spim-nor-rfb.dts b/arch/arm64/boot/dts/mediatek/mt7981-spim-nor-rfb.dts |
| index 3fa55a07..f5c70a4e 100755 |
| --- a/arch/arm64/boot/dts/mediatek/mt7981-spim-nor-rfb.dts |
| +++ b/arch/arm64/boot/dts/mediatek/mt7981-spim-nor-rfb.dts |
| @@ -211,11 +211,3 @@ |
| &xhci { |
| status = "okay"; |
| }; |
| - |
| -&wed { |
| - dy_txbm_enable = "true"; |
| - dy_txbm_budget = <8>; |
| - txbm_init_sz = <8>; |
| - txbm_max_sz = <32>; |
| - status = "okay"; |
| -}; |
| -- |
| 2.18.0 |
| |