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

Commit 2625f856 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: apq: Fixed USB SDHC nodes for SBC8096"

parents d3ec11ff 524324b4
Loading
Loading
Loading
Loading
+2 −31
Original line number Original line Diff line number Diff line
@@ -45,28 +45,6 @@
	pinctrl-0 = <&uart_console_active>;
	pinctrl-0 = <&uart_console_active>;
};
};


&sdhc_1 {
	vdd-supply = <&pm8994_l20>;
	qcom,vdd-voltage-level = <2950000 2950000>;
	qcom,vdd-current-level = <200 570000>;

	vdd-io-supply = <&pm8994_s4>;
	qcom,vdd-io-always-on;
	qcom,vdd-io-voltage-level = <1800000 1800000>;
	qcom,vdd-io-current-level = <110 325000>;

	pinctrl-names = "active", "sleep";
	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_rclk_on>;
	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_rclk_off>;

	qcom,clk-rates = <400000 20000000 25000000 50000000
				96000000 192000000 384000000>;
	qcom,nonremovable;
	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";

	status = "ok";
};

&sdhc_2 {
&sdhc_2 {
	vdd-supply = <&pm8994_l21>;
	vdd-supply = <&pm8994_l21>;
	qcom,vdd-voltage-level = <2950000 2950000>;
	qcom,vdd-voltage-level = <2950000 2950000>;
@@ -395,22 +373,15 @@
	};
	};
};
};


&pmi8994_fg {
	status = "disabled";
};

&pmi8994_charger {
	status = "disabled";
};

&usb_otg_switch {
&usb_otg_switch {
	/delete-property/ vin-supply;
	gpio = <&pm8994_gpios 11 0>;
	gpio = <&pm8994_gpios 11 0>;
	enable-active-high;
	enable-active-high;
	status = "ok";
	status = "ok";
};
};


&usb3 {
&usb3 {
	status = "disabled";
	status = "ok";
	qcom,charging-disabled;
	qcom,charging-disabled;
	vbus_dwc3-supply = <&usb_otg_switch>;
	vbus_dwc3-supply = <&usb_otg_switch>;
	qcom,ext-hub-reset-gpio =  <&tlmm 103 0>;
	qcom,ext-hub-reset-gpio =  <&tlmm 103 0>;