Skip to content

Commit fff7f1c

Browse files
SpieringsAEandersson
authored andcommitted
arm64: dts: qcom: x1e80100-vivobook-s15: Add bluetooth
Add bluetooth for the asus vivobook s15 Describe wlan configuration Reviewed-by: Dmitry Baryshkov <[email protected]> Acked-by: Konrad Dybcio <[email protected]> Signed-off-by: Maud Spierings <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 435c364 commit fff7f1c

File tree

1 file changed

+167
-0
lines changed

1 file changed

+167
-0
lines changed

arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
compatible = "asus,vivobook-s15", "qcom,x1e80100";
2020
chassis-type = "laptop";
2121

22+
aliases {
23+
serial1 = &uart14;
24+
};
25+
2226
gpio-keys {
2327
compatible = "gpio-keys";
2428
pinctrl-0 = <&hall_int_n_default>;
@@ -153,6 +157,107 @@
153157
regulator-always-on;
154158
regulator-boot-on;
155159
};
160+
161+
/*
162+
* TODO: These two regulators are actually part of the removable M.2
163+
* card and not the CRD mainboard. Need to describe this differently.
164+
* Functionally it works correctly, because all we need to do is to
165+
* turn on the actual 3.3V supply above.
166+
*/
167+
vreg_wcn_0p95: regulator-wcn-0p95 {
168+
compatible = "regulator-fixed";
169+
170+
regulator-name = "VREG_WCN_0P95";
171+
regulator-min-microvolt = <950000>;
172+
regulator-max-microvolt = <950000>;
173+
174+
vin-supply = <&vreg_wcn_3p3>;
175+
};
176+
177+
vreg_wcn_1p9: regulator-wcn-1p9 {
178+
compatible = "regulator-fixed";
179+
180+
regulator-name = "VREG_WCN_1P9";
181+
regulator-min-microvolt = <1900000>;
182+
regulator-max-microvolt = <1900000>;
183+
184+
vin-supply = <&vreg_wcn_3p3>;
185+
};
186+
187+
vreg_wcn_3p3: regulator-wcn-3p3 {
188+
compatible = "regulator-fixed";
189+
190+
regulator-name = "VREG_WCN_3P3";
191+
regulator-min-microvolt = <3300000>;
192+
regulator-max-microvolt = <3300000>;
193+
194+
gpio = <&tlmm 214 GPIO_ACTIVE_HIGH>;
195+
enable-active-high;
196+
197+
pinctrl-0 = <&wcn_sw_en>;
198+
pinctrl-names = "default";
199+
200+
regulator-boot-on;
201+
};
202+
203+
wcn7850-pmu {
204+
compatible = "qcom,wcn7850-pmu";
205+
206+
vdd-supply = <&vreg_wcn_0p95>;
207+
vddio-supply = <&vreg_l15b_1p8>;
208+
vddaon-supply = <&vreg_wcn_0p95>;
209+
vdddig-supply = <&vreg_wcn_0p95>;
210+
vddrfa1p2-supply = <&vreg_wcn_1p9>;
211+
vddrfa1p8-supply = <&vreg_wcn_1p9>;
212+
213+
wlan-enable-gpios = <&tlmm 117 GPIO_ACTIVE_HIGH>;
214+
bt-enable-gpios = <&tlmm 116 GPIO_ACTIVE_HIGH>;
215+
216+
pinctrl-0 = <&wcn_wlan_en>, <&wcn_bt_en>;
217+
pinctrl-names = "default";
218+
219+
regulators {
220+
vreg_pmu_rfa_cmn: ldo0 {
221+
regulator-name = "vreg_pmu_rfa_cmn";
222+
};
223+
224+
vreg_pmu_aon_0p59: ldo1 {
225+
regulator-name = "vreg_pmu_aon_0p59";
226+
};
227+
228+
vreg_pmu_wlcx_0p8: ldo2 {
229+
regulator-name = "vreg_pmu_wlcx_0p8";
230+
};
231+
232+
vreg_pmu_wlmx_0p85: ldo3 {
233+
regulator-name = "vreg_pmu_wlmx_0p85";
234+
};
235+
236+
vreg_pmu_btcmx_0p85: ldo4 {
237+
regulator-name = "vreg_pmu_btcmx_0p85";
238+
};
239+
240+
vreg_pmu_rfa_0p8: ldo5 {
241+
regulator-name = "vreg_pmu_rfa_0p8";
242+
};
243+
244+
vreg_pmu_rfa_1p2: ldo6 {
245+
regulator-name = "vreg_pmu_rfa_1p2";
246+
};
247+
248+
vreg_pmu_rfa_1p8: ldo7 {
249+
regulator-name = "vreg_pmu_rfa_1p8";
250+
};
251+
252+
vreg_pmu_pcie_0p9: ldo8 {
253+
regulator-name = "vreg_pmu_pcie_0p9";
254+
};
255+
256+
vreg_pmu_pcie_1p8: ldo9 {
257+
regulator-name = "vreg_pmu_pcie_1p8";
258+
};
259+
};
260+
};
156261
};
157262

158263
&apps_rsc {
@@ -212,6 +317,13 @@
212317
regulator-max-microvolt = <3072000>;
213318
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
214319
};
320+
321+
vreg_l15b_1p8: ldo15 {
322+
regulator-name = "vreg_l15b_1p8";
323+
regulator-min-microvolt = <1800000>;
324+
regulator-max-microvolt = <1800000>;
325+
regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
326+
};
215327
};
216328

217329
regulators-1 {
@@ -538,6 +650,23 @@
538650
status = "okay";
539651
};
540652

653+
&pcie4_port0 {
654+
wifi@0 {
655+
compatible = "pci17cb,1107";
656+
reg = <0x10000 0x0 0x0 0x0 0x0>;
657+
658+
vddaon-supply = <&vreg_pmu_aon_0p59>;
659+
vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
660+
vddwlmx-supply = <&vreg_pmu_wlmx_0p85>;
661+
vddrfacmn-supply = <&vreg_pmu_rfa_cmn>;
662+
vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
663+
vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
664+
vddrfa1p8-supply = <&vreg_pmu_rfa_1p8>;
665+
vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>;
666+
vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>;
667+
};
668+
};
669+
541670
&pcie6a {
542671
perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
543672
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
@@ -719,6 +848,44 @@
719848
function = "gpio";
720849
bias-disable;
721850
};
851+
852+
wcn_bt_en: wcn-bt-en-state {
853+
pins = "gpio116";
854+
function = "gpio";
855+
drive-strength = <16>;
856+
bias-pull-down;
857+
};
858+
859+
wcn_sw_en: wcn-sw-en-state {
860+
pins = "gpio214";
861+
function = "gpio";
862+
drive-strength = <16>;
863+
bias-disable;
864+
};
865+
866+
wcn_wlan_en: wcn-wlan-en-state {
867+
pins = "gpio117";
868+
function = "gpio";
869+
drive-strength = <16>;
870+
bias-disable;
871+
};
872+
};
873+
874+
&uart14 {
875+
status = "okay";
876+
877+
bluetooth {
878+
compatible = "qcom,wcn7850-bt";
879+
max-speed = <3200000>;
880+
881+
vddaon-supply = <&vreg_pmu_aon_0p59>;
882+
vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
883+
vddwlmx-supply = <&vreg_pmu_wlmx_0p85>;
884+
vddrfacmn-supply = <&vreg_pmu_rfa_cmn>;
885+
vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
886+
vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
887+
vddrfa1p8-supply = <&vreg_pmu_rfa_1p8>;
888+
};
722889
};
723890

724891
&usb_1_ss0_hsphy {

0 commit comments

Comments
 (0)