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

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

Merge "ARM: dts: msm: Enable NAND and SD card for sdxlemur target"

parents a4be9294 aaf5337d

qcom/sdxlemur-cdp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
};



&sdhc_1 {

	status = "disabled";

	status = "ok";



	vdd-supply = <&vreg_sd_vdd>;

	qcom,vdd-voltage-level = <2950000 2950000>;

qcom/sdxlemur-mtp-mbb.dtsi

+0 −32
Original line number Diff line number Diff line
@@ -32,38 +32,6 @@ 
	qcom,l1-2-th-value = <70>;

};



&qnand_1 {

	status = "ok";

};



&sdhc_1 {

	reg = <0x08804000 0x1000>, <0x08805000 0x1000>;

	reg-names = "hc_mem", "cqhci_mem";



	mmc-ddr-1_8v;

	mmc-hs200-1_8v;



	bus-width = <8>;

	non-removable;

	supports-cqe;



	vdd-supply = <&vreg_sd_vdd>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <0 570000>;



	vdd-io-supply = <&L6B>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

	qcom,vdd-io-current-level = <0 200000>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc1_on>;

	pinctrl-1 = <&sdc1_off>;



	status = "disabled";

};



&pm7250b_vadc {

	charger_skin_therm {

		reg = <ADC5_AMUX_THM1_100K_PU>;

qcom/sdxlemur-rcm-pcie-ep.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -4,3 +4,24 @@ 


};



&qnand_1 {

	status = "ok";

};



&sdhc_1 {

	status = "ok";



	vdd-supply = <&vreg_sd_vdd>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <0 800000>;



	vdd-io-supply = <&vreg_vddpx_2>;

	qcom,vdd-io-voltage-level = <1800000 2850000>;

	qcom,vdd-io-current-level = <0 10000>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;



	cd-gpios = <&tlmm 99 GPIO_ACTIVE_LOW>;

};

qcom/sdxlemur-rcm-rc.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -32,6 +32,28 @@ 
	qcom,l1-2-th-value = <70>;

};



&qnand_1 {

	status = "ok";

};



&sdhc_1 {

	status = "ok";



	vdd-supply = <&vreg_sd_vdd>;

	qcom,vdd-voltage-level = <2950000 2950000>;

	qcom,vdd-current-level = <0 800000>;



	vdd-io-supply = <&vreg_vddpx_2>;

	qcom,vdd-io-voltage-level = <1800000 2850000>;

	qcom,vdd-io-current-level = <0 10000>;



	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;



	cd-gpios = <&tlmm 99 GPIO_ACTIVE_LOW>;

};



&pm7250b_vadc {

	charger_skin_therm {

		reg = <ADC5_AMUX_THM1_100K_PU>;