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

Commit ed75ac06 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 SMB349 device for APQ8084"

parents abf9d1a5 80e30992

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

+17 −0
Original line number Diff line number Diff line
@@ -102,6 +102,23 @@ 
		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>;

	};

};



&i2c_0 {

	smb349-charger@1B {

		compatible = "qcom,smb349-charger";

		reg = <0x1B>;

		interrupt-parent = <&spmi_bus>;

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

		qcom,charging-disabled;

	};

};



&sdhc_1 {

arch/arm/boot/dts/apq8084.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ 
		qcom,i2c-src-freq = <50000000>;

		qcom,sda-gpio = <&msmgpio 10 0>;

		qcom,scl-gpio = <&msmgpio 11 0>;

		qcom,master-id = <86>;

	};



	qcom,clock-krait@f9016000 {