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

Commit f2c40a09 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 configs for PMA8084 GPIO/MPP on APQ8084 based devices"

parents 7708b9d3 a7119dfa

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

+65 −41
Original line number Diff line number Diff line
@@ -159,47 +159,6 @@ 
	qcom,setb-gpios-dir =  <2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2>;

};



&pma8084_gpios {

	gpio@c100 { /* GPIO 2 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@c400 { /* GPIO 5 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@c600 { /* GPIO 7 */

		/* Backlight PWM */

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

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

		qcom,invert = <0>;		/* Do not invert the output */

		qcom,vin-sel = <2>;		/* PMA8084 S4 = 1.8 V */

		qcom,src-sel = <2>;		/* Special Function 1 = LPG 3 */

		qcom,out-strength = <3>;	/* High drive strength */

		qcom,master-en = <1>;

	};



	gpio@cd00 { /* GPIO 14 */

		qcom,mode = <0>;

		qcom,pull = <1>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@d400 { /* GPIO 21 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};

};



&i2c_0 {

	smb349_otg_supply: smb349-charger@1B {

		compatible = "qcom,smb349-charger";
@@ -273,6 +232,10 @@ 
	};



	gpio@c100 { /* GPIO 2 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@c200 { /* GPIO 3 */
@@ -282,24 +245,48 @@ 
	};



	gpio@c400 { /* GPIO 5 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@c500 { /* GPIO 6 */

	};



	gpio@c600 { /* GPIO 7 */

		/* Backlight PWM */

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

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

		qcom,invert = <0>;		/* Do not invert the output */

		qcom,vin-sel = <2>;		/* PMA8084 S4 = 1.8 V */

		qcom,src-sel = <2>;		/* Special Function 1=LPG 3 */

		qcom,out-strength = <3>;	/* High drive strength */

		qcom,master-en = <1>;

	};



	gpio@c700 { /* GPIO 8 */

	};



	gpio@c800 { /* GPIO 9 */

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

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

		qcom,invert = <0>;		/* Do not invert the output */

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

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

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

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

	};



	gpio@c900 { /* GPIO 10 */

	};



	gpio@ca00 { /* GPIO 11 */

		/* VBUS interrupt */

		qcom,mode = <0>;

		qcom,pull = <1>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@cb00 { /* GPIO 12 */
@@ -309,18 +296,51 @@ 
	};



	gpio@cd00 { /* GPIO 14 */

		/* SMB349 STAT */

		qcom,mode = <0>;

		qcom,pull = <1>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@ce00 { /* GPIO 15 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@cf00 { /* GPIO 16 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@d000 { /* GPIO 17 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@d100 { /* GPIO 18 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@d200 { /* GPIO 19 */
@@ -338,6 +358,10 @@ 
	};



	gpio@d400 { /* GPIO 21 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@d500 { /* GPIO 22 */

arch/arm/boot/dts/apq8084-liquid.dtsi

+161 −24
Original line number Diff line number Diff line
@@ -16,17 +16,6 @@ 
	};

};



&pma8084_mpps {

	mpp@a200 { /* MPP 3 */

		/* ext_5v enable */

		qcom,mode = <1>;

		qcom,invert = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

	};

};



&soc {

	sound {

		qcom,model = "apq8084-taiko-liquid-snd-card";
@@ -136,19 +125,6 @@ 
	qcom,setb-gpios-dir =  <2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2>;

};



&pma8084_gpios {

	gpio@c600 { /* GPIO 7 */

		/* Backlight PWM */

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

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

		qcom,invert = <0>;		/* Do not invert the output */

		qcom,vin-sel = <2>;		/* PMA8084 S4 = 1.8 V */

		qcom,src-sel = <2>;		/* Special Function 1 = LPG 3 */

		qcom,out-strength = <3>;	/* High drive strength */

		qcom,master-en = <1>;

	};

};



&sdhc_1 {

	vdd-supply = <&pma8084_l20>;

	qcom,vdd-voltage-level = <2950000 2950000>;
@@ -210,3 +186,164 @@ 
		qcom,cdc-micbias4-ext-cap;

	};

};



&pma8084_gpios {

	gpio@c000 { /* GPIO 1 */

	};



	gpio@c100 { /* GPIO 2 */

	};



	gpio@c200 { /* GPIO 3 */

	};



	gpio@c300 { /* GPIO 4 */

	};



	gpio@c400 { /* GPIO 5 */

	};



	gpio@c500 { /* GPIO 6 */

	};



	gpio@c600 { /* GPIO 7 */

		/* Backlight PWM */

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

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

		qcom,invert = <0>;		/* Do not invert the output */

		qcom,vin-sel = <2>;		/* PMA8084 S4 = 1.8 V */

		qcom,src-sel = <2>;		/* Special Function 1=LPG 3 */

		qcom,out-strength = <3>;	/* High drive strength */

		qcom,master-en = <1>;

	};



	gpio@c700 { /* GPIO 8 */

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

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

		qcom,invert = <0>;		/* Output low initially */

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

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

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

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

	};



	gpio@c800 { /* GPIO 9 */

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

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

		qcom,invert = <0>;		/* Output low initially */

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

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

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

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

	};



	gpio@c900 { /* GPIO 10 */

	};



	gpio@ca00 { /* GPIO 11 */

		/* VBUS interrupt */

		qcom,mode = <0>;

		qcom,pull = <1>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@cb00 { /* GPIO 12 */

	};



	gpio@cc00 { /* GPIO 13 */

	};



	gpio@cd00 { /* GPIO 14 */

	};



	gpio@ce00 { /* GPIO 15 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@cf00 { /* GPIO 16 */

	};



	gpio@d000 { /* GPIO 17 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@d100 { /* GPIO 18 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@d200 { /* GPIO 19 */

	};



	gpio@d300 { /* GPIO 20 */

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

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

		qcom,invert = <0>;		/* Output low initially */

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

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

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

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

	};



	gpio@d400 { /* GPIO 21 */

	};



	gpio@d500 { /* GPIO 22 */

	};

};



&pma8084_mpps {

	mpp@a000 { /* MPP 1 */

	};



	mpp@a100 { /* MPP 2 */

	};



	mpp@a200 { /* MPP 3 */

		/* HDMI_5v_vreg regulator enable */

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

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

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

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

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

	};



	mpp@a300 { /* MPP 4 */

	};



	mpp@a400 { /* MPP 5 */

	};



	mpp@a500 { /* MPP 6 */

	};



	mpp@a600 { /* MPP 7 */

		/* QCA1350_vreg regulator enable */

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

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

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

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

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

	};



	mpp@a700 { /* MPP 8 */

	};

};

arch/arm/boot/dts/apq8084-mtp.dtsi

+167 −34
Original line number Diff line number Diff line
@@ -152,40 +152,6 @@ 
	qcom,setb-gpios-dir =  <2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2>;

};



&pma8084_gpios {

	gpio@c100 { /* GPIO 2 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@c400 { /* GPIO 5 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@c600 { /* GPIO 7 */

		/* Backlight PWM */

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

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

		qcom,invert = <0>;		/* Do not invert the output */

		qcom,vin-sel = <2>;		/* PMA8084 S4 = 1.8 V */

		qcom,src-sel = <2>;		/* Special Function 1 = LPG 3 */

		qcom,out-strength = <3>;	/* High drive strength */

		qcom,master-en = <1>;

	};



	gpio@d400 { /* GPIO 21 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};

};



&sdhc_1 {

	vdd-supply = <&pma8084_l20>;

	qcom,vdd-voltage-level = <2950000 2950000>;
@@ -262,3 +228,170 @@ 
		synaptics,i2c-pull-up;

	};

};



&pma8084_gpios {

	gpio@c000 { /* GPIO 1 */

	};



	gpio@c100 { /* GPIO 2 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@c200 { /* GPIO 3 */

	};



	gpio@c300 { /* GPIO 4 */

	};



	gpio@c400 { /* GPIO 5 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@c500 { /* GPIO 6 */

	};



	gpio@c600 { /* GPIO 7 */

		/* Backlight PWM */

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

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

		qcom,invert = <0>;		/* Do not invert the output */

		qcom,vin-sel = <2>;		/* PMA8084 S4 = 1.8 V */

		qcom,src-sel = <2>;		/* Special Function 1=LPG 3 */

		qcom,out-strength = <3>;	/* High drive strength */

		qcom,master-en = <1>;

	};



	gpio@c700 { /* GPIO 8 */

	};



	gpio@c800 { /* GPIO 9 */

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

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

		qcom,invert = <0>;		/* Do not invert the output */

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

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

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

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

	};



	gpio@c900 { /* GPIO 10 */

	};



	gpio@ca00 { /* GPIO 11 */

		/* VBUS interrupt */

		qcom,mode = <0>;

		qcom,pull = <1>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@cb00 { /* GPIO 12 */

	};



	gpio@cc00 { /* GPIO 13 */

	};



	gpio@cd00 { /* GPIO 14 */

	};



	gpio@ce00 { /* GPIO 15 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@cf00 { /* GPIO 16 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@d000 { /* GPIO 17 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@d100 { /* GPIO 18 */

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

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

		qcom,invert = <0>;		/* Output low initially */

		qcom,vin-sel = <2>;		/* VIN 2 */

		qcom,src-sel = <2>;		/* Function 1 */

		qcom,out-strength = <2>;	/* Medium */

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

	};



	gpio@d200 { /* GPIO 19 */

	};



	gpio@d300 { /* GPIO 20 */

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

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

		qcom,invert = <0>;		/* Do not invert the output */

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

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

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

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

	};



	gpio@d400 { /* GPIO 21 */

		qcom,mode = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

	};



	gpio@d500 { /* GPIO 22 */

	};

};



&pma8084_mpps {

	mpp@a000 { /* MPP 1 */

	};



	mpp@a100 { /* MPP 2 */

	};



	mpp@a200 { /* MPP 3 */

		/* HDMI_5v_vreg regulator enable */

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

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

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

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

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

	};



	mpp@a300 { /* MPP 4 */

	};



	mpp@a400 { /* MPP 5 */

	};



	mpp@a500 { /* MPP 6 */

	};



	mpp@a600 { /* MPP 7 */

	};



	mpp@a700 { /* MPP 8 */

	};

};