Skip to content

arm64: dts: qcom: hamoa, purwa: Describe the PCIe M.2 Key E connector #1629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tingwei Zhang (quic-tingweiz) merged 4 commits into from
Aug 12, 2026
Merged

arm64: dts: qcom: hamoa, purwa: Describe the PCIe M.2 Key E connector #1629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
884edd3
FROMLIST: arm64: dts: qcom: hamoa: Add graph port/endpoint anchors to…
Aug 5, 2026
3c2655c
FROMLIST: arm64: dts: qcom: hamoa: Add compatible to the PCIe Root Port
Aug 5, 2026
b515cbc
FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe M.2 Key …
Aug 5, 2026
e6274b8
FROMLIST: arm64: dts: qcom: purwa-iot-evk: Describe the PCIe M.2 Key …
Aug 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 32 additions & 98 deletions arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,32 +478,6 @@
regulator-boot-on;
};

/*
* TODO: These two regulators are actually part of the removable M.2
* card and not the EVK mainboard. Need to describe this differently.
* Functionally it works correctly, because all we need to do is to
* turn on the actual 3.3V supply above.
*/
vreg_wcn_0p95: regulator-wcn-0p95 {
compatible = "regulator-fixed";

regulator-name = "VREG_WCN_0P95";
regulator-min-microvolt = <950000>;
regulator-max-microvolt = <950000>;

vin-supply = <&vreg_wcn_3p3>;
};

vreg_wcn_1p9: regulator-wcn-1p9 {
compatible = "regulator-fixed";

regulator-name = "VREG_WCN_1P9";
regulator-min-microvolt = <1900000>;
regulator-max-microvolt = <1900000>;

vin-supply = <&vreg_wcn_3p3>;
};

vreg_wcn_3p3: regulator-wcn-3p3 {
compatible = "regulator-fixed";

Expand Down Expand Up @@ -657,64 +631,44 @@
};
};

wcn7850-pmu {
compatible = "qcom,wcn7850-pmu";

vdd-supply = <&vreg_wcn_0p95>;
vddio-supply = <&vreg_l15b_1p8>;
vddaon-supply = <&vreg_wcn_0p95>;
vdddig-supply = <&vreg_wcn_0p95>;
vddrfa1p2-supply = <&vreg_wcn_1p9>;
vddrfa1p8-supply = <&vreg_wcn_1p9>;
wifi-bt-connector {
compatible = "pcie-m2-e-connector";
vpcie3v3-supply = <&vreg_wcn_3p3>;

bt-enable-gpios = <&tlmm 116 GPIO_ACTIVE_HIGH>;
wlan-enable-gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
w-disable1-gpios = <&tlmm 117 GPIO_ACTIVE_LOW>;
w-disable2-gpios = <&tlmm 116 GPIO_ACTIVE_LOW>;

pinctrl-0 = <&wcn_bt_en>, <&wcn_wlan_en>;
pinctrl-0 = <&wcn_wlan_en>, <&wcn_bt_en>;
pinctrl-names = "default";

regulators {
vreg_pmu_rfa_cmn: ldo0 {
regulator-name = "vreg_pmu_rfa_cmn";
};

vreg_pmu_aon_0p59: ldo1 {
regulator-name = "vreg_pmu_aon_0p59";
};

vreg_pmu_wlcx_0p8: ldo2 {
regulator-name = "vreg_pmu_wlcx_0p8";
};

vreg_pmu_wlmx_0p85: ldo3 {
regulator-name = "vreg_pmu_wlmx_0p85";
};

vreg_pmu_btcmx_0p85: ldo4 {
regulator-name = "vreg_pmu_btcmx_0p85";
};

vreg_pmu_rfa_0p8: ldo5 {
regulator-name = "vreg_pmu_rfa_0p8";
};
ports {
#address-cells = <1>;
#size-cells = <0>;

vreg_pmu_rfa_1p2: ldo6 {
regulator-name = "vreg_pmu_rfa_1p2";
};
port@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;

vreg_pmu_rfa_1p8: ldo7 {
regulator-name = "vreg_pmu_rfa_1p8";
m2_e_pcie_ep: endpoint@0 {
reg = <0>;
remote-endpoint = <&pcie4_port0_ep>;
};
};

vreg_pmu_pcie_0p9: ldo8 {
regulator-name = "vreg_pmu_pcie_0p9";
};
port@3 {
reg = <3>;
#address-cells = <1>;
#size-cells = <0>;

vreg_pmu_pcie_1p8: ldo9 {
regulator-name = "vreg_pmu_pcie_1p8";
m2_e_uart_ep: endpoint@0 {
reg = <0>;
remote-endpoint = <&uart14_ep>;
};
};
};
};

};

&i2c1 {
Expand Down Expand Up @@ -1060,21 +1014,10 @@
&pcie4_port0 {
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
};

wifi@0 {
compatible = "pci17cb,1107";
reg = <0x10000 0x0 0x0 0x0 0x0>;

vddaon-supply = <&vreg_pmu_aon_0p59>;
vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
vddwlmx-supply = <&vreg_pmu_wlmx_0p85>;
vddrfacmn-supply = <&vreg_pmu_rfa_cmn>;
vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
vddrfa1p8-supply = <&vreg_pmu_rfa_1p8>;
vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
};
&pcie4_port0_ep {
remote-endpoint = <&m2_e_pcie_ep>;
};

&pcie5 {
Expand Down Expand Up @@ -1558,19 +1501,10 @@

&uart14 {
status = "okay";
};

bluetooth {
compatible = "qcom,wcn7850-bt";
max-speed = <3200000>;

vddaon-supply = <&vreg_pmu_aon_0p59>;
vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
vddwlmx-supply = <&vreg_pmu_wlmx_0p85>;
vddrfacmn-supply = <&vreg_pmu_rfa_cmn>;
vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
vddrfa1p8-supply = <&vreg_pmu_rfa_1p8>;
};
&uart14_ep {
remote-endpoint = <&m2_e_uart_ep>;
};

&uart21 {
Expand Down
11 changes: 11 additions & 0 deletions arch/arm64/boot/dts/qcom/hamoa.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2107,6 +2107,11 @@
pinctrl-names = "default";

status = "disabled";

port {
uart14_ep: endpoint {
};
};
};

i2c15: i2c@a9c000 {
Expand Down Expand Up @@ -3728,6 +3733,11 @@
#address-cells = <3>;
#size-cells = <2>;
ranges;

port {
pcie4_port0_ep: endpoint {
};
};
};
};

Expand Down Expand Up @@ -3858,6 +3868,7 @@
status = "disabled";

pcie4_port0: pcie@0 {
compatible = "pciclass,0604";
device_type = "pci";
reg = <0x0 0x0 0x0 0x0 0x0>;
bus-range = <0x01 0xff>;
Expand Down
129 changes: 31 additions & 98 deletions arch/arm64/boot/dts/qcom/purwa-iot-evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,32 +471,6 @@
regulator-boot-on;
};

/*
* TODO: These two regulators are actually part of the removable M.2
* card and not the EVK mainboard. Need to describe this differently.
* Functionally it works correctly, because all we need to do is to
* turn on the actual 3.3V supply above.
*/
vreg_wcn_0p95: regulator-wcn-0p95 {
compatible = "regulator-fixed";

regulator-name = "VREG_WCN_0P95";
regulator-min-microvolt = <950000>;
regulator-max-microvolt = <950000>;

vin-supply = <&vreg_wcn_3p3>;
};

vreg_wcn_1p9: regulator-wcn-1p9 {
compatible = "regulator-fixed";

regulator-name = "VREG_WCN_1P9";
regulator-min-microvolt = <1900000>;
regulator-max-microvolt = <1900000>;

vin-supply = <&vreg_wcn_3p3>;
};

vreg_wcn_3p3: regulator-wcn-3p3 {
compatible = "regulator-fixed";

Expand Down Expand Up @@ -650,61 +624,40 @@
};
};

wcn7850-pmu {
compatible = "qcom,wcn7850-pmu";

vdd-supply = <&vreg_wcn_0p95>;
vddio-supply = <&vreg_l15b_1p8>;
vddaon-supply = <&vreg_wcn_0p95>;
vdddig-supply = <&vreg_wcn_0p95>;
vddrfa1p2-supply = <&vreg_wcn_1p9>;
vddrfa1p8-supply = <&vreg_wcn_1p9>;
wifi-bt-connector {
compatible = "pcie-m2-e-connector";
vpcie3v3-supply = <&vreg_wcn_3p3>;

bt-enable-gpios = <&tlmm 116 GPIO_ACTIVE_HIGH>;
wlan-enable-gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
w-disable1-gpios = <&tlmm 117 GPIO_ACTIVE_LOW>;
w-disable2-gpios = <&tlmm 116 GPIO_ACTIVE_LOW>;

pinctrl-0 = <&wcn_bt_en>, <&wcn_wlan_en>;
pinctrl-0 = <&wcn_wlan_en>, <&wcn_bt_en>;
pinctrl-names = "default";

regulators {
vreg_pmu_rfa_cmn: ldo0 {
regulator-name = "vreg_pmu_rfa_cmn";
};

vreg_pmu_aon_0p59: ldo1 {
regulator-name = "vreg_pmu_aon_0p59";
};

vreg_pmu_wlcx_0p8: ldo2 {
regulator-name = "vreg_pmu_wlcx_0p8";
};

vreg_pmu_wlmx_0p85: ldo3 {
regulator-name = "vreg_pmu_wlmx_0p85";
};

vreg_pmu_btcmx_0p85: ldo4 {
regulator-name = "vreg_pmu_btcmx_0p85";
};

vreg_pmu_rfa_0p8: ldo5 {
regulator-name = "vreg_pmu_rfa_0p8";
};
ports {
#address-cells = <1>;
#size-cells = <0>;

vreg_pmu_rfa_1p2: ldo6 {
regulator-name = "vreg_pmu_rfa_1p2";
};
port@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <0>;

vreg_pmu_rfa_1p8: ldo7 {
regulator-name = "vreg_pmu_rfa_1p8";
m2_e_pcie_ep: endpoint@0 {
reg = <0>;
remote-endpoint = <&pcie4_port0_ep>;
};
};

vreg_pmu_pcie_0p9: ldo8 {
regulator-name = "vreg_pmu_pcie_0p9";
};
port@3 {
reg = <3>;
#address-cells = <1>;
#size-cells = <0>;

vreg_pmu_pcie_1p8: ldo9 {
regulator-name = "vreg_pmu_pcie_1p8";
m2_e_uart_ep: endpoint@0 {
reg = <0>;
remote-endpoint = <&uart14_ep>;
};
};
};
};
Expand Down Expand Up @@ -1058,21 +1011,10 @@
&pcie4_port0 {
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
};

wifi@0 {
compatible = "pci17cb,1107";
reg = <0x10000 0x0 0x0 0x0 0x0>;

vddaon-supply = <&vreg_pmu_aon_0p59>;
vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
vddwlmx-supply = <&vreg_pmu_wlmx_0p85>;
vddrfacmn-supply = <&vreg_pmu_rfa_cmn>;
vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
vddrfa1p8-supply = <&vreg_pmu_rfa_1p8>;
vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
};
&pcie4_port0_ep {
remote-endpoint = <&m2_e_pcie_ep>;
};

&pcie5 {
Expand Down Expand Up @@ -1583,19 +1525,10 @@

&uart14 {
status = "okay";
};

bluetooth {
compatible = "qcom,wcn7850-bt";
max-speed = <3200000>;

vddaon-supply = <&vreg_pmu_aon_0p59>;
vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
vddwlmx-supply = <&vreg_pmu_wlmx_0p85>;
vddrfacmn-supply = <&vreg_pmu_rfa_cmn>;
vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
vddrfa1p8-supply = <&vreg_pmu_rfa_1p8>;
};
&uart14_ep {
remote-endpoint = <&m2_e_uart_ep>;
};

&uart21 {
Expand Down
Loading