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

Commit 316f3dab 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: Move PMIC GPIO4 configuration on mdm9607"

parents ecb24cf6 6da5199e

arch/arm/boot/dts/qcom/mdm9607-cdp.dtsi

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

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

 * Copyright (c) 2015-2017, 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
@@ -104,18 +104,6 @@ 
	};

};



&pm8019_gpios {

	gpio@c300 { /* GPIO 4 */

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

		qcom,invert = <0>;		/* Output high */

		qcom,vin-sel = <0>;		/* VPH_PWR */

		qcom,src-sel = <0>;		/* GPIO */

		qcom,out-strength = <1>;	/* Low drive strength */

		qcom,master-en = <1>;		/* Enable GPIO */

	};

};



/* MPP pin 4 configs for SGMII */

&pm8019_mpps {

	mpp@a300 { /* MPP 4 */

arch/arm/boot/dts/qcom/mdm9607-mtp-sdcard.dts

+12 −0
Original line number Diff line number Diff line
@@ -43,3 +43,15 @@ 
	status = "ok";

};



&pm8019_gpios {

	gpio@c300 { /* GPIO 4 */

		qcom,mode = <1>;		/* Digital Output */

		qcom,output-type = <0>;		/* CMOS Logic */

		qcom,invert = <0>;		/* Output High */

		qcom,vin-sel = <0>;		/* VPH_PWR */

		qcom,src-sel = <0>;		/* GPIO */

		qcom,out-strength = <1>;	/* Low Drive Strength */

		qcom,master-en = <1>;		/* Enable GPIO */

	};

};

arch/arm/boot/dts/qcom/mdm9607-mtp.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -141,18 +141,6 @@ 
	status = "ok";

};



&pm8019_gpios {

	gpio@c300 { /* GPIO 4 */

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

		qcom,invert = <0>;		/* Output high */

		qcom,vin-sel = <0>;		/* VPH_PWR */

		qcom,src-sel = <0>;		/* GPIO */

		qcom,out-strength = <1>;	/* Low drive strength */

		qcom,master-en = <1>;		/* Enable GPIO */

	};

};



/* MPP pin 4 configs for SGMII */

&pm8019_mpps {

	mpp@a300 { /* MPP 4 */