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

Commit 1d1dd554 authored by Abhijeet Dharmapurikar's avatar Abhijeet Dharmapurikar
Browse files

ARM: dts: msm: Split APQ8084 CDP and MTP DT files based on SMB chips used 



The CDP and MTP boards need to be further split based on whether
they have SMB1357 or SMB349 charger chips.

For a CDP
The platform subtype value of 0 and 1 indicates presence of SMB349
while 2, 3 and 4 indicates presence of SMB1357.

For a MTP
The platform subtype value 1 indicates presence of SMB349
while 2 and 3 indicates presence of SMB1357.

While at it, add SMB1357 device definitions for boards that have it
and move the already existing SMB349 device definitions to the
appropriate files. These devices are used by USB driver for its
otg supply, move the phandles referencing them accordingly.

Change-Id: Ib5d8e1a1f749a6cfdc9bcca16d68c3a5b9f40214
Signed-off-by: default avatarAbhijeet Dharmapurikar <adharmap@codeaurora.org>
parent f5edc513

arch/arm/boot/dts/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -172,10 +172,12 @@ dtb-$(CONFIG_ARCH_MSMSAMARIUM) += msmsamarium-sim.dtb \ 
dtb-$(CONFIG_ARCH_MPQ8092) += mpq8092-sim.dtb \

	mpq8092-rumi.dtb

dtb-$(CONFIG_ARCH_APQ8084) += apq8084-sim.dtb \

	apq8084-cdp.dtb \

	apq8084-interposer-cdp.dtb \

	apq8084-liquid.dtb \

	apq8084-mtp.dtb

	apq8084-smb1357-cdp.dtb \

	apq8084-smb1357-mtp.dtb \

	apq8084-smb349-cdp.dtb \

	apq8084-smb349-mtp.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \

	armada-370-mirabox.dtb \

	armada-370-rd.dtb \

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

+0 −15
Original line number Diff line number Diff line
@@ -203,21 +203,6 @@ 
	qcom,setb-gpios-dir =  <2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2>;

};



&i2c_0 {

	smb349_otg_supply: smb349-charger@1B {

		compatible = "qcom,smb349-charger";

		reg = <0x1B>;

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x00 0xCD 0x0>; /* PMIC8084 GPIO 14 */

		qcom,charging-disabled;

		regulator-name = "smb349_otg_supply";

	};

};



&usb3 {

	vbus_dwc3-supply = <&smb349_otg_supply>;

};



&sdhc_1 {

	vdd-supply = <&pma8084_l20>;

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

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

+0 −14
Original line number Diff line number Diff line
@@ -482,16 +482,6 @@ 
	};

};



&i2c_0 {

	smb349_otg_supply: smb349-charger@1b {

		compatible = "qcom,smb349-charger";

		reg = <0x1b>;

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x00 0xcd 0x0>; /* PMIC8084 GPIO 14 */

		regulator-name = "smb349_otg_supply";

	};

};



&i2c_2 {

	isa1200@48 {

		status = "okay";
@@ -514,7 +504,3 @@ 
		};

	};

};
 


&usb3 {

	vbus_dwc3-supply = <&smb349_otg_supply>;

};

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

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2013, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



/include/ "apq8084.dtsi"

/include/ "apq8084-cdp.dtsi"



/ {

	model = "Qualcomm APQ 8084, SMB1357 CDP";

	compatible = "qcom,apq8084-cdp", "qcom,apq8084", "qcom,cdp";

	qcom,board-id = <1 2>,

			<1 3>,

			<1 4>,

			<21 2>,

			<21 3>,

			<21 4>;

};



&i2c_0 {

	smb1357_otg_vreg: smb1357-charger@1c {

		compatible = "qcom,smb1357-charger";

		reg = <0x1c>;

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x0 0xcd 0x0>;	/* PMA8084 GPIO 14 */

		qcom,float-voltage-mv = <4200>;

		qcom,charging-timeout = <1536>;

		qcom,recharge-thresh-mv = <200>;

		qcom,iterm-ma = <100>;

		regulator-name = "smb1357_otg_vreg";

		qcom,soft-vfloat-comp-disabled;

	};

};



&usb3 {

	vbus_dwc3-supply = <&smb1357_otg_vreg>;

};

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

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2013, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



/include/ "apq8084.dtsi"

/include/ "apq8084-mtp.dtsi"



/ {

	model = "Qualcomm APQ 8084, SMB1357 MTP";

	compatible = "qcom,apq8084-mtp", "qcom,apq8084", "qcom,mtp";

	qcom,board-id = <8 2>,

			<8 3>;

};



&i2c_0 {

	smb1357_otg_vreg: smb1357-charger@1c {

		compatible = "qcom,smb1357-charger";

		reg = <0x1c>;

		interrupt-parent = <&spmi_bus>;

		interrupts = <0x0 0xcd 0x0>;	/* PMA8084 GPIO 14 */

		qcom,float-voltage-mv = <4200>;

		qcom,charging-timeout = <1536>;

		qcom,recharge-thresh-mv = <200>;

		qcom,iterm-ma = <100>;

		regulator-name = "smb1357_otg_vreg";

		qcom,soft-vfloat-comp-disabled;

	};

};



&usb3 {

	vbus_dwc3-supply = <&smb1357_otg_vreg>;

};