Merge "ARM: dts: msm: Add virtio regulator for sa8155 vm" (1e9444bb) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/sa8155-vm-usb.dtsi

+10 −10

Original line number	Diff line number	Diff line
		@@ -118,9 +118,9 @@
		reg-names = "hsusb_phy_base",
		"phy_rcal_reg";

		vdd-supply = <&pm8150_l5>;
		vdda18-supply = <&pm8150_l12>;
		vdda33-supply = <&pm8150_l2>;
		vdd-supply = <&pm8150_1_l5>;
		vdda18-supply = <&pm8150_1_l12>;
		vdda33-supply = <&pm8150_1_l2>;
		qcom,vdd-voltage-level = <0 880000 880000>;

		clocks = <&clock_gcc RPMH_CXO_CLK>;
		@@ -140,10 +140,10 @@
		reg = <0x88e8000 0x3000>;
		reg-names = "qmp_phy_base";

		vdd-supply = <&pm8150_l5>;
		vdd-supply = <&pm8150_1_l5>;
		qcom,vdd-voltage-level = <0 880000 880000>;
		qcom,vdd-max-load-uA = <47000>;
		core-supply = <&pm8150l_l3>;
		core-supply = <&pm8150_2_l8>;
		qcom,vbus-valid-override;
		qcom,link-training-reset;
		qcom,qmp-phy-init-seq =
		@@ -394,9 +394,9 @@
		reg-names = "hsusb_phy_base",
		"phy_rcal_reg";

		vdd-supply = <&pm8150_l5>;
		vdda18-supply = <&pm8150_l12>;
		vdda33-supply = <&pm8150_l2>;
		vdd-supply = <&pm8150_1_l5>;
		vdda18-supply = <&pm8150_1_l12>;
		vdda33-supply = <&pm8150_1_l2>;
		qcom,vdd-voltage-level = <0 880000 880000>;

		clocks = <&clock_gcc RPMH_CXO_CLK>;
		@@ -417,10 +417,10 @@
		reg-names = "qmp_phy_base",
		"pcs_clamp_enable_reg";

		vdd-supply = <&pm8150_l5>;
		vdd-supply = <&pm8150_1_l5>;
		qcom,vdd-voltage-level = <0 880000 880000>;
		qcom,vdd-max-load-uA = <47000>;
		core-supply = <&pm8150l_l3>;
		core-supply = <&pm8150_2_l8>;
		qcom,vbus-valid-override;
		qcom,qmp-phy-init-seq =
		/* <reg_offset, value, delay> */

arch/arm64/boot/dts/qcom/sa8155-vm.dtsi

+90 −106

Original line number	Diff line number	Diff line
		@@ -45,6 +45,96 @@
		#reset-cells = <1>;
		};

		regulator_virt: virtio_regulator@1c700000 {
		compatible = "virtio,mmio";
		reg = <0x1c700000 0x1000>;
		interrupts = <0 42 0>;

		usb30_prim_gdsc: usb30_prim_gdsc {
		regulator-name = "usb30_prim_gdsc";
		};

		usb30_sec_gdsc: usb30_sec_gdsc {
		regulator-name = "usb30_sec_gdsc";
		};

		pcie_0_gdsc: pcie_0_gdsc {
		regulator-name = "pcie_0_gdsc";
		};

		pcie_1_gdsc: pcie_1_gdsc {
		regulator-name = "pcie_1_gdsc";
		};

		L2A: pm8150_1_l2: regulator-pm8150-1-l2 {
		regulator-name = "ldoa2";
		regulator-min-microvolt = <3072000>;
		regulator-max-microvolt = <3072000>;
		};

		L5A: pm8150_1_l5: regulator-pm8150-1-l5 {
		regulator-name = "ldoa5";
		regulator-min-microvolt = <880000>;
		regulator-max-microvolt = <880000>;
		};

		L12A: pm8150_1_l12: regulator-pm8150-1-l12 {
		regulator-name = "ldoa12";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		};

		L17A: pm8150_1_l17: regulator-pm8150-1-l17 {
		regulator-name = "ldoa17";
		regulator-min-microvolt = <2704000>;
		regulator-max-microvolt = <2960000>;
		};

		L8C: pm8150_2_l8: regulator-pm8150-2-l8 {
		regulator-name = "ldoc8";
		regulator-min-microvolt = <1200000>;
		regulator-max-microvolt = <1200000>;
		regulator-allow-set-load;
		};

		L13C: pm8150_2_l13: regulator-pm8150-2-l13 {
		regulator-name = "ldoc13";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <2960000>;
		};

		L15C: pm8150_2_l15: regulator-pm8150-2-l15 {
		regulator-name = "ldoc15";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1904000>;
		};

		L18C: pm8150_2_l18: regulator-pm8150-2-l18 {
		regulator-name = "ldoc18";
		regulator-min-microvolt = <880000>;
		regulator-max-microvolt = <880000>;
		regulator-allow-set-load;
		};

		S6A: pm8150_1_s6: regulator-pm8150-1-s6 {
		regulator-name = "smpa6";
		regulator-min-microvolt = <600000>;
		regulator-max-microvolt = <1352000>;
		};

		S4C: pm8150_2_s4: regulator-pm8150-2-s4 {
		regulator-name = "smpc4";
		regulator-min-microvolt = <800000>;
		regulator-max-microvolt = <1400000>;
		};

		S5C: pm8150_2_s5: regulator-pm8150-2-s5 {
		regulator-name = "smpc5";
		regulator-min-microvolt = <1824000>;
		regulator-max-microvolt = <2040000>;
		};
		};

		apps_smmu: apps-smmu@0x15000000 {
		compatible = "qcom,qsmmu-v500";
		reg = <0x15000000 0x100000>,
		@@ -149,38 +239,6 @@
		status = "disabled";
		};

		S6A: pm8150_1_s6: regulator-pm8150-1-s6 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm8150_1_s6";
		regulator-min-microvolt = <600000>;
		regulator-max-microvolt = <1352000>;
		qcom,init-voltage = <600000>;
		};

		S4C: pm8150_2_s4: regulator-pm8150-2-s4 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm8150_2_s4";
		regulator-min-microvolt = <800000>;
		regulator-max-microvolt = <1400000>;
		qcom,init-voltage = <800000>;
		};

		S5C: pm8150_2_s5: regulator-pm8150-2-s5 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm8150_2_s5";
		regulator-min-microvolt = <1824000>;
		regulator-max-microvolt = <2040000>;
		qcom,init-voltage = <1824000>;
		};

		L15C: pm8150_2_l15: regulator-pm8150-2-l15 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm8150_2_l15";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1904000>;
		qcom,init-voltage = <1800000>;
		};

		vreg_wlan: vreg_wlan {
		compatible = "qcom,stub-regulator";
		regulator-name = "vreg_wlan";
		@@ -208,62 +266,6 @@
		gpio = <&tlmm 174 0>;
		};

		pm8150_l2: regulator-pm8150-l2 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm8150_l2";
		regulator-min-microvolt = <3072000>;
		regulator-max-microvolt = <3072000>;
		qcom,init-voltage = <3072000>;
		status = "okay";
		};

		pm8150_l5: regulator-pm8150-l5 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm8150_l5";
		regulator-min-microvolt = <880000>;
		regulator-max-microvolt = <880000>;
		qcom,proxy-consumer-enable;
		qcom,proxy-consumer-current = <23800>;
		qcom,init-voltage = <880000>;
		status = "okay";
		};

		pm8150_l12: regulator-pm8150-l12 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm8150_l12";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		qcom,init-voltage = <1800000>;
		status = "okay";
		};

		pm8150l_l3: regulator-pm8150l-l3 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm8150l_l3";
		regulator-min-microvolt = <1200000>;
		regulator-max-microvolt = <1200000>;
		qcom,proxy-consumer-enable;
		qcom,proxy-consumer-current = <51800>;
		qcom,init-voltage = <1200000>;
		status = "okay";
		};

		pm8150_2_l8: regulator-pm8150-2-l8 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm8150_2_l8";
		regulator-min-microvolt = <1200000>;
		regulator-max-microvolt = <1200000>;
		status = "okay";
		};

		pm8150_2_l18: regulator-pm8150-2-l18 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm8150_2_l18";
		regulator-min-microvolt = <880000>;
		regulator-max-microvolt = <880000>;
		status = "okay";
		};

		VDD_CX_LEVEL: VDD_MMCX_LEVEL:
		S9C_LEVEL: pm8150_2_s9_level: regulator-pm8150-2-s9-level {
		compatible = "qcom,stub-regulator";
		@@ -274,24 +276,6 @@
		= <RPMH_REGULATOR_LEVEL_MAX>;
		};

		pcie_0_gdsc: pcie_0_gdsc {
		compatible = "qcom,stub-regulator";
		regulator-name = "pcie_0_gdsc";
		status = "okay";
		};

		usb30_prim_gdsc: usb30_prim_gdsc {
		compatible = "qcom,stub-regulator";
		regulator-name = "usb30_prim_gdsc";
		status = "okay";
		};

		usb30_sec_gdsc: usb30_sec_gdsc {
		compatible = "qcom,stub-regulator";
		regulator-name = "usb30_sec_gdsc";
		status = "okay";
		};

		qcom_seecom: qseecom@87900000 {
		compatible = "qcom,qseecom";
		reg = <0x87900000 0x2200000>;

arch/arm64/configs/vendor/qti-quin-gvm-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -328,6 +328,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
		CONFIG_REGULATOR_PROXY_CONSUMER=y
		CONFIG_REGULATOR_REFGEN=y
		CONFIG_REGULATOR_STUB=y
		CONFIG_VIRTIO_REGULATOR=y
		CONFIG_MEDIA_SUPPORT=y
		CONFIG_MEDIA_CAMERA_SUPPORT=y
		CONFIG_MEDIA_CONTROLLER=y

arch/arm64/configs/vendor/qti-quin-gvm_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
		CONFIG_REGULATOR_PROXY_CONSUMER=y
		CONFIG_REGULATOR_REFGEN=y
		CONFIG_REGULATOR_STUB=y
		CONFIG_VIRTIO_REGULATOR=y
		CONFIG_MEDIA_SUPPORT=y
		CONFIG_MEDIA_CAMERA_SUPPORT=y
		CONFIG_MEDIA_CONTROLLER=y