samsung_sm8750/android_kernel_samsung_sm8750-devicetrees
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge a3cf55a9ba on remote branch

Browse Source 
Change-Id: I57366feeeac9f576a953092964a664024c9f88f8
This commit is contained in:
Linux Build Service Account
2025-01-04 07:42:42 -08:00
parent bc9eca514b a3cf55a9ba
commit 4eb748d159
9 changed files with 152 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Kbuild
View File

@@ -1,3 +1,8 @@
ifeq ($(CONFIG_ARCH_CANOE),y)
dtbo-y += canoe-kiwi-cnss.dtbo
dtbo-y += canoe-peach-cnss.dtbo
endif
ifeq ($(CONFIG_ARCH_SUN),y) ifeq ($(CONFIG_ARCH_SUN),y)
dtbo-y += sun-kiwi-cnss.dtbo dtbo-y += sun-kiwi-cnss.dtbo
dtbo-y += sun-kiwi-cnss-v8.dtbo dtbo-y += sun-kiwi-cnss-v8.dtbo

49
canoe-kiwi-cnss.dtsi
View File

@@ -96,16 +96,47 @@
vdd-wlan-io12-supply = <&L3G>; vdd-wlan-io12-supply = <&L3G>;
qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>;
vdd-wlan-cx-supply = <&S1J>; vdd-wlan-cx-supply = <&S1J>;
qcom,vdd-wlan-cx-config = <932000 1000000 0 0 1>; qcom,vdd-wlan-cx-config = <968000 1000000 0 0 1>;
vdd-wlan-dig-supply = <&S2J>; vdd-wlan-dig-supply = <&S2J>;
qcom,vdd-wlan-dig-config = <916000 1100000 0 0 1>; qcom,vdd-wlan-dig-config = <1012000 1100000 0 0 1>;
vdd-wlan-rfa1-supply = <&S8F>; vdd-wlan-rfa1-supply = <&S8F>;
qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>; qcom,vdd-wlan-rfa1-config = <1900000 2000000 0 0 1>;
vdd-wlan-rfa2-supply = <&S7F>; vdd-wlan-rfa2-supply = <&S7F>;
qcom,vdd-wlan-rfa2-config = <1316000 1400000 0 0 1>; qcom,vdd-wlan-rfa2-config = <1352000 1400000 0 0 1>;
//TODO: extractor regulator is required or not vdd-wlan-ant-share-supply = <&L3K>;
// TODO PDC TABLE BUS BW qcom,vdd-wlan-ant-share-config = <1200000 1200000 0 0 1>;
// PDC MAP AND PMU Vreg Map vdd-wlan-supply = <&S7G>;
qcom,vdd-wlan-config = <952000 1100000 0 0 1>;
qcom,vreg_pdc_map =
"S2J1", "bb",
"S1J1", "bb",
"S8F0", "rf",
"S7F0", "rf",
"S7G0", "rf";
qcom,pmu_vreg_map =
"VDD095_MX_PMU", "S2J1",
"VDD095_PMU", "S1J1",
"VDD_PMU_AON_I", "S7G0",
"VDD095_PMU_BT", "S7G0",
"VDD09_PMU_RFA_I", "S7G0",
"VDD13_PMU_PCIE_I", "S7F0",
"VDD13_PMU_RFA_I", "S7F0",
"VDD19_PMU_PCIE_I", "S8F0",
"VDD19_PMU_RFA_I", "S8F0";
qcom,pdc_init_table =
" {class: wlan_pdc, ss: rf, res: S8F0.v, upval: 1900}",
" {class: wlan_pdc, ss: rf, res: S8F0.v, dwnval: 1860}",
" {class: wlan_pdc, ss: rf, res: S7F0.v, upval: 1352}",
" {class: wlan_pdc, ss: rf, res: S7F0.v, dwnval: 988}",
" {class: wlan_pdc, ss: bb, res: S1J1.v, upval: 968}",
" {class: wlan_pdc, ss: bb, res: S1J1.v, dwnval: 460}",
" {class: wlan_pdc, ss: bb, res: S2J1.m, enable: 1}",
" {class: wlan_pdc, ss: bb, res: S2J1.v, enable: 1}",
" {class: wlan_pdc, ss: rf, res: S7G0.m, enable: 1}",
" {class: wlan_pdc, ss: rf, res: S7G0.v, enable: 1}";
/* cpu mask used for wlan tx rx interrupt affinity /* cpu mask used for wlan tx rx interrupt affinity
* <cpumask_for_rx_interrupts cpumask_for_tx_comp_interrupts> * <cpumask_for_rx_interrupts cpumask_for_tx_comp_interrupts>
@@ -114,7 +145,7 @@
}; };
}; };
&pcie0_rp { &pcie_rp {
cnss_pci0: cnss_pci0 { cnss_pci0: cnss_pci0 {
reg = <0 0 0 0 0>; reg = <0 0 0 0 0>;
@@ -132,7 +163,7 @@
cnss_pci_iommu_group0: cnss_pci_iommu_group0 { cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
qcom,iommu-msi-size = <0x1000>; qcom,iommu-msi-size = <0x1000>;
qcom,iommu-geometry = <0x98000000 0x18010000>; qcom,iommu-geometry = <0x0 0x98000000 0x0 0x18010000>;
qcom,iommu-dma = "fastmap"; qcom,iommu-dma = "fastmap";
qcom,iommu-pagetable = "coherent"; qcom,iommu-pagetable = "coherent";
qcom,iommu-faults = "stall-disable", "HUPCF", qcom,iommu-faults = "stall-disable", "HUPCF",

17
canoe-peach-cnss.dtsi
View File

@@ -120,6 +120,8 @@
qcom,vdd-wlan-rfa1-config = <1876000 2000000 0 0 1>; qcom,vdd-wlan-rfa1-config = <1876000 2000000 0 0 1>;
vdd-wlan-rfa2-supply = <&S7F>; vdd-wlan-rfa2-supply = <&S7F>;
qcom,vdd-wlan-rfa2-config = <1328000 1340000 0 0 1>; qcom,vdd-wlan-rfa2-config = <1328000 1340000 0 0 1>;
vdd-wlan-ant-share-supply = <&L3K>;
qcom,vdd-wlan-ant-share-config = <1200000 1200000 0 0 1>;
qcom,vreg_pdc_map = qcom,vreg_pdc_map =
"s1j", "bb", "s1j", "bb",
@@ -144,9 +146,22 @@
*/ */
wlan-txrx-intr-cpumask = <0x3 0x30>; wlan-txrx-intr-cpumask = <0x3 0x30>;
}; };
wlan_direct_link: qcom,cnss-direct-link {
compatible = "qcom,cnss-direct-link";
iommus = <&apps_smmu 0x100f 0x0>;
qcom,iommu-group = <&cnss_audio_iommu_group0>;
memory-region = <&direct_link_iommu_region_partition>;
dma-coherent;
direct_link_iommu_region_partition: direct_link_iommu_region_partition {
iommu-addresses = <&wlan_direct_link 0x0 0x0 0x0 0x18000000>,
<&wlan_direct_link 0x0 0xb0000000 0x0 0x50000000>;
};
};
}; };
&pcie0_rp { &pcie_rp {
cnss_pci0: cnss_pci0 { cnss_pci0: cnss_pci0 {
reg = <0 0 0 0 0>; reg = <0 0 0 0 0>;
qcom,iommu-group = <&cnss_audio_iommu_group0>; qcom,iommu-group = <&cnss_audio_iommu_group0>;

19
kera-wcn7750.dtsi
View File

@@ -41,6 +41,13 @@
firmware-name = "wcn7750/wpss.mdt"; firmware-name = "wcn7750/wpss.mdt";
}; };
icnss2_direct_link_iommu_group0: icnss2_direct_link_iommu_group0 {
qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>;
qcom,iommu-geometry = <0xb0000000 0x10010000>;
qcom,iommu-dma = "fastmap";
qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal";
};
icnss2: qcom,wcn7750 { icnss2: qcom,wcn7750 {
compatible = "qcom,wcn7750"; compatible = "qcom,wcn7750";
reg = <0x17110040 0x0>, reg = <0x17110040 0x0>,
@@ -85,10 +92,7 @@
<GIC_SPI 798 IRQ_TYPE_EDGE_RISING>, <GIC_SPI 798 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 799 IRQ_TYPE_EDGE_RISING>; <GIC_SPI 799 IRQ_TYPE_EDGE_RISING>;
qcom,iommu-dma = "fastmap"; qcom,iommu-group = <&icnss2_direct_link_iommu_group0>;
qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal";
qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>;
qcom,iommu-geometry = <0xb0000000 0x10010000>;
dma-coherent; dma-coherent;
qcom,fw-prefix; qcom,fw-prefix;
qcom,wlan; qcom,wlan;
@@ -185,4 +189,11 @@
interrupt-names = "qcom,smp2p-soc-wake-ack"; interrupt-names = "qcom,smp2p-soc-wake-ack";
}; };
}; };
wlan_direct_link: qcom,icnss-direct-link {
compatible = "qcom,icnss-direct-link";
iommus = <&apps_smmu 0x100f 0x0>;
qcom,iommu-group = <&icnss2_direct_link_iommu_group0>;
dma-coherent;
};
}; };

14
sun-peach-cnss-v8.dtsi
View File

@@ -199,6 +199,20 @@
*/ */
wlan-txrx-intr-cpumask = <0x3 0x30>; wlan-txrx-intr-cpumask = <0x3 0x30>;
}; };
wlan_direct_link: qcom,cnss-direct-link {
compatible = "qcom,cnss-direct-link";
iommus = <&apps_smmu 0x100f 0x0>;
qcom,iommu-group = <&cnss_audio_iommu_group0>;
memory-region = <&direct_link_iommu_region_partition>;
dma-coherent;
direct_link_iommu_region_partition: direct_link_iommu_region_partition {
iommu-addresses = <&wlan_direct_link 0x00000000 0x18000000>,
<&wlan_direct_link 0xb0000000 0x50000000>;
};
};
}; };
&pcie0_rp { &pcie0_rp {

13
sun-peach-cnss.dtsi
View File

@@ -198,6 +198,19 @@
*/ */
wlan-txrx-intr-cpumask = <0x3 0x30>; wlan-txrx-intr-cpumask = <0x3 0x30>;
}; };
wlan_direct_link: qcom,cnss-direct-link {
compatible = "qcom,cnss-direct-link";
iommus = <&apps_smmu 0x100f 0x0>;
qcom,iommu-group = <&cnss_audio_iommu_group0>;
memory-region = <&direct_link_iommu_region_partition>;
dma-coherent;
direct_link_iommu_region_partition: direct_link_iommu_region_partition {
iommu-addresses = <&wlan_direct_link 0x00000000 0x18000000>,
<&wlan_direct_link 0xb0000000 0x50000000>;
};
};
}; };
&pcie0_rp { &pcie0_rp {

30
tuna-kiwi-cnss.dtsi
View File

@@ -133,39 +133,39 @@
/** ICC Path 1 **/ /** ICC Path 1 **/
<0 0>, /* no vote */ <0 0>, /* no vote */
/* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */
<2250 1200000>, <2250 400000>,
/* low: 18-60 Mbps snoc/anoc: 100 Mhz */ /* low: 18-60 Mbps snoc/anoc: 100 Mhz */
<7500 1200000>, <7500 400000>,
/* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */
<30000 1200000>, <30000 400000>,
/* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */
<100000 1200000>, <100000 400000>,
/* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */
<175000 3224000>, <175000 1612000>,
/* ultra high: DBS mode snoc/anoc: 403 Mhz */ /* ultra high: DBS mode snoc/anoc: 403 Mhz */
<312500 3224000>, <312500 1612000>,
/* super high: DBS mode snoc/anoc: 533 Mhz */ /* super high: DBS mode snoc/anoc: 533 Mhz */
<587500 4264000>, <587500 2171000>,
/* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */
<7500 1600000>, <7500 800000>,
/** ICC Path 2 **/ /** ICC Path 2 **/
<0 0>, <0 0>,
/* idle: 0-18 Mbps ddr: 451.2 MHz */ /* idle: 0-18 Mbps ddr: 547 MHz */
<2250 2188800>, <2250 2188800>,
/* low: 18-60 Mbps ddr: 451.2 MHz */ /* low: 18-60 Mbps ddr: 547 MHz */
<7500 2188800>, <7500 2188800>,
/* medium: 60-240 Mbps ddr: 451.2 MHz */ /* medium: 60-240 Mbps ddr: 547 MHz */
<30000 2188800>, <30000 2188800>,
/* high: 240-1200 Mbps ddr: 451.2 MHz */ /* high: 240-1200 Mbps ddr: 547 MHz */
<100000 2188800>, <100000 2188800>,
/* very high: > 1200 Mbps ddr: 1555 MHz */ /* very high: > 1200 Mbps ddr: 1555 MHz */
<175000 6220800>, <175000 6220800>,
/* ultra high: DBS mode ddr: 2092 MHz */ /* ultra high: DBS mode ddr: 2092 MHz */
<312500 8368000>, <312500 8371200>,
/* super high: DBS mode ddr: 3.2 GHz */ /* super high: DBS mode ddr: 3.2 GHz */
<587500 12800000>, <587500 14745600>,
/* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ /* low (latency critical): 18-60 Mbps ddr: 547 MHz */
<7500 2188800>; <7500 2188800>;
qcom,pdc_init_table = qcom,pdc_init_table =

49
tuna-wcn7750.dtsi
View File

@@ -37,6 +37,13 @@
}; };
}; };
icnss2_direct_link_iommu_group0: icnss2_direct_link_iommu_group0 {
qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>;
qcom,iommu-geometry = <0xb0000000 0x10010000>;
qcom,iommu-dma = "fastmap";
qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal";
};
icnss2: qcom,wcn7750 { icnss2: qcom,wcn7750 {
compatible = "qcom,wcn7750"; compatible = "qcom,wcn7750";
reg = <0x17110040 0x0>, reg = <0x17110040 0x0>,
@@ -81,10 +88,7 @@
<GIC_SPI 798 IRQ_TYPE_EDGE_RISING>, <GIC_SPI 798 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 799 IRQ_TYPE_EDGE_RISING>; <GIC_SPI 799 IRQ_TYPE_EDGE_RISING>;
qcom,iommu-dma = "fastmap"; qcom,iommu-group = <&icnss2_direct_link_iommu_group0>;
qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal";
qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>;
qcom,iommu-geometry = <0xb0000000 0x10010000>;
dma-coherent; dma-coherent;
qcom,fw-prefix; qcom,fw-prefix;
qcom,wlan; qcom,wlan;
@@ -121,39 +125,39 @@
/** ICC Path 1 **/ /** ICC Path 1 **/
<0 0>, /* no vote */ <0 0>, /* no vote */
/* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */
<2250 1200000>, <2250 400000>,
/* low: 18-60 Mbps snoc/anoc: 100 Mhz */ /* low: 18-60 Mbps snoc/anoc: 100 Mhz */
<7500 1200000>, <7500 400000>,
/* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */
<30000 1200000>, <30000 400000>,
/* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */
<100000 1200000>, <100000 400000>,
/* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */
<175000 3224000>, <175000 1612000>,
/* ultra high: DBS mode snoc/anoc: 403 Mhz */ /* ultra high: DBS mode snoc/anoc: 403 Mhz */
<312500 3224000>, <312500 1612000>,
/* super high: DBS mode snoc/anoc: 533 Mhz */ /* super high: DBS mode snoc/anoc: 533 Mhz */
<587500 4264000>, <587500 2171000>,
/* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */
<7500 1600000>, <7500 800000>,
/** ICC Path 2 **/ /** ICC Path 2 **/
<0 0>, <0 0>,
/* idle: 0-18 Mbps ddr: 451.2 MHz */ /* idle: 0-18 Mbps ddr: 547 MHz */
<2250 2188800>, <2250 2188800>,
/* low: 18-60 Mbps ddr: 451.2 MHz */ /* low: 18-60 Mbps ddr: 547 MHz */
<7500 2188800>, <7500 2188800>,
/* medium: 60-240 Mbps ddr: 451.2 MHz */ /* medium: 60-240 Mbps ddr: 547 MHz */
<30000 2188800>, <30000 2188800>,
/* high: 240-1200 Mbps ddr: 451.2 MHz */ /* high: 240-1200 Mbps ddr: 547 MHz */
<100000 2188800>, <100000 2188800>,
/* very high: > 1200 Mbps ddr: 1555 MHz */ /* very high: > 1200 Mbps ddr: 1555 MHz */
<175000 6220800>, <175000 6220800>,
/* ultra high: DBS mode ddr: 2092 MHz */ /* ultra high: DBS mode ddr: 2092 MHz */
<312500 8368000>, <312500 8371200>,
/* super high: DBS mode ddr: 3.2 GHz */ /* super high: DBS mode ddr: 3.2 GHz */
<587500 12800000>, <587500 14745600>,
/* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ /* low (latency critical): 18-60 Mbps ddr: 547 MHz */
<7500 2188800>; <7500 2188800>;
icnss_cdev_apss: qcom,icnss_cdev1 { icnss_cdev_apss: qcom,icnss_cdev1 {
@@ -176,4 +180,11 @@
interrupt-names = "qcom,smp2p-soc-wake-ack"; interrupt-names = "qcom,smp2p-soc-wake-ack";
}; };
}; };
wlan_direct_link: qcom,icnss-direct-link {
compatible = "qcom,icnss-direct-link";
iommus = <&apps_smmu 0x100f 0x0>;
qcom,iommu-group = <&icnss2_direct_link_iommu_group0>;
dma-coherent;
};
}; };

4
volcano6i-peach-cnss.dtsi
View File

@@ -167,6 +167,10 @@
status = "disabled"; status = "disabled";
}; };
&wpss_mem {
status = "disabled";
};
&pcie0_rp { &pcie0_rp {
#address-cells = <5>; #address-cells = <5>;
#size-cells = <0>; #size-cells = <0>;