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

Merge 0ccc012720 on remote branch

Browse Source 
Change-Id: I212576c5eb186a7074664265f6e0515f3e7eb45b
This commit is contained in:
Linux Build Service Account
2024-03-17 23:10:11 -07:00
parent 9e58275cdd 0ccc012720
commit 77d6674ff6
5 changed files with 196 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bindings/icnss-wlan.yaml
View File

@@ -18,6 +18,7 @@ properties:
- qcom,icnss #for ADRASTEA architecture - qcom,icnss #for ADRASTEA architecture
- qcom,wcn6750 #for iWCN architecture - qcom,wcn6750 #for iWCN architecture
- qcom,wcn6450 #for evros architecture - qcom,wcn6450 #for evros architecture
- qcom,wcn7750 #for wcn7750 architecture
reg: reg:
description: Memory regions defined as starting address and size. description: Memory regions defined as starting address and size.

60
sun-kiwi-cnss-v8.dtsi
View File

@@ -92,21 +92,67 @@
qcom,qmp = <&aoss_qmp>; qcom,qmp = <&aoss_qmp>;
vdd-wlan-io-supply = <&L3F>; vdd-wlan-io-supply = <&L3F>;
qcom,vdd-wlan-io-config = <1800000 1800000 0 0 0>; qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>;
vdd-wlan-io12-supply = <&L2F>; vdd-wlan-io12-supply = <&L2F>;
qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 0>; qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>;
vdd-wlan-supply = <&S5F>; vdd-wlan-supply = <&S5F>;
qcom,vdd-wlan-config = <932000 1000000 0 0 0>; qcom,vdd-wlan-config = <932000 1000000 0 0 0>;
vdd-wlan-aon-supply = <&S4D>; vdd-wlan-aon-supply = <&S4D>;
qcom,vdd-wlan-aon-config = <976000 1036000 0 0 0>; qcom,vdd-wlan-aon-config = <976000 1036000 0 0 1>;
vdd-wlan-dig-supply = <&S1D>; vdd-wlan-dig-supply = <&S1D>;
qcom,vdd-wlan-dig-config = <916000 1100000 0 0 0>; qcom,vdd-wlan-dig-config = <916000 1100000 0 0 1>;
vdd-wlan-rfa1-supply = <&S3G>; vdd-wlan-rfa1-supply = <&S3G>;
qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 0>; qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>;
vdd-wlan-rfa2-supply = <&S7I>; vdd-wlan-rfa2-supply = <&S7I>;
qcom,vdd-wlan-rfa2-config = <1316000 1340000 0 0 0>; qcom,vdd-wlan-rfa2-config = <1316000 1340000 0 0 1>;
vdd-wlan-ant-share-supply = <&L6K>; vdd-wlan-ant-share-supply = <&L6K>;
qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 0>; qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 1>;
interconnects =
<&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>,
<&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>;
interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr";
qcom,icc-path-count = <2>;
qcom,bus-bw-cfg-count = <9>;
qcom,bus-bw-cfg =
/** ICC Path 1 **/
<0 0>, /* no vote */
/* idle: 0-18 Mbps snoc/anoc: 100 Mhz */
<2250 1600000>,
/* low: 18-60 Mbps snoc/anoc: 100 Mhz */
<7500 1600000>,
/* medium: 60-240 Mbps snoc/anoc: 100 Mhz */
<30000 1600000>,
/* high: 240-1200 Mbps snoc/anoc: 100 Mhz */
<100000 1600000>,
/* very high: > 1200 Mbps snoc/anoc: 403 Mhz */
<175000 6448000>,
/* ultra high: DBS mode snoc/anoc: 403 Mhz */
<312500 6448000>,
/* super high: DBS mode snoc/anoc: 533 Mhz */
<587500 8528000>,
/* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */
<7500 3200000>,
/** ICC Path 2 **/
<0 0>,
/* idle: 0-18 Mbps ddr: 547.2 MHz */
<2250 2188800>,
/* low: 18-60 Mbps ddr: 547.2 MHz */
<7500 2188800>,
/* medium: 60-240 Mbps ddr: 547.2 MHz */
<30000 2188800>,
/* high: 240-1200 Mbps ddr: 547.2 MHz */
<100000 2188800>,
/* very high: > 1200 Mbps ddr: 1555 MHz */
<175000 6220800>,
/* ultra high: DBS mode ddr: 2092 MHz */
<312500 8368000>,
/* super high: DBS mode ddr: 3.2 GHz */
<587500 12800000>,
/* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */
<7500 2188800>;
qcom,vreg_pdc_map = qcom,vreg_pdc_map =
"s5f", "bb", "s5f", "bb",

46
sun-kiwi-cnss.dtsi
View File

@@ -108,6 +108,52 @@
vdd-wlan-ant-share-supply = <&L6K>; vdd-wlan-ant-share-supply = <&L6K>;
qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 1>; qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 1>;
interconnects =
<&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>,
<&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>;
interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr";
qcom,icc-path-count = <2>;
qcom,bus-bw-cfg-count = <9>;
qcom,bus-bw-cfg =
/** ICC Path 1 **/
<0 0>, /* no vote */
/* idle: 0-18 Mbps snoc/anoc: 100 Mhz */
<2250 1600000>,
/* low: 18-60 Mbps snoc/anoc: 100 Mhz */
<7500 1600000>,
/* medium: 60-240 Mbps snoc/anoc: 100 Mhz */
<30000 1600000>,
/* high: 240-1200 Mbps snoc/anoc: 100 Mhz */
<100000 1600000>,
/* very high: > 1200 Mbps snoc/anoc: 403 Mhz */
<175000 6448000>,
/* ultra high: DBS mode snoc/anoc: 403 Mhz */
<312500 6448000>,
/* super high: DBS mode snoc/anoc: 533 Mhz */
<587500 8528000>,
/* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */
<7500 3200000>,
/** ICC Path 2 **/
<0 0>,
/* idle: 0-18 Mbps ddr: 547.2 MHz */
<2250 2188800>,
/* low: 18-60 Mbps ddr: 547.2 MHz */
<7500 2188800>,
/* medium: 60-240 Mbps ddr: 547.2 MHz */
<30000 2188800>,
/* high: 240-1200 Mbps ddr: 547.2 MHz */
<100000 2188800>,
/* very high: > 1200 Mbps ddr: 1555 MHz */
<175000 6220800>,
/* ultra high: DBS mode ddr: 2092 MHz */
<312500 8368000>,
/* super high: DBS mode ddr: 3.2 GHz */
<587500 12800000>,
/* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */
<7500 2188800>;
qcom,vreg_pdc_map = qcom,vreg_pdc_map =
"s4j", "bb", "s4j", "bb",
"s4d", "bb", "s4d", "bb",

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

@@ -124,6 +124,52 @@
vdd-wlan-ant-share-supply = <&L6K>; vdd-wlan-ant-share-supply = <&L6K>;
qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>; qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>;
interconnects =
<&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>,
<&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>;
interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr";
qcom,icc-path-count = <2>;
qcom,bus-bw-cfg-count = <9>;
qcom,bus-bw-cfg =
/** ICC Path 1 **/
<0 0>, /* no vote */
/* idle: 0-18 Mbps snoc/anoc: 100 Mhz */
<2250 1600000>,
/* low: 18-60 Mbps snoc/anoc: 100 Mhz */
<7500 1600000>,
/* medium: 60-240 Mbps snoc/anoc: 100 Mhz */
<30000 1600000>,
/* high: 240-1200 Mbps snoc/anoc: 100 Mhz */
<100000 1600000>,
/* very high: > 1200 Mbps snoc/anoc: 403 Mhz */
<175000 6448000>,
/* ultra high: DBS mode snoc/anoc: 403 Mhz */
<312500 6448000>,
/* super high: DBS mode snoc/anoc: 533 Mhz */
<587500 8528000>,
/* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */
<7500 3200000>,
/** ICC Path 2 **/
<0 0>,
/* idle: 0-18 Mbps ddr: 547.2 MHz */
<2250 2188800>,
/* low: 18-60 Mbps ddr: 547.2 MHz */
<7500 2188800>,
/* medium: 60-240 Mbps ddr: 547.2 MHz */
<30000 2188800>,
/* high: 240-1200 Mbps ddr: 547.2 MHz */
<100000 2188800>,
/* very high: > 1200 Mbps ddr: 1555 MHz */
<175000 6220800>,
/* ultra high: DBS mode ddr: 2092 MHz */
<312500 8368000>,
/* super high: DBS mode ddr: 3.2 GHz */
<587500 12800000>,
/* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */
<7500 2188800>;
qcom,pdc_init_table = qcom,pdc_init_table =
"{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}",
"{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}",
@@ -133,28 +179,15 @@
}; };
&pcie0_rp { &pcie0_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_pci_iommu_group0>; qcom,iommu-group = <&cnss_audio_iommu_group0>;
memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>;
#address-cells = <1>;
#size-cells = <1>;
cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition {
/* address-cells =3 size-cells=2 from sun-pcie.dtsi */ /* address-cells =3 size-cells=2 from sun-pcie.dtsi */
iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x88000000>,
<&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>;
}; };
cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
qcom,iommu-msi-size = <0x1000>;
qcom,iommu-geometry = <0xa0000000 0x10010000>;
qcom,iommu-dma = "fastmap";
qcom,iommu-pagetable = "coherent";
qcom,iommu-faults = "stall-disable", "HUPCF",
"non-fatal";
};
}; };
}; };

63
sun-peach-cnss.dtsi
View File

@@ -123,6 +123,52 @@
vdd-wlan-ant-share-supply = <&L6K>; vdd-wlan-ant-share-supply = <&L6K>;
qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>; qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>;
interconnects =
<&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>,
<&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>;
interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr";
qcom,icc-path-count = <2>;
qcom,bus-bw-cfg-count = <9>;
qcom,bus-bw-cfg =
/** ICC Path 1 **/
<0 0>, /* no vote */
/* idle: 0-18 Mbps snoc/anoc: 100 Mhz */
<2250 1600000>,
/* low: 18-60 Mbps snoc/anoc: 100 Mhz */
<7500 1600000>,
/* medium: 60-240 Mbps snoc/anoc: 100 Mhz */
<30000 1600000>,
/* high: 240-1200 Mbps snoc/anoc: 100 Mhz */
<100000 1600000>,
/* very high: > 1200 Mbps snoc/anoc: 403 Mhz */
<175000 6448000>,
/* ultra high: DBS mode snoc/anoc: 403 Mhz */
<312500 6448000>,
/* super high: DBS mode snoc/anoc: 533 Mhz */
<587500 8528000>,
/* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */
<7500 3200000>,
/** ICC Path 2 **/
<0 0>,
/* idle: 0-18 Mbps ddr: 547.2 MHz */
<2250 2188800>,
/* low: 18-60 Mbps ddr: 547.2 MHz */
<7500 2188800>,
/* medium: 60-240 Mbps ddr: 547.2 MHz */
<30000 2188800>,
/* high: 240-1200 Mbps ddr: 547.2 MHz */
<100000 2188800>,
/* very high: > 1200 Mbps ddr: 1555 MHz */
<175000 6220800>,
/* ultra high: DBS mode ddr: 2092 MHz */
<312500 8368000>,
/* super high: DBS mode ddr: 3.2 GHz */
<587500 12800000>,
/* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */
<7500 2188800>;
qcom,pdc_init_table = qcom,pdc_init_table =
"{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}",
"{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}", "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}",
@@ -132,28 +178,15 @@
}; };
&pcie0_rp { &pcie0_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_pci_iommu_group0>; qcom,iommu-group = <&cnss_audio_iommu_group0>;
memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>;
#address-cells = <1>;
#size-cells = <1>;
cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition {
/* address-cells =3 size-cells=2 from sun-pcie.dtsi */ /* address-cells =3 size-cells=2 from sun-pcie.dtsi */
iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x88000000>,
<&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>;
}; };
cnss_pci_iommu_group0: cnss_pci_iommu_group0 {
qcom,iommu-msi-size = <0x1000>;
qcom,iommu-geometry = <0xa0000000 0x10010000>;
qcom,iommu-dma = "fastmap";
qcom,iommu-pagetable = "coherent";
qcom,iommu-faults = "stall-disable", "HUPCF",
"non-fatal";
};
}; };
}; };