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

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

Merge "defconfig: 8084: Switch to esoc external modem driver"

parents b2603ebd 64d3394b

arch/arm/boot/dts/qcom/external-mdm9x25.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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,7 @@ 


&soc {

	mdm0: qcom,mdm0 {

                compatible = "qcom,mdm2-modem";

                compatible = "qcom,ext-mdm9x25";

		cell-index = <0>;

		#address-cells = <0>;

                interrupt-parent = <&mdm0>;

arch/arm/configs/apq8084-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_QPNP=y

CONFIG_ESOC=y

CONFIG_ESOC_DEV=y

CONFIG_ESOC_MDM_4X=y

CONFIG_ESOC_MDM_4x=y

CONFIG_ESOC_MDM_DRV=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

arch/arm/configs/apq8084_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_QPNP=y

CONFIG_ESOC=y

CONFIG_ESOC_DEV=y

CONFIG_ESOC_MDM_4X=y

CONFIG_ESOC_MDM_4x=y

CONFIG_ESOC_MDM_DRV=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y