diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts index 02fe5f5ab91c..137ea2bd6081 100644 --- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts +++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts @@ -224,30 +224,6 @@ regulator-max-microvolt = <3700000>; }; - vdd_ntn_0p9: regulator-vdd-ntn-0p9 { - compatible = "regulator-fixed"; - regulator-name = "VDD_NTN_0P9"; - gpio = <&pm8350c_gpios 2 GPIO_ACTIVE_HIGH>; - regulator-min-microvolt = <899400>; - regulator-max-microvolt = <899400>; - enable-active-high; - pinctrl-0 = <&ntn_0p9_en>; - pinctrl-names = "default"; - regulator-enable-ramp-delay = <4300>; - }; - - vdd_ntn_1p8: regulator-vdd-ntn-1p8 { - compatible = "regulator-fixed"; - regulator-name = "VDD_NTN_1P8"; - gpio = <&pm8350c_gpios 3 GPIO_ACTIVE_HIGH>; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - enable-active-high; - pinctrl-0 = <&ntn_1p8_en>; - pinctrl-names = "default"; - regulator-enable-ramp-delay = <10000>; - }; - thermal-zones { sdm-skin-thermal { thermal-sensors = <&pmk8350_adc_tm 3>; @@ -286,6 +262,30 @@ }; }; + vdd_ntn_0p9: regulator-vdd-ntn-0p9 { + compatible = "regulator-fixed"; + regulator-name = "VDD_NTN_0P9"; + gpio = <&pm8350c_gpios 2 GPIO_ACTIVE_HIGH>; + regulator-min-microvolt = <899400>; + regulator-max-microvolt = <899400>; + enable-active-high; + pinctrl-0 = <&ntn_0p9_en>; + pinctrl-names = "default"; + regulator-enable-ramp-delay = <4300>; + }; + + vdd_ntn_1p8: regulator-vdd-ntn-1p8 { + compatible = "regulator-fixed"; + regulator-name = "VDD_NTN_1P8"; + gpio = <&pm8350c_gpios 3 GPIO_ACTIVE_HIGH>; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + enable-active-high; + pinctrl-0 = <&ntn_1p8_en>; + pinctrl-names = "default"; + regulator-enable-ramp-delay = <10000>; + }; + wcn6750-pmu { compatible = "qcom,wcn6750-pmu"; pinctrl-0 = <&bt_en>; @@ -849,7 +849,7 @@ resx-gpios = <&pm8350c_gpios 1 GPIO_ACTIVE_LOW>; - pinctrl-0 = <&tc9563_rsex_n>; + pinctrl-0 = <&tc9563_resx_n>; pinctrl-names = "default"; pcie@1,0 { @@ -1184,38 +1184,6 @@ }; }; -&pm8350c_gpios { - ntn_0p9_en: ntn-0p9-en-state { - pins = "gpio2"; - function = "normal"; - - bias-disable; - input-disable; - output-enable; - power-source = <0>; - }; - - ntn_1p8_en: ntn-1p8-en-state { - pins = "gpio3"; - function = "normal"; - - bias-disable; - input-disable; - output-enable; - power-source = <0>; - }; - - tc9563_rsex_n: tc9563-resx-state { - pins = "gpio1"; - function = "normal"; - - bias-disable; - input-disable; - output-enable; - power-source = <0>; - }; -}; - &thermal_zones { cpu0-thermal { trips { @@ -1550,6 +1518,38 @@ }; }; +&pm8350c_gpios { + ntn_0p9_en: ntn-0p9-en-state { + pins = "gpio2"; + function = "normal"; + + bias-disable; + input-disable; + output-enable; + power-source = <0>; + }; + + ntn_1p8_en: ntn-1p8-en-state { + pins = "gpio3"; + function = "normal"; + + bias-disable; + input-disable; + output-enable; + power-source = <0>; + }; + + tc9563_resx_n: tc9563-resx-state { + pins = "gpio1"; + function = "normal"; + + bias-disable; + input-disable; + output-enable; + power-source = <0>; + }; +}; + &tlmm { gpio-reserved-ranges = <32 2>, /* ADSP */ <48 4>; /* NFC */