Merge "ARM: dts: msm: Correct the regulator handles for MSM8920 QRD board" (3c1f5c76) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/msm8920-pmi8940-qrd-sku7.dtsi

+4 −4

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2017, 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
		@@ -14,7 +14,7 @@
		#include "msm-pmi8940.dtsi"
		#include "msm8920-qrd.dtsi"
		#include "msm8937-mdss-panels.dtsi"
		#include "msm8940-camera-sensor-qrd.dtsi"
		#include "msm8917-camera-sensor-qrd.dtsi"

		/ {
		qrd_batterydata: qcom,battery-data {
		@@ -60,8 +60,8 @@
		reg = <0x38>;
		interrupt-parent = <&tlmm>;
		interrupts = <65 0x2>;
		vdd-supply = <&pm8937_l10>;
		vcc_i2c-supply = <&pm8937_l5>;
		vdd-supply = <&pm8917_l10>;
		vcc_i2c-supply = <&pm8917_l5>;
		/* pins used by touchscreen */
		pinctrl-names = "pmx_ts_active",
		"pmx_ts_suspend",

+5 −6

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2017, 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
		@@ -12,7 +12,6 @@
		*/

		#include "msm8917-pinctrl.dtsi"
		#include "msm8937-regulator.dtsi"

		&soc {
		gpio_keys {
		@@ -80,12 +79,12 @@

		&sdhc_1 {
		/* device core power supply */
		vdd-supply = <&pm8937_l8>;
		vdd-supply = <&pm8917_l8>;
		qcom,vdd-voltage-level = <2900000 2900000>;
		qcom,vdd-current-level = <200 570000>;

		/* device communication power supply */
		vdd-io-supply = <&pm8937_l5>;
		vdd-io-supply = <&pm8917_l5>;
		qcom,vdd-io-always-on;
		qcom,vdd-io-lpm-sup;
		qcom,vdd-io-voltage-level = <1800000 1800000>;
		@@ -105,12 +104,12 @@

		&sdhc_2 {
		/* device core power supply */
		vdd-supply = <&pm8937_l11>;
		vdd-supply = <&pm8917_l11>;
		qcom,vdd-voltage-level = <2950000 2950000>;
		qcom,vdd-current-level = <15000 800000>;

		/* device communication power supply */
		vdd-io-supply = <&pm8937_l12>;
		vdd-io-supply = <&pm8917_l12>;
		qcom,vdd-io-voltage-level = <1800000 2950000>;
		qcom,vdd-io-current-level = <200 22000>;