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

Commit 914ee425 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove extcon property for Trinket"

parents 90bb3adc 22f98c63

arch/arm64/boot/dts/qcom/trinket-idp.dtsi

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

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, 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
@@ -71,3 +71,7 @@ 
	qcom,sec-charger-config = <2>;

	dpdm-supply = <&qusb_phy0>;

};



&usb0 {

	extcon = <&pmi632_charger>;

};

arch/arm64/boot/dts/qcom/trinket-rumi.dtsi

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

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, 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
@@ -50,7 +50,6 @@ 
};



&usb0 {

	extcon = <0>;

	dwc3@4e00000 {

		usb-phy = <&usb_emu_phy>, <&usb_nop_phy>;

		maximum-speed = "high-speed";

arch/arm64/boot/dts/qcom/trinket.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -2021,8 +2021,4 @@ 
&venus_gdsc {

	status = "ok";

};



&usb0 {

	extcon = <&pmi632_charger>;

};

#include "trinket-thermal.dtsi"