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

Commit 9967fbaf authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 74195788 on remote branch 

Change-Id: Id671339e155ee6a0cd89420b17471ef53cec55f8
parents 78d4608b 74195788

Documentation/devicetree/bindings/regulator/gdsc-regulator.txt

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ Optional properties: 
			to enable.

 - qcom,reset-aon-logic: If present, the GPU DEMET cells need to be reset while

			 enabling the GX GDSC.

 - vdd_parent-supply:	phandle to the regulator that this GDSC gates. If

			present, need to vote for a minimum operational voltage

			(LOW_SVS) on the GDSC parent regulator prior to

			configuring it. The vote is removed once the GDSC FSM

			has latched on to the new state.

 - resets: reset specifier pair consisting of phandle for the reset controller

			and reset lines used by this controller. These can be

			supplied only if we support qcom,skip-logic-collapse.

arch/arm/boot/dts/qcom/sdxpoorwills-usb.dtsi

+4 −3
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2017-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
@@ -184,8 +184,8 @@ 
			 0x034 0x07 0x00 /* QSERDES_COM_SSC_STEP_SIZE2_MODE1 */

			 0x024 0xde 0x00 /* QSERDES_COM_SSC_STEP_SIZE1_MODE0 */

			 0x028 0x07 0x00 /* QSERDES_COM_SSC_STEP_SIZE2_MODE0 */

			 0x594 0x31 0x00 /* QSERDES_RX_RX_MODE_01_HIGH4 */

			 0x590 0x39 0x00 /* QSERDES_RX_RX_MODE_01_HIGH3 */

			 0x594 0x33 0x00 /* QSERDES_RX_RX_MODE_01_HIGH4 */

			 0x590 0xb9 0x00 /* QSERDES_RX_RX_MODE_01_HIGH3 */

			 0x58c 0xdb 0x00 /* QSERDES_RX_RX_MODE_01_HIGH2 */

			 0x588 0x54 0x00 /* QSERDES_RX_RX_MODE_01_HIGH */

			 0x584 0xd4 0x00 /* QSERDES_RX_RX_MODE_01_LOW */
@@ -195,6 +195,7 @@ 
			 0x440 0x0f 0x00 /* QSERDES_RX_UCDR_FASTLOCK_COUNT_HIGH */

			 0x434 0x7f 0x00 /* QSERDES_RX_UCDR_SO_SATURATION_AND_ENABLE */

			 0x4d8 0x03 0x00 /* QSERDES_RX_VGA_CAL_CNTRL2 */

			 0x4dc 0x1f 0x00 /* QSERDES_RX_GM_CAL */

			 0x4ec 0x0f 0x00 /* QSERDES_RX_RX_EQU_ADAPTOR_CNTRL2 */

			 0x4f0 0x4a 0x00 /* QSERDES_RX_RX_EQU_ADAPTOR_CNTRL3 */

			 0x4f4 0x08 0x00 /* QSERDES_RX_RX_EQU_ADAPTOR_CNTRL4 */

arch/arm/configs/msm8937-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,6 @@ CONFIG_GPIO_QPNP_PIN=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1360_CHARGER_FG=y
@@ -455,6 +454,7 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_SONY=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

arch/arm/configs/msm8937_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ CONFIG_GPIO_QPNP_PIN=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1360_CHARGER_FG=y
@@ -464,6 +463,7 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_SONY=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

arch/arm/configs/msm8953-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ CONFIG_GPIO_QPNP_PIN=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=y
@@ -454,6 +453,7 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_SONY=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y