Skip to content

L
linux
Commit 409ab7dc authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Bjorn Andersson
Browse files
Options

ARM: dts: qcom-msm8974-fp2: Use &labels 

Use &labels to align with the style used in new DTS and apply tiny
style fixes.
Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@somainline.org>
[bjorn: Rebased on top of Krzysztof underscore fixes]
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220415115633.575010-10-konrad.dybcio@somainline.org
parent 9f440d17
Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 303 deletions
arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
View file @ 409ab7dc
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
/ { / {
model = "Fairphone 2"; model = "Fairphone 2";
compatible = "fairphone,fp2", "qcom,msm8974"; compatible = "fairphone,fp2", "qcom,msm8974";
...@@ -54,356 +53,330 @@ vibrator { ...@@ -54,356 +53,330 @@ vibrator {
enable-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>; enable-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>;
vcc-supply = <&pm8941_l18>; vcc-supply = <&pm8941_l18>;
}; };
};
&blsp1_uart2 {
status = "okay";
};
&imem {
status = "okay";
reboot-mode {
mode-normal = <0x77665501>;
mode-bootloader = <0x77665500>;
mode-recovery = <0x77665502>;
};
};
&otg {
status = "okay";
phys = <&usb_hs1_phy>;
phy-select = <&tcsr 0xb000 0>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
smd { hnp-disable;
rpm { srp-disable;
rpm-requests { adp-disable;
pm8841-regulators {
s1 { ulpi {
regulator-min-microvolt = <675000>; phy@a {
regulator-max-microvolt = <1050000>; status = "okay";
};
v1p8-supply = <&pm8941_l6>;
s2 { v3p3-supply = <&pm8941_l24>;
regulator-min-microvolt = <500000>;
regulator-max-microvolt = <1050000>; extcon = <&smbb>;
}; qcom,init-seq = /bits/ 8 <0x1 0x64>;
s3 {
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
};
};
pm8941-regulators {
vdd_l1_l3-supply = <&pm8941_s1>;
vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;
vdd_l4_l11-supply = <&pm8941_s1>;
vdd_l5_l7-supply = <&pm8941_s2>;
vdd_l6_l12_l14_l15-supply = <&pm8941_s2>;
vdd_l9_l10_l17_l22-supply = <&vreg_boost>;
vdd_l13_l20_l23_l24-supply = <&vreg_boost>;
vdd_l21-supply = <&vreg_boost>;
s1 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
regulator-always-on;
regulator-boot-on;
};
s2 {
regulator-min-microvolt = <2150000>;
regulator-max-microvolt = <2150000>;
regulator-boot-on;
};
s3 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
};
l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
regulator-always-on;
regulator-boot-on;
};
l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l3 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l4 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
};
l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
};
l8 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l9 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l10 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l11 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1350000>;
};
l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
};
l13 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-boot-on;
};
l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l15 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l16 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l19 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <3350000>;
};
l20 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-boot-on;
regulator-system-load = <200000>;
regulator-allow-set-load;
};
l21 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-boot-on;
};
l22 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3300000>;
};
l23 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
};
l24 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
regulator-boot-on;
};
};
};
}; };
}; };
}; };
&soc { &pm8941_gpios {
serial@f991e000 { gpio_keys_pin_a: gpio-keys-active {
status = "okay"; pins = "gpio1", "gpio2", "gpio5";
function = "normal";
bias-pull-up;
power-source = <PM8941_GPIO_S3>;
}; };
};
remoteproc@fb21b000 { &pronto {
status = "okay"; status = "okay";
vddmx-supply = <&pm8841_s1>; vddmx-supply = <&pm8841_s1>;
vddcx-supply = <&pm8841_s2>; vddcx-supply = <&pm8841_s2>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&wcnss_pin_a>; pinctrl-0 = <&wcnss_pin_a>;
smd-edge { smd-edge {
qcom,remote-pid = <4>; qcom,remote-pid = <4>;
label = "pronto"; label = "pronto";
wcnss { wcnss {
status = "okay"; status = "okay";
};
}; };
}; };
};
&rpm_requests {
pm8841-regulators {
pm8841_s1: s1 {
regulator-min-microvolt = <675000>;
regulator-max-microvolt = <1050000>;
};
pinctrl@fd510000 { pm8841_s2: s2 {
sdhc1_pin_a: sdhc1-pin-active { regulator-min-microvolt = <500000>;
clk { regulator-max-microvolt = <1050000>;
pins = "sdc1_clk"; };
drive-strength = <16>;
bias-disable;
};
cmd-data { pm8841_s3: s3 {
pins = "sdc1_cmd", "sdc1_data"; regulator-min-microvolt = <1050000>;
drive-strength = <10>; regulator-max-microvolt = <1050000>;
bias-pull-up;
};
}; };
};
sdhc2_pin_a: sdhc2-pin-active { pm8941-regulators {
clk { vdd_l1_l3-supply = <&pm8941_s1>;
pins = "sdc2_clk"; vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;
drive-strength = <10>; vdd_l4_l11-supply = <&pm8941_s1>;
bias-disable; vdd_l5_l7-supply = <&pm8941_s2>;
}; vdd_l6_l12_l14_l15-supply = <&pm8941_s2>;
vdd_l9_l10_l17_l22-supply = <&vreg_boost>;
vdd_l13_l20_l23_l24-supply = <&vreg_boost>;
vdd_l21-supply = <&vreg_boost>;
pm8941_s1: s1 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
regulator-always-on;
regulator-boot-on;
};
cmd-data { pm8941_s2: s2 {
pins = "sdc2_cmd", "sdc2_data"; regulator-min-microvolt = <2150000>;
drive-strength = <6>; regulator-max-microvolt = <2150000>;
bias-pull-up; regulator-boot-on;
};
}; };
wcnss_pin_a: wcnss-pin-active { pm8941_s3: s3 {
wlan { regulator-min-microvolt = <1800000>;
pins = "gpio36", "gpio37", "gpio38", "gpio39", "gpio40"; regulator-max-microvolt = <1800000>;
function = "wlan"; regulator-always-on;
regulator-boot-on;
};
drive-strength = <6>; pm8941_l1: l1 {
bias-pull-down; regulator-min-microvolt = <1225000>;
}; regulator-max-microvolt = <1225000>;
regulator-always-on;
regulator-boot-on;
};
bt { pm8941_l2: l2 {
pins = "gpio35", "gpio43", "gpio44"; regulator-min-microvolt = <1200000>;
function = "bt"; regulator-max-microvolt = <1200000>;
};
drive-strength = <2>; pm8941_l3: l3 {
bias-pull-down; regulator-min-microvolt = <1225000>;
}; regulator-max-microvolt = <1225000>;
};
fm { pm8941_l4: l4 {
pins = "gpio41", "gpio42"; regulator-min-microvolt = <1225000>;
function = "fm"; regulator-max-microvolt = <1225000>;
};
drive-strength = <2>; pm8941_l5: l5 {
bias-pull-down; regulator-min-microvolt = <1800000>;
}; regulator-max-microvolt = <1800000>;
}; };
};
sdhci@f9824900 { pm8941_l6: l6 {
status = "okay"; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
};
vmmc-supply = <&pm8941_l20>; pm8941_l7: l7 {
vqmmc-supply = <&pm8941_s3>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
};
bus-width = <8>; pm8941_l8: l8 {
non-removable; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pinctrl-names = "default"; pm8941_l9: l9 {
pinctrl-0 = <&sdhc1_pin_a>; regulator-min-microvolt = <1800000>;
}; regulator-max-microvolt = <2950000>;
};
sdhci@f98a4900 { pm8941_l10: l10 {
status = "okay"; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
vmmc-supply = <&pm8941_l21>; pm8941_l11: l11 {
vqmmc-supply = <&pm8941_l13>; regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1350000>;
};
bus-width = <4>; pm8941_l12: l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
};
pinctrl-names = "default"; pm8941_l13: l13 {
pinctrl-0 = <&sdhc2_pin_a>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-boot-on;
};
pm8941_l14: l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
pm8941_l15: l15 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
pm8941_l16: l16 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
pm8941_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
pm8941_l18: l18 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
pm8941_l19: l19 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <3350000>;
};
pm8941_l20: l20 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-system-load = <200000>;
regulator-allow-set-load;
regulator-boot-on;
};
pm8941_l21: l21 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-boot-on;
};
pm8941_l22: l22 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3300000>;
};
pm8941_l23: l23 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
};
pm8941_l24: l24 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
regulator-boot-on;
};
}; };
};
usb@f9a55000 { &sdhc_1 {
status = "okay"; status = "okay";
phys = <&usb_hs1_phy>; vmmc-supply = <&pm8941_l20>;
phy-select = <&tcsr 0xb000 0>; vqmmc-supply = <&pm8941_s3>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
hnp-disable; pinctrl-names = "default";
srp-disable; pinctrl-0 = <&sdhc1_pin_a>;
adp-disable; };
&sdhc_2 {
status = "okay";
ulpi { vmmc-supply = <&pm8941_l21>;
phy@a { vqmmc-supply = <&pm8941_l13>;
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&sdhc2_pin_a>;
};
v1p8-supply = <&pm8941_l6>; &tlmm {
v3p3-supply = <&pm8941_l24>; sdhc1_pin_a: sdhc1-pin-active {
clk {
pins = "sdc1_clk";
drive-strength = <16>;
bias-disable;
};
extcon = <&smbb>; cmd-data {
qcom,init-seq = /bits/ 8 <0x1 0x64>; pins = "sdc1_cmd", "sdc1_data";
}; drive-strength = <10>;
bias-pull-up;
}; };
}; };
imem@fe805000 { sdhc2_pin_a: sdhc2-pin-active {
status = "okay"; clk {
pins = "sdc2_clk";
drive-strength = <10>;
bias-disable;
};
reboot-mode { cmd-data {
mode-normal = <0x77665501>; pins = "sdc2_cmd", "sdc2_data";
mode-bootloader = <0x77665500>; drive-strength = <6>;
mode-recovery = <0x77665502>; bias-pull-up;
}; };
}; };
};
&spmi_bus { wcnss_pin_a: wcnss-pin-active {
pm8941@0 { wlan {
gpios@c000 { pins = "gpio36", "gpio37", "gpio38", "gpio39", "gpio40";
gpio_keys_pin_a: gpio-keys-active { function = "wlan";
pins = "gpio1", "gpio2", "gpio5";
function = "normal"; drive-strength = <6>;
bias-pull-down;
};
bt {
pins = "gpio35", "gpio43", "gpio44";
function = "bt";
drive-strength = <2>;
bias-pull-down;
};
fm {
pins = "gpio41", "gpio42";
function = "fm";
bias-pull-up; drive-strength = <2>;
power-source = <PM8941_GPIO_S3>; bias-pull-down;
};
}; };
}; };
}; };
arch/arm/boot/dts/qcom-msm8974.dtsi
View file @ 409ab7dc
...@@ -1590,7 +1590,7 @@ dsi0_phy: dsi-phy@fd922a00 { ...@@ -1590,7 +1590,7 @@ dsi0_phy: dsi-phy@fd922a00 {
}; };
}; };
imem@fe805000 { imem: imem@fe805000 {
status = "disabled"; status = "disabled";
compatible = "syscon", "simple-mfd"; compatible = "syscon", "simple-mfd";
reg = <0xfe805000 0x1000>; reg = <0xfe805000 0x1000>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7