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

Commit 8ae4df9e 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: 8974: Add qpnp-vadc phandle for usb3 device node"

parents c42e15ba e3dc9b05

arch/arm/boot/dts/qcom/msm8974-v1.dtsi

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

/* Copyright (c) 2013-2014, 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
@@ -185,6 +185,10 @@ 
	qcom,hsusb-otg-pnoc-errata-fix;

};



&usb3 {

	qcom,usbin-vadc = <&pm8941_vadc>;

};



&gdsc_venus {

	qcom,skip-logic-collapse;

	qcom,retain-periph;

arch/arm/boot/dts/qcom/msm8974-v2.dtsi

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

/* Copyright (c) 2013-2014, 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
@@ -95,6 +95,10 @@ 
	};

};



&usb3 {

	qcom,usbin-vadc = <&pm8941_vadc>;

};



/* GPU overrides */

&msm_gpu {

	/* Updated chip ID */

arch/arm/boot/dts/qcom/msm8974pro-ac-pma8084-pm8941.dtsi

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

/* Copyright (c) 2013-2014, 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
@@ -102,6 +102,7 @@ 
	vbus_dwc3-supply = <&pm8941_mvs1>;

	qcom,misc-ref = <&pm8941_misc>;

	dwc_usb3-adc_tm = <&pm8941_adc_tm>;

	qcom,usbin-vadc = <&pm8941_vadc>;

	interrupt-map-mask = <0x0 0xffffffff>;

	interrupt-map = <0x0 0 &intc 0 133 0

			0x0 1 &spmi_bus 0x0 0x2 0x9 0x0>;

arch/arm/boot/dts/qcom/msm8974pro-pm8941.dtsi

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

/* Copyright (c) 2013-2014, 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
@@ -64,6 +64,10 @@ 
	qcom,init-smps-mode = <0>;	/* Allow AUTO mode for VDD_CX. */

};



&usb3 {

	qcom,usbin-vadc = <&pm8941_vadc>;

};



&krait_regulator_pmic {

	status = "ok";