Merge "ARM: dts: msm: Disable UART_4 on SA515M CCARD boards" (6f4fe506) · Commits · e / devices / android_kernel_xiaomi_sm6125

arch/arm64/boot/dts/qcom/sa515m-ccard.dtsi

+11 −4

Original line number	Diff line number	Diff line
		@@ -116,10 +116,6 @@
		status = "okay";
		};

		&blsp1_uart4a_hs {
		status = "okay";
		};

		&vbus_detect {
		status = "okay";
		};
		@@ -194,3 +190,14 @@
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		};

		&cnss_qca6390 {
		vdd-wlan-ctrl1-supply = <&vreg_conn_pa>;
		vdd-wlan-aon-supply = <&pmxprairie_s3>;
		vdd-wlan-rfa1-supply = <&pmxprairie_s2>;
		vdd-wlan-rfa3-supply = <&pmxprairie_s4>;
		qcom,vdd-wlan-ctrl1-info = <0 0 0 0>;
		qcom,vdd-wlan-aon-info = <950000 950000 0 0>;
		qcom,vdd-wlan-rfa1-info = <1350000 1350000 0 0>;
		qcom,vdd-wlan-rfa3-info = <1904000 1904000 450000 0>;
		};

+9 −0

Original line number	Diff line number	Diff line
		@@ -508,4 +508,13 @@
		gpio = <&tlmm 102 GPIO_ACTIVE_HIGH>;
		enable-active-high;
		};

		/* PWR_CTR1_VDD_PA supply */
		vreg_conn_pa: vreg_conn_pa {
		compatible = "regulator-fixed";
		regulator-name = "vreg_conn_pa";
		startup-delay-us = <4000>;
		enable-active-high;
		gpio = <&pmxprairie_gpios 2 GPIO_ACTIVE_HIGH>;
		};
		};