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

Commit bb23eb5d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: defconfig: Enable power drivers for sdxpoorwills"

parents 0ccdb1f6 cb9692a8

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

+2 −2
Original line number Diff line number Diff line
@@ -457,9 +457,9 @@ 
				<CONTROL_TCS   1>;

	};



	cmd_db: qcom,cmd-db@ca0000c {

	cmd_db: qcom,cmd-db@c37000c {

		compatible = "qcom,cmd-db";

		reg = <0xca0000c 8>;

		reg = <0xc37000c 8>;

	};



	system_pm {

arch/arm/configs/sdxpoorwills-perf_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ CONFIG_USB_BAM=y 
CONFIG_MDM_GCC_SDXPOORWILLS=y

CONFIG_MDM_CLOCK_CPU_SDXPOORWILLS=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_MSM_QMP=y

CONFIG_QCOM_SCM=y

CONFIG_MSM_BOOT_STATS=y
@@ -317,6 +316,7 @@ CONFIG_MSM_GLINK=y 
CONFIG_MSM_GLINK_LOOPBACK_SERVER=y

CONFIG_MSM_GLINK_SMEM_NATIVE_XPRT=y

CONFIG_TRACER_PKT=y

CONFIG_QTI_RPMH_API=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_QMI_INTERFACE=y
@@ -324,6 +324,8 @@ CONFIG_MSM_GLINK_PKT=y 
CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_MSM_PM=y

CONFIG_IIO=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

arch/arm/configs/sdxpoorwills_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ CONFIG_QPNP_REVID=y 
CONFIG_MDM_GCC_SDXPOORWILLS=y

CONFIG_MDM_CLOCK_CPU_SDXPOORWILLS=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_MSM_QMP=y

CONFIG_QCOM_SCM=y

CONFIG_MSM_BOOT_STATS=y
@@ -313,6 +312,7 @@ CONFIG_MSM_GLINK=y 
CONFIG_MSM_GLINK_LOOPBACK_SERVER=y

CONFIG_MSM_GLINK_SMEM_NATIVE_XPRT=y

CONFIG_TRACER_PKT=y

CONFIG_QTI_RPMH_API=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y

CONFIG_MSM_QMI_INTERFACE=y
@@ -320,6 +320,8 @@ CONFIG_MSM_GLINK_PKT=y 
CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_MSM_PM=y

CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y

CONFIG_IIO=y

CONFIG_PWM=y