Merge "ARM: dts: msm: Add virtio regulator on sa6155p virtual machine" (bacc0533) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -119,9 +119,9 @@
		"tune2_efuse_addr",
		"tcsr_conn_box_spare_0";

		vdd-supply = <&pm6150_l4>;
		vdda18-supply = <&pm6150_l11>;
		vdda33-supply = <&pm6150_l17>;
		vdd-supply = <&L5A>;
		vdda18-supply = <&L12A>;
		vdda33-supply = <&L13A>;
		qcom,vdd-voltage-level = <0 925000 975000>;
		qcom,tune2-efuse-bit-pos = <25>;
		qcom,tune2-efuse-num-bits = <4>;
		@@ -159,8 +159,8 @@
		reg-names = "qmp_phy_base",
		"vls_clamp_reg";

		vdd-supply = <&pm6150_l4>;
		core-supply = <&pm6150_l11>;
		vdd-supply = <&L5A>;
		core-supply = <&L12A>;
		qcom,vdd-voltage-level = <0 925000 975000>;
		qcom,core-voltage-level = <0 1800000 1800000>;
		qcom,qmp-phy-init-seq =
		@@ -370,9 +370,9 @@
		reg-names = "qusb_phy_base",
		"tcsr_conn_box_spare_0";

		vdd-supply = <&pm6150_l4>;
		vdda18-supply = <&pm6150_l11>;
		vdda33-supply = <&pm6150_l17>;
		vdd-supply = <&L5A>;
		vdda18-supply = <&L12A>;
		vdda33-supply = <&L13A>;
		qcom,vdd-voltage-level = <0 925000 975000>;
		qcom,qusb-phy-init-seq = <0xc8 0x80
		0xb3 0x84

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

+48 −77

Original line number	Diff line number	Diff line
		@@ -53,6 +53,54 @@
		#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";
		};

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

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

		L2A: pm6155_1_l2: regulator-pm6155-1-l2 {
		regulator-name = "ldoa2";
		regulator-min-microvolt = <1650000>;
		regulator-max-microvolt = <3100000>;
		};

		L5A: pm6155_1_l5: regulator-pm6155-1-l5 {
		regulator-name = "ldoa5";
		regulator-min-microvolt = <875000>;
		regulator-max-microvolt = <975000>;
		};

		L10A: pm6155_1_l10: regulator-pm6155-1-l10 {
		regulator-name = "ldoa10";
		regulator-min-microvolt = <2950000>;
		regulator-max-microvolt = <3312000>;
		};

		L12A: pm6155_1_l12: regulator-pm6155-1-l12 {
		regulator-name = "ldoa12";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1890000>;
		};

		L13A: pm6155_1_l13: regulator-pm6155-1-l13 {
		regulator-name = "ldoa13";
		regulator-min-microvolt = <3000000>;
		regulator-max-microvolt = <3230000>;
		};
		};

		apps_smmu: apps-smmu@0x15000000 {
		compatible = "qcom,qsmmu-v500";
		reg = <0x15000000 0x80000>,
		@@ -140,45 +188,6 @@
		status = "ok";
		};

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

		usb20_sec_gdsc: usb20_sec_gdsc {
		compatible = "qcom,stub-regulator";
		regulator-name = "usb20_sec_gdsc";
		status = "ok";
		};

		pm6150_l11: regulator-pm6150-l11 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm6150_l11";
		qcom,hpm-min-load = <10000>;
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1890000>;
		status = "ok";
		};

		pm6150_l4: regulator-pm6150-l4 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm6150_l4";
		qcom,hpm-min-load = <10000>;
		regulator-min-microvolt = <875000>;
		regulator-max-microvolt = <975000>;
		status = "ok";
		};

		pm6150_l17: regulator-pm6150-l17 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm6150_l17";
		qcom,hpm-min-load = <10000>;
		regulator-min-microvolt = <3000000>;
		regulator-max-microvolt = <3230000>;
		status = "ok";
		};

		qcom_seecom: qseecom@86d00000 {
		compatible = "qcom,qseecom";
		reg = <0x86d00000 0xe00000>;
		@@ -192,38 +201,6 @@
		qcom,qsee-reentrancy-support = <2>;
		};

		pm6155_1_l10: regulator-pm6155-1-l10 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm6155_1_l10";
		regulator-min-microvolt = <2950000>;
		regulator-max-microvolt = <3312000>;
		status = "ok";
		};

		pm6155_1_l2: regulator-pm6155-1-l2 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm6155_1_l2";
		regulator-min-microvolt = <1650000>;
		regulator-max-microvolt = <3100000>;
		status = "ok";
		};

		pm6155_1_l12: regulator-pm6155-1-l12 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm6155_1_l12";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1890000>;
		status = "ok";
		};

		pm6155_1_l5: regulator-pm6155-1-l5 {
		compatible = "qcom,stub-regulator";
		regulator-name = "pm6155_1_l5";
		regulator-min-microvolt = <875000>;
		regulator-max-microvolt = <975000>;
		status = "ok";
		};

		VDD_CX_LEVEL: VDD_MX_LEVEL: S2A_LEVEL:
		pm6155_1_s2_level: regulator-pm6155-1-s2-level {
		compatible = "qcom,stub-regulator";
		@@ -234,12 +211,6 @@
		= <RPMH_REGULATOR_LEVEL_MAX>;
		};

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

		vreg_wlan: vreg_wlan {
		compatible = "qcom,stub-regulator";
		regulator-name = "vreg_wlan";