Merge "Revert "ARM: dts: msm: Disable smb138x charger for sa415m"" (2dd0ba6e) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/boot/dts/qcom/sa415m-cdp.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@

		/dts-v1/;

		#include "sa415m-cdp.dtsi"
		#include "sdxpoorwills-cdp.dtsi"
		#include "sdxpoorwills-display.dtsi"
		#include "qpic-panel-ili-hvga.dtsi"

deleted100644 → 0

+0 −48

Original line number	Diff line number	Diff line
		/* Copyright (c) 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
		* 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.
		*/

		#include "sdxpoorwills-cdp.dtsi"

		&vbus_detect {
		status = "okay";
		};

		&qcom_seecom {
		status = "okay";
		};

		&usb {
		status = "okay";
		qcom,connector-type-uAB;
		extcon = <0>, <0>, <0>, <&vbus_detect>;
		dwc3@a600000 {
		normal-eps-in-gsi-mode;
		};
		};

		&smb138x {
		status = "disabled";
		};

		&thermal_zones {
		mdm-core-step {
		trips {
		mdm-step-trip-0 {
		temperature = <105000>;
		};

		mdm-step-trip-1 {
		temperature = <115000>;
		};
		};
		};
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@

		/dts-v1/;

		#include "sa415m-cdp.dtsi"
		#include "sdxpoorwills-cdp.dtsi"
		#include "sdxpoorwills-v2.dtsi"
		#include "sdxpoorwills-display.dtsi"
		#include "qpic-panel-ili-hvga.dtsi"