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

Commit 8a5b3195 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: Rearrange SDHC 1 & 2 device node hierarchy for msmsamarium CDP"

parents f5a1a6ad f2c10c0f

arch/arm/boot/dts/msmsamarium-cdp-interposer.dts

+0 −42
Original line number Diff line number Diff line
@@ -55,48 +55,6 @@ 
	qcom,mdss-dsi-pwm-gpio = <&pma8084_gpios 8 0>;

};



&sdhc_1 {

	vdd-supply = <&pma8084_l20>;

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

	qcom,vdd-current-level = <200 500000>;



	vdd-io-supply = <&pma8084_s4>;

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

	qcom,vdd-io-current-level = <200 154000>;

	qcom,vdd-io-always-on;



	qcom,pad-pull-on = <0x0 0x3 0x3 0x1>; /* no-pull, pull-up, pull-up, pull-down */

	qcom,pad-pull-off = <0x0 0x3 0x3 0x1>; /* no-pull, pull-up, pull-up, pull-down */

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 200000000 400000000>;

	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";

	qcom,nonremovable;



	status = "ok";

};



&sdhc_2 {

	vdd-supply = <&pma8084_l21>;

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

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



	vdd-io-supply = <&pma8084_l13>;

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

	qcom,vdd-io-current-level = <200 22000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 200000000>;

	qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";



	status = "ok";

};



&usb3 {

	status = "disabled";

};

arch/arm/boot/dts/msmsamarium-cdp.dts

+0 −42
Original line number Diff line number Diff line
@@ -23,48 +23,6 @@ 
	qcom,board-id = <1 0>;

};



&sdhc_1 {

	vdd-supply = <&pma8084_l20>;

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

	qcom,vdd-current-level = <200 500000>;



	vdd-io-supply = <&pma8084_s4>;

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

	qcom,vdd-io-current-level = <200 154000>;

	qcom,vdd-io-always-on;



	qcom,pad-pull-on = <0x0 0x3 0x3 0x1>; /* no-pull, pull-up, pull-up, pull-down */

	qcom,pad-pull-off = <0x0 0x3 0x3 0x1>; /* no-pull, pull-up, pull-up, pull-down */

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 200000000 400000000>;

	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";

	qcom,nonremovable;



	status = "ok";

};



&sdhc_2 {

	vdd-supply = <&pma8084_l21>;

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

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



	vdd-io-supply = <&pma8084_l13>;

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

	qcom,vdd-io-current-level = <200 22000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 200000000>;

	qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";



	status = "ok";

};



&slim_msm {

	tapan_codec {

		qcom,cdc-micbias1-ext-cap;

arch/arm/boot/dts/msmsamarium-cdp.dtsi

+42 −0
Original line number Diff line number Diff line
@@ -340,3 +340,45 @@ 
		regulator-name = "smb1359_otg_supply";

	};

};



&sdhc_1 {

	vdd-supply = <&pma8084_l20>;

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

	qcom,vdd-current-level = <200 500000>;



	vdd-io-supply = <&pma8084_s4>;

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

	qcom,vdd-io-current-level = <200 154000>;

	qcom,vdd-io-always-on;



	qcom,pad-pull-on = <0x0 0x3 0x3 0x1>; /* no-pull, pull-up, pull-up, pull-down */

	qcom,pad-pull-off = <0x0 0x3 0x3 0x1>; /* no-pull, pull-up, pull-up, pull-down */

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 200000000 400000000>;

	qcom,bus-speed-mode = "HS400_1p8v", "HS200_1p8v", "DDR_1p8v";

	qcom,nonremovable;



	status = "ok";

};



&sdhc_2 {

	vdd-supply = <&pma8084_l21>;

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

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



	vdd-io-supply = <&pma8084_l13>;

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

	qcom,vdd-io-current-level = <200 22000>;



	qcom,pad-pull-on = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-pull-off = <0x0 0x3 0x3>; /* no-pull, pull-up, pull-up */

	qcom,pad-drv-on = <0x7 0x4 0x4>; /* 16mA, 10mA, 10mA */

	qcom,pad-drv-off = <0x0 0x0 0x0>; /* 2mA, 2mA, 2mA */



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000 200000000>;

	qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";



	status = "ok";

};