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

Commit a4b33664 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: msm: Add VDD rail for SD card slot on mdmcalifornium"

parents 12b0c270 15816757

arch/arm/boot/dts/qcom/mdmcalifornium-nand-cdp.dts

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -26,6 +26,8 @@ 
};



&sdhc_1 {

	vdd-supply = <&sdc_vreg>;



	vdd-io-supply = <&pmdcalifornium_l7>;

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

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

arch/arm/boot/dts/qcom/mdmcalifornium-nand-mtp.dts

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -22,6 +22,8 @@ 
};



&sdhc_1 {

	vdd-supply = <&sdc_vreg>;



	vdd-io-supply = <&pmdcalifornium_l7>;

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

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

arch/arm/boot/dts/qcom/mdmcalifornium-regulator.dtsi

+10 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -259,4 +259,13 @@ 
		enable-active-high;

		gpio = <&pmdcalifornium_gpios 6 0>;

	};



	/* SD card 2.95 V supply */

	sdc_vreg: sdc_vreg {

		compatible = "regulator-fixed";

		regulator-name = "sdc_vreg";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&tlmm_pinmux 50 0>;

	};

};