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
Show 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 @@
#include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
/ {
model = "Fairphone 2";
compatible = "fairphone,fp2", "qcom,msm8974";
......@@ -54,22 +53,89 @@ vibrator {
enable-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>;
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>;
hnp-disable;
srp-disable;
adp-disable;
ulpi {
phy@a {
status = "okay";
v1p8-supply = <&pm8941_l6>;
v3p3-supply = <&pm8941_l24>;
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
};
};
&pm8941_gpios {
gpio_keys_pin_a: gpio-keys-active {
pins = "gpio1", "gpio2", "gpio5";
function = "normal";
bias-pull-up;
power-source = <PM8941_GPIO_S3>;
};
};
&pronto {
status = "okay";
vddmx-supply = <&pm8841_s1>;
vddcx-supply = <&pm8841_s2>;
pinctrl-names = "default";
pinctrl-0 = <&wcnss_pin_a>;
smd-edge {
qcom,remote-pid = <4>;
label = "pronto";
wcnss {
status = "okay";
};
};
};
smd {
rpm {
rpm-requests {
&rpm_requests {
pm8841-regulators {
s1 {
pm8841_s1: s1 {
regulator-min-microvolt = <675000>;
regulator-max-microvolt = <1050000>;
};
s2 {
pm8841_s2: s2 {
regulator-min-microvolt = <500000>;
regulator-max-microvolt = <1050000>;
};
s3 {
pm8841_s3: s3 {
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
};
......@@ -85,199 +151,181 @@ pm8941-regulators {
vdd_l13_l20_l23_l24-supply = <&vreg_boost>;
vdd_l21-supply = <&vreg_boost>;
s1 {
pm8941_s1: s1 {
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1300000>;
regulator-always-on;
regulator-boot-on;
};
s2 {
pm8941_s2: s2 {
regulator-min-microvolt = <2150000>;
regulator-max-microvolt = <2150000>;
regulator-boot-on;
};
s3 {
pm8941_s3: s3 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
};
l1 {
pm8941_l1: l1 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
regulator-always-on;
regulator-boot-on;
};
l2 {
pm8941_l2: l2 {
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
};
l3 {
pm8941_l3: l3 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l4 {
pm8941_l4: l4 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1225000>;
};
l5 {
pm8941_l5: l5 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l6 {
pm8941_l6: l6 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
};
l7 {
pm8941_l7: l7 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
};
l8 {
pm8941_l8: l8 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l9 {
pm8941_l9: l9 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l10 {
pm8941_l10: l10 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
};
l11 {
pm8941_l11: l11 {
regulator-min-microvolt = <1225000>;
regulator-max-microvolt = <1350000>;
};
l12 {
pm8941_l12: l12 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;
regulator-boot-on;
};
l13 {
pm8941_l13: l13 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <2950000>;
regulator-boot-on;
};
l14 {
pm8941_l14: l14 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
l15 {
pm8941_l15: l15 {
regulator-min-microvolt = <2050000>;
regulator-max-microvolt = <2050000>;
};
l16 {
pm8941_l16: l16 {
regulator-min-microvolt = <2700000>;
regulator-max-microvolt = <2700000>;
};
l17 {
pm8941_l17: l17 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l18 {
pm8941_l18: l18 {
regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>;
};
l19 {
pm8941_l19: l19 {
regulator-min-microvolt = <2900000>;
regulator-max-microvolt = <3350000>;
};
l20 {
pm8941_l20: l20 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-boot-on;
regulator-system-load = <200000>;
regulator-allow-set-load;
regulator-boot-on;
};
l21 {
pm8941_l21: l21 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
regulator-boot-on;
};
l22 {
pm8941_l22: l22 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3300000>;
};
l23 {
pm8941_l23: l23 {
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
};
l24 {
pm8941_l24: l24 {
regulator-min-microvolt = <3075000>;
regulator-max-microvolt = <3075000>;
regulator-boot-on;
};
};
};
};
};
};
&soc {
serial@f991e000 {
status = "okay";
};
remoteproc@fb21b000 {
&sdhc_1 {
status = "okay";
vddmx-supply = <&pm8841_s1>;
vddcx-supply = <&pm8841_s2>;
vmmc-supply = <&pm8941_l20>;
vqmmc-supply = <&pm8941_s3>;
pinctrl-names = "default";
pinctrl-0 = <&wcnss_pin_a>;
smd-edge {
qcom,remote-pid = <4>;
label = "pronto";
pinctrl-0 = <&sdhc1_pin_a>;
};
wcnss {
&sdhc_2 {
status = "okay";
};
};
};
pinctrl@fd510000 {
vmmc-supply = <&pm8941_l21>;
vqmmc-supply = <&pm8941_l13>;
pinctrl-names = "default";
pinctrl-0 = <&sdhc2_pin_a>;
};
&tlmm {
sdhc1_pin_a: sdhc1-pin-active {
clk {
pins = "sdc1_clk";
......@@ -331,79 +379,4 @@ fm {
bias-pull-down;
};
};
};
sdhci@f9824900 {
status = "okay";
vmmc-supply = <&pm8941_l20>;
vqmmc-supply = <&pm8941_s3>;
bus-width = <8>;
non-removable;
pinctrl-names = "default";
pinctrl-0 = <&sdhc1_pin_a>;
};
sdhci@f98a4900 {
status = "okay";
vmmc-supply = <&pm8941_l21>;
vqmmc-supply = <&pm8941_l13>;
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&sdhc2_pin_a>;
};
usb@f9a55000 {
status = "okay";
phys = <&usb_hs1_phy>;
phy-select = <&tcsr 0xb000 0>;
extcon = <&smbb>, <&usb_id>;
vbus-supply = <&chg_otg>;
hnp-disable;
srp-disable;
adp-disable;
ulpi {
phy@a {
status = "okay";
v1p8-supply = <&pm8941_l6>;
v3p3-supply = <&pm8941_l24>;
extcon = <&smbb>;
qcom,init-seq = /bits/ 8 <0x1 0x64>;
};
};
};
imem@fe805000 {
status = "okay";
reboot-mode {
mode-normal = <0x77665501>;
mode-bootloader = <0x77665500>;
mode-recovery = <0x77665502>;
};
};
};
&spmi_bus {
pm8941@0 {
gpios@c000 {
gpio_keys_pin_a: gpio-keys-active {
pins = "gpio1", "gpio2", "gpio5";
function = "normal";
bias-pull-up;
power-source = <PM8941_GPIO_S3>;
};
};
};
};
arch/arm/boot/dts/qcom-msm8974.dtsi
View file @ 409ab7dc
......@@ -1590,7 +1590,7 @@ dsi0_phy: dsi-phy@fd922a00 {
};
};
imem@fe805000 {
imem: imem@fe805000 {
status = "disabled";
compatible = "syscon", "simple-mfd";
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