Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f38f8b05 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add SD card regulator devices for sdxprairie"

parents 40935a9a b358ff87

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -243,6 +243,8 @@ CONFIG_THERMAL_TSENS=y 
CONFIG_QTI_ADC_TM=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_RPMH=y

CONFIG_REGULATOR_STUB=y

CONFIG_SOUND=y

arch/arm/configs/vendor/sdxprairie_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -234,6 +234,8 @@ CONFIG_THERMAL_TSENS=y 
CONFIG_QTI_ADC_TM=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_RPMH=y

CONFIG_REGULATOR_STUB=y

CONFIG_FB=y

arch/arm64/boot/dts/qcom/sdxprairie-regulator.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include <dt-bindings/regulator/qcom,rpmh-regulator.h>

#include <dt-bindings/gpio/gpio.h>



&soc {

	/* RPMh regulators */
@@ -451,4 +452,25 @@ 
			qcom,set = <RPMH_REGULATOR_SET_ALL>;

		};

	};



	vreg_vddpx_2: vddpx2-gpio-regulator {

		compatible = "regulator-gpio";

		regulator-name = "vddpx_2";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <2850000>;

		enable-gpio = <&tlmm 98 GPIO_ACTIVE_HIGH>;

		gpios = <&tlmm 100 GPIO_ACTIVE_HIGH>;

		states = <1800000 0>,

			 <2850000 1>;

		startup-delay-us = <200000>;

		enable-active-high;

	};



	vreg_sd_vdd: sd-vdd-fixed-regulator {

		compatible = "qcom,stub-regulator";

		regulator-name = "sd_vdd";

		regulator-min-microvolt = <2950000>;

		regulator-max-microvolt = <2950000>;

		parent-supply = <&vreg_vddpx_2>;

	};

};