Merge lp:~phablet-team/ofono/midori-support into lp:~phablet-team/ofono/ubuntu

[Alfonso Sanchez-Beato]

[ Ratchanan Srirattanamet ]
* qcommsimmodem: fix slot selection for cellular data
[ Alfonso Sanchez-Beato ]
* gril: update requests to M
* ril: refactor management of radio power states
* mtk2: new driver to support midori
* Fix cellular data switch in turbo (LP: #1592258)
* Fix ofono re-starts on boot in turbo (LP: #1580908)
[ Rex Tsai ]
voicecall: add emergency numbers required for China Market

[Konrad Zapałowicz (kzapalowicz)]

LGTM however I have a few uncertainties - check the questions in comments.

review: Needs Information (code)

[lp:~phablet-team/ofono/midori-support]

6917. By Alfonso Sanchez-Beato on 2016-06-30

Create radio settings atom in pre-sim state so we can set FastDormancy and
enter low power state even when there is no SIM.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

@Konrad, thanks for the comments, I have answered them below. Note however that for historical reasons in ofono we do usually the reviews in our github repo, and import the code to bzr when merged there. For this branch, we had PR https://github.com/rilmodem/ofono/pull/240 . Usually here we just make sure that changelog and other contents in debian/ (which are not in github) are good.

[lp:~phablet-team/ofono/midori-support]

6918. By Alfonso Sanchez-Beato on 2016-06-30

Fix turbo regressions

6919. By Alfonso Sanchez-Beato on 2016-07-01

[ Rex Tsai ]
voicecall: add emergency numbers required for China Market

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2016-03-14 08:16:40 +0000
+++ Makefile.am	2016-07-01 17:24:58 +0000
@@ -135,6 +135,9 @@
 builtin_modules += mtk
 builtin_sources += plugins/mtk.c
 
+builtin_modules += mtk2
+builtin_sources += plugins/mtk2.c
+
 builtin_modules += infineon
 builtin_sources += plugins/infineon.c
 
@@ -160,6 +163,15 @@
 			drivers/mtkmodem/radio-settings.c \
 			drivers/mtkmodem/mtksettings.c
 
+builtin_modules += mtk2modem
+builtin_sources += drivers/mtk2modem/mtk2modem.h \
+			drivers/mtk2modem/mtk2modem.c \
+			drivers/mtk2modem/mtk2_constants.h \
+			drivers/mtk2modem/mtk2util.h \
+			drivers/mtk2modem/mtk2util.c \
+			drivers/mtk2modem/voicecall.c \
+			drivers/mtk2modem/gprs.c
+
 builtin_modules += rilmodem
 builtin_sources += drivers/rilmodem/rilmodem.h \
 			drivers/rilmodem/vendor.h \
@@ -183,7 +195,8 @@
 
 builtin_modules += qcommsimmodem
 builtin_sources += drivers/qcommsimmodem/qcom_msim_modem.c \
-			drivers/qcommsimmodem/radio-settings.c
+			drivers/qcommsimmodem/radio-settings.c \
+			drivers/qcommsimmodem/gprs.c
 endif
 
 if ISIMODEM
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-04-13 14:43:54 +0000
+++ debian/changelog	2016-07-01 17:24:58 +0000
@@ -1,3 +1,20 @@
+ofono (1.17.bzr6919+16.10.20160701.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Ratchanan Srirattanamet ]
+  * qcommsimmodem: fix slot selection for cellular data
+
+  [ Alfonso Sanchez-Beato ]
+  * gril: update requests to M
+  * ril: refactor management of radio power states
+  * mtk2: new driver to support midori
+  * Fix cellular data switch in turbo (LP: #1592258)
+  * Fix ofono re-starts on boot in turbo (LP: #1580908)
+
+  [ Rex Tsai ]
+  * voicecall: add emergency numbers required for China Market
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Fri, 01 Jul 2016 17:17:05 +0200
+
 ofono (1.17.bzr6914+16.04.20160413.1-0ubuntu1) xenial; urgency=medium
 
   [ Alfonso Sanchez-Beato (email Canonical) ]
 
=== added directory 'drivers/mtk2modem'
=== added file 'drivers/mtk2modem/gprs.c'
--- drivers/mtk2modem/gprs.c	1970-01-01 00:00:00 +0000
+++ drivers/mtk2modem/gprs.c	2016-07-01 17:24:58 +0000
@@ -0,0 +1,88 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2016  Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/modem.h>
+#include <ofono/gprs.h>
+
+#include "common.h"
+
+#include "mtk2util.h"
+#include "mtk2modem.h"
+#include "mtk2_constants.h"
+#include "drivers/mtkmodem/mtkunsol.h"
+#include "drivers/rilmodem/rilutil.h"
+#include "drivers/rilmodem/gprs.h"
+
+/*
+ * This module is the ofono_gprs_driver implementation for mtk2modem. Most of
+ * the implementation can be found in the rilmodem gprs atom. The main reason
+ * for creating a new atom is the need to handle specific MTK requests.
+ */
+
+static int mtk2_gprs_probe(struct ofono_gprs *gprs,
+				unsigned int vendor, void *data)
+{
+	struct ril_gprs_driver_data *driver_data = data;
+	struct ril_gprs_data *gd;
+
+	gd = g_try_new0(struct ril_gprs_data, 1);
+	if (gd == NULL)
+		return -ENOMEM;
+
+	ril_gprs_start(driver_data, gprs, gd);
+
+	/*
+	 * In MTK the event emitted when the gprs state changes is different
+	 * from the one in AOSP ril. Overwrite the one set in parent.
+	 */
+	gd->state_changed_unsol =
+			MTK2_RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED;
+
+	return 0;
+}
+
+static struct ofono_gprs_driver driver = {
+	.name			= MTK2MODEM,
+	.probe			= mtk2_gprs_probe,
+	.remove			= ril_gprs_remove,
+	.set_attached		= ril_gprs_set_attached,
+	.attached_status	= ril_gprs_registration_status,
+	.set_ia_apn		= ril_gprs_set_ia_apn,
+};
+
+void mtk2_gprs_init(void)
+{
+	ofono_gprs_driver_register(&driver);
+}
+
+void mtk2_gprs_exit(void)
+{
+	ofono_gprs_driver_unregister(&driver);
+}
 
=== added file 'drivers/mtk2modem/mtk2_constants.h'
--- drivers/mtk2modem/mtk2_constants.h	1970-01-01 00:00:00 +0000
+++ drivers/mtk2modem/mtk2_constants.h	2016-07-01 17:24:58 +0000
@@ -0,0 +1,148 @@
+/*
+ *
+ *  RIL constants for MTK modem
+ *
+ *  Copyright (C) 2016 Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef MTK2_CONSTANTS_H
+#define MTK2_CONSTANTS_H
+
+/* RIL Request Messages */
+#define MTK2_RIL_REQUEST_MODEM_POWEROFF 2010
+#define MTK2_RIL_REQUEST_DUAL_SIM_MODE_SWITCH 2011
+#define MTK2_RIL_REQUEST_SET_GPRS_CONNECT_TYPE 2015
+#define MTK2_RIL_REQUEST_SET_GPRS_TRANSFER_TYPE 2016
+#define MTK2_RIL_REQUEST_MODEM_POWERON 2028
+#define MTK2_RIL_REQUEST_SET_CALL_INDICATION 2086
+#define MTK2_RIL_REQUEST_GET_PHONE_CAPABILITY 2030
+#define MTK2_RIL_REQUEST_SET_PHONE_CAPABILITY 2031
+#define MTK2_RIL_REQUEST_SET_TRM 2043
+#define MTK2_RIL_REQUEST_SET_FD_MODE 2061
+#define MTK2_RIL_REQUEST_RESUME_REGISTRATION 2065
+#define MTK2_RIL_REQUEST_STORE_MODEM_TYPE 2066
+#define MTK2_RIL_REQUEST_QUERY_MODEM_TYPE 2067
+#define MTK2_RIL_REQUEST_SET_DATA_ON_TO_MD 2111
+
+/* RIL Unsolicited Messages */
+#define MTK2_RIL_UNSOL_MTK_BASE 3000
+
+#define MTK2_RIL_UNSOL_NEIGHBORING_CELL_INFO (MTK2_RIL_UNSOL_MTK_BASE + 0)
+#define MTK2_RIL_UNSOL_NETWORK_INFO (MTK2_RIL_UNSOL_MTK_BASE + 1)
+#define MTK2_RIL_UNSOL_PHB_READY_NOTIFICATION (MTK2_RIL_UNSOL_MTK_BASE + 2)
+#define MTK2_RIL_UNSOL_SIM_INSERTED_STATUS (MTK2_RIL_UNSOL_MTK_BASE + 3)
+#define MTK2_RIL_UNSOL_RADIO_TEMPORARILY_UNAVAILABLE (MTK2_RIL_UNSOL_MTK_BASE + 4)
+#define MTK2_RIL_UNSOL_ME_SMS_STORAGE_FULL (MTK2_RIL_UNSOL_MTK_BASE + 5)
+#define MTK2_RIL_UNSOL_SMS_READY_NOTIFICATION (MTK2_RIL_UNSOL_MTK_BASE + 6)
+#define MTK2_RIL_UNSOL_SCRI_RESULT (MTK2_RIL_UNSOL_MTK_BASE + 7)
+#define MTK2_RIL_UNSOL_SIM_MISSING (MTK2_RIL_UNSOL_MTK_BASE + 8)
+#define MTK2_RIL_UNSOL_GPRS_DETACH (MTK2_RIL_UNSOL_MTK_BASE + 9)
+#define MTK2_RIL_UNSOL_ATCI_RESPONSE (MTK2_RIL_UNSOL_MTK_BASE + 10)
+#define MTK2_RIL_UNSOL_SIM_RECOVERY (MTK2_RIL_UNSOL_MTK_BASE + 11)
+#define MTK2_RIL_UNSOL_VIRTUAL_SIM_ON (MTK2_RIL_UNSOL_MTK_BASE + 12)
+#define MTK2_RIL_UNSOL_VIRTUAL_SIM_OFF (MTK2_RIL_UNSOL_MTK_BASE + 13)
+#define MTK2_RIL_UNSOL_INVALID_SIM (MTK2_RIL_UNSOL_MTK_BASE + 14)
+#define MTK2_RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED (MTK2_RIL_UNSOL_MTK_BASE + 15)
+#define MTK2_RIL_UNSOL_RESPONSE_ACMT (MTK2_RIL_UNSOL_MTK_BASE + 16)
+#define MTK2_RIL_UNSOL_EF_CSP_PLMN_MODE_BIT (MTK2_RIL_UNSOL_MTK_BASE + 17)
+#define MTK2_RIL_UNSOL_IMEI_LOCK (MTK2_RIL_UNSOL_MTK_BASE + 18)
+#define MTK2_RIL_UNSOL_RESPONSE_MMRR_STATUS_CHANGED (MTK2_RIL_UNSOL_MTK_BASE + 19)
+#define MTK2_RIL_UNSOL_SIM_PLUG_OUT (MTK2_RIL_UNSOL_MTK_BASE + 20)
+#define MTK2_RIL_UNSOL_SIM_PLUG_IN (MTK2_RIL_UNSOL_MTK_BASE + 21)
+#define MTK2_RIL_UNSOL_RESPONSE_ETWS_NOTIFICATION (MTK2_RIL_UNSOL_MTK_BASE + 22)
+#define MTK2_RIL_UNSOL_RESPONSE_PLMN_CHANGED (MTK2_RIL_UNSOL_MTK_BASE + 23)
+#define MTK2_RIL_UNSOL_RESPONSE_REGISTRATION_SUSPENDED (MTK2_RIL_UNSOL_MTK_BASE + 24)
+#define MTK2_RIL_UNSOL_STK_EVDL_CALL (MTK2_RIL_UNSOL_MTK_BASE + 25)
+#define MTK2_RIL_UNSOL_DATA_PACKETS_FLUSH (MTK2_RIL_UNSOL_MTK_BASE + 26)
+#define MTK2_RIL_UNSOL_FEMTOCELL_INFO (MTK2_RIL_UNSOL_MTK_BASE + 27)
+#define MTK2_RIL_UNSOL_STK_SETUP_MENU_RESET (MTK2_RIL_UNSOL_MTK_BASE + 28)
+#define MTK2_RIL_UNSOL_APPLICATION_SESSION_ID_CHANGED (MTK2_RIL_UNSOL_MTK_BASE + 29)
+#define MTK2_RIL_UNSOL_ECONF_SRVCC_INDICATION (MTK2_RIL_UNSOL_MTK_BASE + 30)
+#define MTK2_RIL_UNSOL_IMS_ENABLE_DONE (MTK2_RIL_UNSOL_MTK_BASE + 31)
+#define MTK2_RIL_UNSOL_IMS_DISABLE_DONE (MTK2_RIL_UNSOL_MTK_BASE + 32)
+#define MTK2_RIL_UNSOL_IMS_REGISTRATION_INFO (MTK2_RIL_UNSOL_MTK_BASE + 33)
+#define MTK2_RIL_UNSOL_DEDICATE_BEARER_ACTIVATED (MTK2_RIL_UNSOL_MTK_BASE + 34)
+#define MTK2_RIL_UNSOL_DEDICATE_BEARER_MODIFIED (MTK2_RIL_UNSOL_MTK_BASE + 35)
+#define MTK2_RIL_UNSOL_DEDICATE_BEARER_DEACTIVATED (MTK2_RIL_UNSOL_MTK_BASE + 36)
+#define MTK2_RIL_UNSOL_RAC_UPDATE (MTK2_RIL_UNSOL_MTK_BASE + 37)
+#define MTK2_RIL_UNSOL_ECONF_RESULT_INDICATION (MTK2_RIL_UNSOL_MTK_BASE + 38)
+#define MTK2_RIL_UNSOL_MELOCK_NOTIFICATION (MTK2_RIL_UNSOL_MTK_BASE + 39)
+#define MTK2_RIL_UNSOL_CALL_FORWARDING (MTK2_RIL_UNSOL_MTK_BASE + 40)
+#define MTK2_RIL_UNSOL_CRSS_NOTIFICATION (MTK2_RIL_UNSOL_MTK_BASE + 41)
+#define MTK2_RIL_UNSOL_INCOMING_CALL_INDICATION (MTK2_RIL_UNSOL_MTK_BASE + 42)
+#define MTK2_RIL_UNSOL_CIPHER_INDICATION (MTK2_RIL_UNSOL_MTK_BASE + 43)
+#define MTK2_RIL_UNSOL_CNAP (MTK2_RIL_UNSOL_MTK_BASE + 44)
+#define MTK2_RIL_UNSOL_SIM_COMMON_SLOT_NO_CHANGED (MTK2_RIL_UNSOL_MTK_BASE + 45)
+#define MTK2_RIL_UNSOL_DATA_ALLOWED (MTK2_RIL_UNSOL_MTK_BASE + 46)
+#define MTK2_RIL_UNSOL_STK_CALL_CTRL (MTK2_RIL_UNSOL_MTK_BASE + 47)
+#define MTK2_RIL_UNSOL_VOLTE_EPS_NETWORK_FEATURE_SUPPORT (MTK2_RIL_UNSOL_MTK_BASE + 48)
+#define MTK2_RIL_UNSOL_CALL_INFO_INDICATION (MTK2_RIL_UNSOL_MTK_BASE + 49)
+#define MTK2_RIL_UNSOL_VOLTE_EPS_NETWORK_FEATURE_INFO (MTK2_RIL_UNSOL_MTK_BASE + 50)
+#define MTK2_RIL_UNSOL_SRVCC_HANDOVER_INFO_INDICATION (MTK2_RIL_UNSOL_MTK_BASE + 51)
+#define MTK2_RIL_UNSOL_SPEECH_CODEC_INFO (MTK2_RIL_UNSOL_MTK_BASE + 52)
+#define MTK2_RIL_UNSOL_MD_STATE_CHANGE (MTK2_RIL_UNSOL_MTK_BASE + 53)
+#define MTK2_RIL_UNSOL_REMOVE_RESTRICT_EUTRAN (MTK2_RIL_UNSOL_MTK_BASE + 54)
+#define MTK2_RIL_UNSOL_MO_DATA_BARRING_INFO (MTK2_RIL_UNSOL_MTK_BASE + 55)
+#define MTK2_RIL_UNSOL_SSAC_BARRING_INFO (MTK2_RIL_UNSOL_MTK_BASE + 56)
+#define MTK2_RIL_UNSOL_SIP_CALL_PROGRESS_INDICATOR (MTK2_RIL_UNSOL_MTK_BASE + 57)
+#define MTK2_RIL_UNSOL_ABNORMAL_EVENT (MTK2_RIL_UNSOL_MTK_BASE + 58)
+#define MTK2_RIL_UNSOL_EMERGENCY_BEARER_SUPPORT_NOTIFY (MTK2_RIL_UNSOL_MTK_BASE + 59)
+#define MTK2_RIL_UNSOL_INTER_3GPP_IRAT_STATE_CHANGE (MTK2_RIL_UNSOL_MTK_BASE + 60)
+#define MTK2_RIL_UNSOL_LTE_BG_SEARCH_STATUS (MTK2_RIL_UNSOL_MTK_BASE + 61)
+#define MTK2_RIL_UNSOL_GMSS_RAT_CHANGED (MTK2_RIL_UNSOL_MTK_BASE + 62)
+#define MTK2_RIL_UNSOL_CDMA_CARD_TYPE (MTK2_RIL_UNSOL_MTK_BASE + 63)
+#define MTK2_RIL_UNSOL_IMS_ENABLE_START (MTK2_RIL_UNSOL_MTK_BASE + 64)
+#define MTK2_RIL_UNSOL_IMS_DISABLE_START (MTK2_RIL_UNSOL_MTK_BASE + 65)
+#define MTK2_RIL_UNSOL_IMSI_REFRESH_DONE (MTK2_RIL_UNSOL_MTK_BASE + 66)
+#define MTK2_RIL_UNSOL_EUSIM_READY (MTK2_RIL_UNSOL_MTK_BASE + 67)
+#define MTK2_RIL_UNSOL_STK_BIP_PROACTIVE_COMMAND (MTK2_RIL_UNSOL_MTK_BASE + 68)
+#define MTK2_RIL_UNSOL_WORLD_MODE_CHANGED (MTK2_RIL_UNSOL_MTK_BASE + 69)
+#define MTK2_RIL_UNSOL_VT_STATUS_INFO (MTK2_RIL_UNSOL_MTK_BASE + 70)
+#define MTK2_RIL_UNSOL_VT_RING_INFO (MTK2_RIL_UNSOL_MTK_BASE + 71)
+#define MTK2_RIL_UNSOL_VSIM_OPERATION_INDICATION (MTK2_RIL_UNSOL_MTK_BASE + 72)
+#define MTK2_RIL_UNSOL_SET_ATTACH_APN (MTK2_RIL_UNSOL_MTK_BASE + 73)
+#define MTK2_RIL_UNSOL_MAL_AT_INFO (MTK2_RIL_UNSOL_MTK_BASE + 74)
+#define MTK2_RIL_UNSOL_MAIN_SIM_INFO (MTK2_RIL_UNSOL_MTK_BASE + 75)
+#define MTK2_RIL_UNSOL_TRAY_PLUG_IN (MTK2_RIL_UNSOL_MTK_BASE + 76)
+#define MTK2_RIL_UNSOL_CALLMOD_CHANGE_INDICATOR (MTK2_RIL_UNSOL_MTK_BASE + 77)
+#define MTK2_RIL_UNSOL_VIDEO_CAPABILITY_INDICATOR (MTK2_RIL_UNSOL_MTK_BASE + 78)
+#define MTK2_RIL_UNSOL_LTE_ACCESS_STRATUM_STATE_CHANGE (MTK2_RIL_UNSOL_MTK_BASE + 79)
+#define MTK2_RIL_UNSOL_SETUP_DATA_CALL_RESPONSE (MTK2_RIL_UNSOL_MTK_BASE + 80)
+#define MTK2_RIL_UNSOL_ON_USSI (MTK2_RIL_UNSOL_MTK_BASE + 81)
+#define MTK2_RIL_UNSOL_CDMA_CALL_ACCEPTED (MTK2_RIL_UNSOL_MTK_BASE + 82)
+#define MTK2_RIL_UNSOL_UTK_SESSION_END (MTK2_RIL_UNSOL_MTK_BASE + 83)
+#define MTK2_RIL_UNSOL_UTK_PROACTIVE_COMMAND (MTK2_RIL_UNSOL_MTK_BASE + 84)
+#define MTK2_RIL_UNSOL_UTK_EVENT_NOTIFY (MTK2_RIL_UNSOL_MTK_BASE + 85)
+#define MTK2_RIL_UNSOL_VIA_GPS_EVENT (MTK2_RIL_UNSOL_MTK_BASE + 86)
+#define MTK2_RIL_UNSOL_VIA_NETWORK_TYPE_CHANGE (MTK2_RIL_UNSOL_MTK_BASE + 87)
+#define MTK2_RIL_UNSOL_CDMA_PLMN_CHANGED (MTK2_RIL_UNSOL_MTK_BASE + 88)
+#define MTK2_RIL_UNSOL_VIA_INVALID_SIM_DETECTED (MTK2_RIL_UNSOL_MTK_BASE + 89)
+#define MTK2_RIL_UNSOL_ENG_MODE_NETWORK_INFO (MTK2_RIL_UNSOL_MTK_BASE + 90)
+#define MTK2_RIL_UNSOL_RESPONSE_DATA_NETWORK_TYPE_CHANGED (MTK2_RIL_UNSOL_MTK_BASE + 91)
+#define MTK2_RIL_UNSOL_LTE_EARFCN_INFO (MTK2_RIL_UNSOL_MTK_BASE + 92)
+#define MTK2_RIL_UNSOL_CDMA_IMSI_READY (MTK2_RIL_UNSOL_MTK_BASE + 93)
+#define MTK2_RIL_UNSOL_CDMA_SIGNAL_FADE (MTK2_RIL_UNSOL_MTK_BASE + 94)
+#define MTK2_RIL_UNSOL_CDMA_TONE_SIGNALS (MTK2_RIL_UNSOL_MTK_BASE + 95)
+#define MTK2_RIL_UNSOL_NETWORK_EXIST (MTK2_RIL_UNSOL_MTK_BASE + 96)
+#define MTK2_RIL_UNSOL_MODULATION_INFO (MTK2_RIL_UNSOL_MTK_BASE + 97)
+#define MTK2_RIL_UNSOL_NETWORK_EVENT (MTK2_RIL_UNSOL_MTK_BASE + 98)
+#define MTK2_RIL_UNSOL_MBIM_RESPONSE (MTK2_RIL_UNSOL_MTK_BASE + 99)
+#define MTK2_RIL_UNSOL_MAL_DATA_CALL_LIST_CHANGED (MTK2_RIL_UNSOL_MTK_BASE + 100)
+#define MTK2_RIL_UNSOL_EMBMS_AT_INFO  (MTK2_RIL_UNSOL_MTK_BASE + 101)
+#define MTK2_RIL_UNSOL_RADIO_CAPABILITY_SWITCH_START (MTK2_RIL_UNSOL_MTK_BASE + 102)
+
+#endif /* MTK2_CONSTANTS_H */
 
=== added file 'drivers/mtk2modem/mtk2modem.c'
--- drivers/mtk2modem/mtk2modem.c	1970-01-01 00:00:00 +0000
+++ drivers/mtk2modem/mtk2modem.c	2016-07-01 17:24:58 +0000
@@ -0,0 +1,55 @@
+/*
+ *
+ *  oFono - Open Source Telephony - RIL Modem Support
+ *
+ *  Copyright (C) 2016  Canonical, Ltd. 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 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#include <gril.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/types.h>
+
+#include "mtk2modem.h"
+
+static int mtk2modem_init(void)
+{
+	DBG("");
+
+	mtk2_voicecall_init();
+	mtk2_gprs_init();
+
+	return 0;
+}
+
+static void mtk2modem_exit(void)
+{
+	DBG("");
+
+	mtk2_voicecall_exit();
+	mtk2_gprs_exit();
+}
+
+OFONO_PLUGIN_DEFINE(mtk2modem, "MTK2 modem driver", VERSION,
+		OFONO_PLUGIN_PRIORITY_DEFAULT, mtk2modem_init, mtk2modem_exit)
 
=== added file 'drivers/mtk2modem/mtk2modem.h'
--- drivers/mtk2modem/mtk2modem.h	1970-01-01 00:00:00 +0000
+++ drivers/mtk2modem/mtk2modem.h	2016-07-01 17:24:58 +0000
@@ -0,0 +1,28 @@
+/*
+ *
+ *  oFono - Open Source Telephony - RIL Modem Support
+ *
+ *  Copyright (C) 2016  Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#define MTK2MODEM "mtk2modem"
+
+extern void mtk2_voicecall_init(void);
+extern void mtk2_voicecall_exit(void);
+
+extern void mtk2_gprs_init(void);
+extern void mtk2_gprs_exit(void);
 
=== added file 'drivers/mtk2modem/mtk2util.c'
--- drivers/mtk2modem/mtk2util.c	1970-01-01 00:00:00 +0000
+++ drivers/mtk2modem/mtk2util.c	2016-07-01 17:24:58 +0000
@@ -0,0 +1,275 @@
+/*
+ *
+ *  MTK2 driver for ofono/rilmodem
+ *
+ *  Copyright (C) 2016  Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <stddef.h>
+
+#include "mtk2util.h"
+#include "mtk2_constants.h"
+
+const char *mtk2_request_id_to_string(int req)
+{
+	switch (req) {
+	case MTK2_RIL_REQUEST_MODEM_POWEROFF:
+		return "MTK2_RIL_REQUEST_MODEM_POWEROFF";
+	case MTK2_RIL_REQUEST_DUAL_SIM_MODE_SWITCH:
+		return "MTK2_RIL_REQUEST_DUAL_SIM_MODE_SWITCH";
+	case MTK2_RIL_REQUEST_SET_GPRS_CONNECT_TYPE:
+		return "MTK2_RIL_REQUEST_SET_GPRS_CONNECT_TYPE";
+	case MTK2_RIL_REQUEST_SET_GPRS_TRANSFER_TYPE:
+		return "MTK2_RIL_REQUEST_SET_GPRS_TRANSFER_TYPE";
+	case MTK2_RIL_REQUEST_MODEM_POWERON:
+		return "MTK2_RIL_REQUEST_MODEM_POWERON";
+	case MTK2_RIL_REQUEST_SET_CALL_INDICATION:
+		return "MTK2_RIL_REQUEST_SET_CALL_INDICATION";
+	case MTK2_RIL_REQUEST_GET_PHONE_CAPABILITY:
+		return "MTK2_RIL_REQUEST_GET_PHONE_CAPABILITY";
+	case MTK2_RIL_REQUEST_SET_PHONE_CAPABILITY:
+		return "MTK2_RIL_REQUEST_SET_PHONE_CAPABILITY";
+	case MTK2_RIL_REQUEST_SET_TRM:
+		return "MTK2_RIL_REQUEST_SET_TRM";
+	case MTK2_RIL_REQUEST_SET_FD_MODE:
+		return "MTK2_RIL_REQUEST_SET_FD_MODE";
+	case MTK2_RIL_REQUEST_STORE_MODEM_TYPE:
+		return "MTK2_RIL_REQUEST_STORE_MODEM_TYPE";
+	case MTK2_RIL_REQUEST_RESUME_REGISTRATION:
+		return "MTK2_RIL_REQUEST_RESUME_REGISTRATION";
+	case MTK2_RIL_REQUEST_QUERY_MODEM_TYPE:
+		return "MTK2_RIL_REQUEST_QUERY_MODEM_TYPE";
+	case MTK2_RIL_REQUEST_SET_DATA_ON_TO_MD:
+		return "MTK2_RIL_REQUEST_SET_DATA_ON_TO_MD";
+	default:
+		return NULL;
+	}
+}
+
+const char *mtk2_unsol_request_to_string(int req)
+{
+	switch (req) {
+	case MTK2_RIL_UNSOL_NEIGHBORING_CELL_INFO:
+		return "MTK2_RIL_UNSOL_NEIGHBORING_CELL_INFO";
+	case MTK2_RIL_UNSOL_NETWORK_INFO:
+		return "MTK2_RIL_UNSOL_NETWORK_INFO";
+	case MTK2_RIL_UNSOL_PHB_READY_NOTIFICATION:
+		return "MTK2_RIL_UNSOL_PHB_READY_NOTIFICATION";
+	case MTK2_RIL_UNSOL_SIM_INSERTED_STATUS:
+		return "MTK2_RIL_UNSOL_SIM_INSERTED_STATUS";
+	case MTK2_RIL_UNSOL_RADIO_TEMPORARILY_UNAVAILABLE:
+		return "MTK2_RIL_UNSOL_RADIO_TEMPORARILY_UNAVAILABLE";
+	case MTK2_RIL_UNSOL_ME_SMS_STORAGE_FULL:
+		return "MTK2_RIL_UNSOL_ME_SMS_STORAGE_FULL";
+	case MTK2_RIL_UNSOL_SMS_READY_NOTIFICATION:
+		return "MTK2_RIL_UNSOL_SMS_READY_NOTIFICATION";
+	case MTK2_RIL_UNSOL_SCRI_RESULT:
+		return "MTK2_RIL_UNSOL_SCRI_RESULT";
+	case MTK2_RIL_UNSOL_SIM_MISSING:
+		return "MTK2_RIL_UNSOL_SIM_MISSING";
+	case MTK2_RIL_UNSOL_GPRS_DETACH:
+		return "MTK2_RIL_UNSOL_GPRS_DETACH";
+	case MTK2_RIL_UNSOL_ATCI_RESPONSE:
+		return "MTK2_RIL_UNSOL_ATCI_RESPONSE";
+	case MTK2_RIL_UNSOL_SIM_RECOVERY:
+		return "MTK2_RIL_UNSOL_SIM_RECOVERY";
+	case MTK2_RIL_UNSOL_VIRTUAL_SIM_ON:
+		return "MTK2_RIL_UNSOL_VIRTUAL_SIM_ON";
+	case MTK2_RIL_UNSOL_VIRTUAL_SIM_OFF:
+		return "MTK2_RIL_UNSOL_VIRTUAL_SIM_OFF";
+	case MTK2_RIL_UNSOL_INVALID_SIM:
+		return "MTK2_RIL_UNSOL_INVALID_SIM";
+	case MTK2_RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED:
+		return "MTK2_RIL_UNSOL_RESPONSE_PS_NETWORK_STATE_CHANGED";
+	case MTK2_RIL_UNSOL_RESPONSE_ACMT:
+		return "MTK2_RIL_UNSOL_RESPONSE_ACMT";
+	case MTK2_RIL_UNSOL_EF_CSP_PLMN_MODE_BIT:
+		return "MTK2_RIL_UNSOL_EF_CSP_PLMN_MODE_BIT";
+	case MTK2_RIL_UNSOL_IMEI_LOCK:
+		return "MTK2_RIL_UNSOL_IMEI_LOCK";
+	case MTK2_RIL_UNSOL_RESPONSE_MMRR_STATUS_CHANGED:
+		return "MTK2_RIL_UNSOL_RESPONSE_MMRR_STATUS_CHANGED";
+	case MTK2_RIL_UNSOL_SIM_PLUG_OUT:
+		return "MTK2_RIL_UNSOL_SIM_PLUG_OUT";
+	case MTK2_RIL_UNSOL_SIM_PLUG_IN:
+		return "MTK2_RIL_UNSOL_SIM_PLUG_IN";
+	case MTK2_RIL_UNSOL_RESPONSE_ETWS_NOTIFICATION:
+		return "MTK2_RIL_UNSOL_RESPONSE_ETWS_NOTIFICATION";
+	case MTK2_RIL_UNSOL_RESPONSE_PLMN_CHANGED:
+		return "MTK2_RIL_UNSOL_RESPONSE_PLMN_CHANGED";
+	case MTK2_RIL_UNSOL_RESPONSE_REGISTRATION_SUSPENDED:
+		return "MTK2_RIL_UNSOL_RESPONSE_REGISTRATION_SUSPENDED";
+	case MTK2_RIL_UNSOL_STK_EVDL_CALL:
+		return "MTK2_RIL_UNSOL_STK_EVDL_CALL";
+	case MTK2_RIL_UNSOL_DATA_PACKETS_FLUSH:
+		return "MTK2_RIL_UNSOL_DATA_PACKETS_FLUSH";
+	case MTK2_RIL_UNSOL_FEMTOCELL_INFO:
+		return "MTK2_RIL_UNSOL_FEMTOCELL_INFO";
+	case MTK2_RIL_UNSOL_STK_SETUP_MENU_RESET:
+		return "MTK2_RIL_UNSOL_STK_SETUP_MENU_RESET";
+	case MTK2_RIL_UNSOL_APPLICATION_SESSION_ID_CHANGED:
+		return "MTK2_RIL_UNSOL_APPLICATION_SESSION_ID_CHANGED";
+	case MTK2_RIL_UNSOL_ECONF_SRVCC_INDICATION:
+		return "MTK2_RIL_UNSOL_ECONF_SRVCC_INDICATION";
+	case MTK2_RIL_UNSOL_IMS_ENABLE_DONE:
+		return "MTK2_RIL_UNSOL_IMS_ENABLE_DONE";
+	case MTK2_RIL_UNSOL_IMS_DISABLE_DONE:
+		return "MTK2_RIL_UNSOL_IMS_DISABLE_DONE";
+	case MTK2_RIL_UNSOL_IMS_REGISTRATION_INFO:
+		return "MTK2_RIL_UNSOL_IMS_REGISTRATION_INFO";
+	case MTK2_RIL_UNSOL_DEDICATE_BEARER_ACTIVATED:
+		return "MTK2_RIL_UNSOL_DEDICATE_BEARER_ACTIVATED";
+	case MTK2_RIL_UNSOL_DEDICATE_BEARER_MODIFIED:
+		return "MTK2_RIL_UNSOL_DEDICATE_BEARER_MODIFIED";
+	case MTK2_RIL_UNSOL_DEDICATE_BEARER_DEACTIVATED:
+		return "MTK2_RIL_UNSOL_DEDICATE_BEARER_DEACTIVATED";
+	case MTK2_RIL_UNSOL_RAC_UPDATE:
+		return "MTK2_RIL_UNSOL_RAC_UPDATE";
+	case MTK2_RIL_UNSOL_ECONF_RESULT_INDICATION:
+		return "MTK2_RIL_UNSOL_ECONF_RESULT_INDICATION";
+	case MTK2_RIL_UNSOL_MELOCK_NOTIFICATION:
+		return "MTK2_RIL_UNSOL_MELOCK_NOTIFICATION";
+	case MTK2_RIL_UNSOL_CALL_FORWARDING:
+		return "MTK2_RIL_UNSOL_CALL_FORWARDING";
+	case MTK2_RIL_UNSOL_CRSS_NOTIFICATION:
+		return "MTK2_RIL_UNSOL_CRSS_NOTIFICATION";
+	case MTK2_RIL_UNSOL_INCOMING_CALL_INDICATION:
+		return "MTK2_RIL_UNSOL_INCOMING_CALL_INDICATION";
+	case MTK2_RIL_UNSOL_CIPHER_INDICATION:
+		return "MTK2_RIL_UNSOL_CIPHER_INDICATION";
+	case MTK2_RIL_UNSOL_CNAP:
+		return "MTK2_RIL_UNSOL_CNAP";
+	case MTK2_RIL_UNSOL_SIM_COMMON_SLOT_NO_CHANGED:
+		return "MTK2_RIL_UNSOL_SIM_COMMON_SLOT_NO_CHANGED";
+	case MTK2_RIL_UNSOL_DATA_ALLOWED:
+		return "MTK2_RIL_UNSOL_DATA_ALLOWED";
+	case MTK2_RIL_UNSOL_STK_CALL_CTRL:
+		return "MTK2_RIL_UNSOL_STK_CALL_CTRL";
+	case MTK2_RIL_UNSOL_VOLTE_EPS_NETWORK_FEATURE_SUPPORT:
+		return "MTK2_RIL_UNSOL_VOLTE_EPS_NETWORK_FEATURE_SUPPORT";
+	case MTK2_RIL_UNSOL_CALL_INFO_INDICATION:
+		return "MTK2_RIL_UNSOL_CALL_INFO_INDICATION";
+	case MTK2_RIL_UNSOL_VOLTE_EPS_NETWORK_FEATURE_INFO:
+		return "MTK2_RIL_UNSOL_VOLTE_EPS_NETWORK_FEATURE_INFO";
+	case MTK2_RIL_UNSOL_SRVCC_HANDOVER_INFO_INDICATION:
+		return "MTK2_RIL_UNSOL_SRVCC_HANDOVER_INFO_INDICATION";
+	case MTK2_RIL_UNSOL_SPEECH_CODEC_INFO:
+		return "MTK2_RIL_UNSOL_SPEECH_CODEC_INFO";
+	case MTK2_RIL_UNSOL_MD_STATE_CHANGE:
+		return "MTK2_RIL_UNSOL_MD_STATE_CHANGE";
+	case MTK2_RIL_UNSOL_REMOVE_RESTRICT_EUTRAN:
+		return "MTK2_RIL_UNSOL_REMOVE_RESTRICT_EUTRAN";
+	case MTK2_RIL_UNSOL_MO_DATA_BARRING_INFO:
+		return "MTK2_RIL_UNSOL_MO_DATA_BARRING_INFO";
+	case MTK2_RIL_UNSOL_SSAC_BARRING_INFO:
+		return "MTK2_RIL_UNSOL_SSAC_BARRING_INFO";
+	case MTK2_RIL_UNSOL_SIP_CALL_PROGRESS_INDICATOR:
+		return "MTK2_RIL_UNSOL_SIP_CALL_PROGRESS_INDICATOR";
+	case MTK2_RIL_UNSOL_ABNORMAL_EVENT:
+		return "MTK2_RIL_UNSOL_ABNORMAL_EVENT";
+	case MTK2_RIL_UNSOL_EMERGENCY_BEARER_SUPPORT_NOTIFY:
+		return "MTK2_RIL_UNSOL_EMERGENCY_BEARER_SUPPORT_NOTIFY";
+	case MTK2_RIL_UNSOL_INTER_3GPP_IRAT_STATE_CHANGE:
+		return "MTK2_RIL_UNSOL_INTER_3GPP_IRAT_STATE_CHANGE";
+	case MTK2_RIL_UNSOL_LTE_BG_SEARCH_STATUS:
+		return "MTK2_RIL_UNSOL_LTE_BG_SEARCH_STATUS";
+	case MTK2_RIL_UNSOL_GMSS_RAT_CHANGED:
+		return "MTK2_RIL_UNSOL_GMSS_RAT_CHANGED";
+	case MTK2_RIL_UNSOL_CDMA_CARD_TYPE:
+		return "MTK2_RIL_UNSOL_CDMA_CARD_TYPE";
+	case MTK2_RIL_UNSOL_IMS_ENABLE_START:
+		return "MTK2_RIL_UNSOL_IMS_ENABLE_START";
+	case MTK2_RIL_UNSOL_IMS_DISABLE_START:
+		return "MTK2_RIL_UNSOL_IMS_DISABLE_START";
+	case MTK2_RIL_UNSOL_IMSI_REFRESH_DONE:
+		return "MTK2_RIL_UNSOL_IMSI_REFRESH_DONE";
+	case MTK2_RIL_UNSOL_EUSIM_READY:
+		return "MTK2_RIL_UNSOL_EUSIM_READY";
+	case MTK2_RIL_UNSOL_STK_BIP_PROACTIVE_COMMAND:
+		return "MTK2_RIL_UNSOL_STK_BIP_PROACTIVE_COMMAND";
+	case MTK2_RIL_UNSOL_WORLD_MODE_CHANGED:
+		return "MTK2_RIL_UNSOL_WORLD_MODE_CHANGED";
+	case MTK2_RIL_UNSOL_VT_STATUS_INFO:
+		return "MTK2_RIL_UNSOL_VT_STATUS_INFO";
+	case MTK2_RIL_UNSOL_VT_RING_INFO:
+		return "MTK2_RIL_UNSOL_VT_RING_INFO";
+	case MTK2_RIL_UNSOL_VSIM_OPERATION_INDICATION:
+		return "MTK2_RIL_UNSOL_VSIM_OPERATION_INDICATION";
+	case MTK2_RIL_UNSOL_SET_ATTACH_APN:
+		return "MTK2_RIL_UNSOL_SET_ATTACH_APN";
+	case MTK2_RIL_UNSOL_MAL_AT_INFO:
+		return "MTK2_RIL_UNSOL_MAL_AT_INFO";
+	case MTK2_RIL_UNSOL_MAIN_SIM_INFO:
+		return "MTK2_RIL_UNSOL_MAIN_SIM_INFO";
+	case MTK2_RIL_UNSOL_TRAY_PLUG_IN:
+		return "MTK2_RIL_UNSOL_TRAY_PLUG_IN";
+	case MTK2_RIL_UNSOL_CALLMOD_CHANGE_INDICATOR:
+		return "MTK2_RIL_UNSOL_CALLMOD_CHANGE_INDICATOR";
+	case MTK2_RIL_UNSOL_VIDEO_CAPABILITY_INDICATOR:
+		return "MTK2_RIL_UNSOL_VIDEO_CAPABILITY_INDICATOR";
+	case MTK2_RIL_UNSOL_LTE_ACCESS_STRATUM_STATE_CHANGE:
+		return "MTK2_RIL_UNSOL_LTE_ACCESS_STRATUM_STATE_CHANGE";
+	case MTK2_RIL_UNSOL_SETUP_DATA_CALL_RESPONSE:
+		return "MTK2_RIL_UNSOL_SETUP_DATA_CALL_RESPONSE";
+	case MTK2_RIL_UNSOL_ON_USSI:
+		return "MTK2_RIL_UNSOL_ON_USSI";
+	case MTK2_RIL_UNSOL_CDMA_CALL_ACCEPTED:
+		return "MTK2_RIL_UNSOL_CDMA_CALL_ACCEPTED";
+	case MTK2_RIL_UNSOL_UTK_SESSION_END:
+		return "MTK2_RIL_UNSOL_UTK_SESSION_END";
+	case MTK2_RIL_UNSOL_UTK_PROACTIVE_COMMAND:
+		return "MTK2_RIL_UNSOL_UTK_PROACTIVE_COMMAND";
+	case MTK2_RIL_UNSOL_UTK_EVENT_NOTIFY:
+		return "MTK2_RIL_UNSOL_UTK_EVENT_NOTIFY";
+	case MTK2_RIL_UNSOL_VIA_GPS_EVENT:
+		return "MTK2_RIL_UNSOL_VIA_GPS_EVENT";
+	case MTK2_RIL_UNSOL_VIA_NETWORK_TYPE_CHANGE:
+		return "MTK2_RIL_UNSOL_VIA_NETWORK_TYPE_CHANGE";
+	case MTK2_RIL_UNSOL_CDMA_PLMN_CHANGED:
+		return "MTK2_RIL_UNSOL_CDMA_PLMN_CHANGED";
+	case MTK2_RIL_UNSOL_VIA_INVALID_SIM_DETECTED:
+		return "MTK2_RIL_UNSOL_VIA_INVALID_SIM_DETECTED";
+	case MTK2_RIL_UNSOL_ENG_MODE_NETWORK_INFO:
+		return "MTK2_RIL_UNSOL_ENG_MODE_NETWORK_INFO";
+	case MTK2_RIL_UNSOL_RESPONSE_DATA_NETWORK_TYPE_CHANGED:
+		return "MTK2_RIL_UNSOL_RESPONSE_DATA_NETWORK_TYPE_CHANGED";
+	case MTK2_RIL_UNSOL_LTE_EARFCN_INFO:
+		return "MTK2_RIL_UNSOL_LTE_EARFCN_INFO";
+	case MTK2_RIL_UNSOL_CDMA_IMSI_READY:
+		return "MTK2_RIL_UNSOL_CDMA_IMSI_READY";
+	case MTK2_RIL_UNSOL_CDMA_SIGNAL_FADE:
+		return "MTK2_RIL_UNSOL_CDMA_SIGNAL_FADE";
+	case MTK2_RIL_UNSOL_CDMA_TONE_SIGNALS:
+		return "MTK2_RIL_UNSOL_CDMA_TONE_SIGNALS";
+	case MTK2_RIL_UNSOL_NETWORK_EXIST:
+		return "MTK2_RIL_UNSOL_NETWORK_EXIST";
+	case MTK2_RIL_UNSOL_MODULATION_INFO:
+		return "MTK2_RIL_UNSOL_MODULATION_INFO";
+	case MTK2_RIL_UNSOL_NETWORK_EVENT:
+		return "MTK2_RIL_UNSOL_NETWORK_EVENT";
+	case MTK2_RIL_UNSOL_MBIM_RESPONSE:
+		return "MTK2_RIL_UNSOL_MBIM_RESPONSE";
+	case MTK2_RIL_UNSOL_MAL_DATA_CALL_LIST_CHANGED:
+		return "MTK2_RIL_UNSOL_MAL_DATA_CALL_LIST_CHANGED";
+	case MTK2_RIL_UNSOL_EMBMS_AT_INFO :
+		return "MTK2_RIL_UNSOL_EMBMS_AT_INFO ";
+	case MTK2_RIL_UNSOL_RADIO_CAPABILITY_SWITCH_START:
+		return "MTK2_RIL_UNSOL_RADIO_CAPABILITY_SWITCH_START";
+	default:
+		return NULL;
+	}
+}
 
=== added file 'drivers/mtk2modem/mtk2util.h'
--- drivers/mtk2modem/mtk2util.h	1970-01-01 00:00:00 +0000
+++ drivers/mtk2modem/mtk2util.h	2016-07-01 17:24:58 +0000
@@ -0,0 +1,39 @@
+/*
+ *
+ *  MTK2 driver for ofono/rilmodem
+ *
+ *  Copyright (C) 2016  Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef MTK2UTIL_H
+#define MTK2UTIL_H
+
+#include <ofono/types.h>
+#include <gril.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const char *mtk2_request_id_to_string(int req);
+const char *mtk2_unsol_request_to_string(int req);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MTK2UTIL_H */
 
=== added file 'drivers/mtk2modem/voicecall.c'
--- drivers/mtk2modem/voicecall.c	1970-01-01 00:00:00 +0000
+++ drivers/mtk2modem/voicecall.c	2016-07-01 17:24:58 +0000
@@ -0,0 +1,149 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2016  Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/voicecall.h>
+
+#include "mtk2_constants.h"
+#include "drivers/mtkmodem/mtkunsol.h"
+#include "drivers/mtkmodem/mtkrequest.h"
+
+#include "common.h"
+#include "mtk2modem.h"
+#include "drivers/rilmodem/rilutil.h"
+#include "drivers/rilmodem/voicecall.h"
+
+/*
+ * This is the voicecall atom implementation for mtk2modem. Most of the
+ * implementation can be found in the rilmodem atom. The main reason for
+ * creating a new atom is the need to handle specific MTK requests and
+ * unsolicited events.
+ */
+
+static void mtk2_set_indication_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_voicecall *vc = user_data;
+	struct ril_voicecall_data *vd = ofono_voicecall_get_data(vc);
+
+	if (message->error == RIL_E_SUCCESS)
+		g_ril_print_response_no_args(vd->ril, message);
+	else
+		ofono_error("%s: RIL error %s", __func__,
+				ril_error_to_string(message->error));
+}
+
+static void mtk2_incoming_notify(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_voicecall *vc = user_data;
+	struct ril_voicecall_data *vd = ofono_voicecall_get_data(vc);
+	struct parcel rilp;
+	struct unsol_call_indication *call_ind;
+
+	call_ind = g_mtk_unsol_parse_incoming_call_indication(vd->ril, message);
+	if (call_ind == NULL) {
+		ofono_error("%s: error parsing event", __func__);
+		return;
+	}
+
+	g_mtk_request_set_call_indication(vd->ril, MTK_CALL_INDIC_MODE_AVAIL,
+						call_ind->call_id,
+						call_ind->seq_number, &rilp);
+
+	if (g_ril_send(vd->ril, MTK2_RIL_REQUEST_SET_CALL_INDICATION,
+			&rilp, mtk2_set_indication_cb, vc, NULL) == 0)
+		ofono_error("%s: cannot send indication", __func__);
+
+	g_mtk_unsol_free_call_indication(call_ind);
+}
+
+static gboolean mtk2_delayed_register(gpointer user_data)
+{
+	struct ofono_voicecall *vc = user_data;
+	struct ril_voicecall_data *vd = ofono_voicecall_get_data(vc);
+
+	/* Indicates incoming call, before telling the network our state */
+	g_ril_register(vd->ril, MTK2_RIL_UNSOL_INCOMING_CALL_INDICATION,
+			mtk2_incoming_notify, vc);
+
+	/* This makes the timeout a single-shot */
+	return FALSE;
+}
+
+static int mtk2_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
+				void *data)
+{
+	struct ril_voicecall_driver_data *driver_data = data;
+	struct ril_voicecall_data *vd;
+
+	vd = g_try_new0(struct ril_voicecall_data, 1);
+	if (vd == NULL)
+		return -ENOMEM;
+
+	ril_voicecall_start(driver_data, vc, vendor, vd);
+
+	/*
+	 * Register events after ofono_voicecall_register() is called from
+	 * ril_delayed_register().
+	 */
+	g_idle_add(mtk2_delayed_register, vc);
+
+	return 0;
+}
+
+static struct ofono_voicecall_driver driver = {
+	.name			= MTK2MODEM,
+	.probe			= mtk2_voicecall_probe,
+	.remove			= ril_voicecall_remove,
+	.dial			= ril_dial,
+	.answer			= ril_answer,
+	.hangup_all		= ril_hangup_all,
+	.release_specific	= ril_hangup_specific,
+	.send_tones		= ril_send_dtmf,
+	.create_multiparty	= ril_create_multiparty,
+	.private_chat		= ril_private_chat,
+	.swap_without_accept	= ril_swap_without_accept,
+	.hold_all_active	= ril_hold_all_active,
+	.release_all_held	= ril_release_all_held,
+	.set_udub		= ril_set_udub,
+	.release_all_active	= ril_release_all_active,
+};
+
+void mtk2_voicecall_init(void)
+{
+	ofono_voicecall_driver_register(&driver);
+}
+
+void mtk2_voicecall_exit(void)
+{
+	ofono_voicecall_driver_unregister(&driver);
+}
 
=== modified file 'drivers/mtkmodem/mtkunsol.c'
--- drivers/mtkmodem/mtkunsol.c	2015-03-30 09:50:34 +0000
+++ drivers/mtkmodem/mtkunsol.c	2016-07-01 17:24:58 +0000
@@ -45,7 +45,8 @@
 	struct parcel rilp;
 	int numstr;
 	struct unsol_call_indication *unsol;
-	char *call_id, *phone, *mystery, *call_mode, *seq_num;
+	char *call_id, *phone, *address_type, *call_mode, *seq_num;
+	char *fw_address = NULL;
 	char *endp;
 
 	unsol = g_try_malloc0(sizeof(*unsol));
@@ -57,19 +58,26 @@
 	g_ril_init_parcel(message, &rilp);
 
 	numstr = parcel_r_int32(&rilp);
-	if (numstr != 5) {
+	if (numstr < 5) {
 		ofono_error("%s: wrong array size (%d)", __func__, numstr);
 		goto error;
 	}
 
 	call_id = parcel_r_string(&rilp);
 	phone = parcel_r_string(&rilp);
-	mystery = parcel_r_string(&rilp);
+	address_type = parcel_r_string(&rilp);
 	call_mode = parcel_r_string(&rilp);
 	seq_num = parcel_r_string(&rilp);
+	if (numstr > 5)
+		fw_address = parcel_r_string(&rilp);
 
-	g_ril_append_print_buf(gril, "{%s,%s,%s,%s,%s}", call_id, phone,
-				mystery, call_mode, seq_num);
+	g_ril_append_print_buf(gril, "{%s,%s,%s,%s,%s,%s}",
+				PRINTABLE_STR(call_id),
+				PRINTABLE_STR(phone),
+				PRINTABLE_STR(address_type),
+				PRINTABLE_STR(call_mode),
+				PRINTABLE_STR(seq_num),
+				PRINTABLE_STR(fw_address));
 
 	g_ril_print_unsol(gril, message);
 
@@ -113,18 +121,20 @@
 
 	g_free(call_id);
 	g_free(phone);
-	g_free(mystery);
+	g_free(address_type);
 	g_free(call_mode);
 	g_free(seq_num);
+	g_free(fw_address);
 
 	return unsol;
 
 err_conv:
 	g_free(call_id);
 	g_free(phone);
-	g_free(mystery);
+	g_free(address_type);
 	g_free(call_mode);
 	g_free(seq_num);
+	g_free(fw_address);
 
 error:
 	g_free(unsol);
 
=== added file 'drivers/qcommsimmodem/gprs.c'
--- drivers/qcommsimmodem/gprs.c	1970-01-01 00:00:00 +0000
+++ drivers/qcommsimmodem/gprs.c	2016-07-01 17:24:58 +0000
@@ -0,0 +1,118 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2010  ST-Ericsson AB.
+ *  Copyright (C) 2013-2014  Canonical Ltd.
+ *  Copyright (C) 2013 Jolla Ltd.
+ *  Copyright (C) 2016 Ratchanan Srirattanamet.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/gprs.h>
+
+#include "gril.h"
+
+#include "drivers/rilmodem/rilutil.h"
+#include "drivers/rilmodem/gprs.h"
+#include "qcom_msim_modem.h"
+#include "qcom_msim_constants.h"
+
+static void set_data_sub_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_gprs_cb_t cb = cbd->cb;
+	struct ril_gprs_data *gd = cbd->user;
+
+	if (message->error == RIL_E_SUCCESS) {
+		g_ril_print_response_no_args(gd->ril, message);
+
+		gd->ofono_attached = 1;
+
+		CALLBACK_WITH_SUCCESS(cb, cbd->data);
+	} else {
+		ofono_error("%s: RIL error %s", __func__,
+				ril_error_to_string(message->error));
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	}
+}
+
+static void qcom_msim_gprs_set_attached(struct ofono_gprs *gprs, int attached,
+					ofono_gprs_cb_t cb, void *data)
+{
+	struct ril_gprs_data *gd = ofono_gprs_get_data(gprs);
+	struct cb_data *cbd = cb_data_new(cb, data, gd);
+
+	DBG("attached: %d", attached);
+
+	/*
+	 * This modem use RIL_REQUEST_SET_DATA_SUBSCRIPTION to select which SIM
+	 * is used for data connection. We still doesn't have actual control
+	 * over 'attached' state. So, we still use the same trick as rilmodem's
+	 * gprs atom (save the desired state, and use it to override the actual
+	 * modem's state in the 'attached_status' function).
+	 *
+	 * The core gprs code calls driver->set_attached() when a netreg
+	 * notificaiton is received and any configured roaming conditions
+	 * are met.
+	 */
+
+	if (attached) {
+		/*
+		 * We don't have a request to see if we're a selected SIM slot.
+		 * So, we just send this request. There's no harm sending this
+		 * repeatedly anyway.
+		 */
+		 g_ril_send(gd->ril, QCOM_MSIM_RIL_REQUEST_SET_DATA_SUBSCRIPTION
+					, NULL, set_data_sub_cb, cbd, NULL);
+	} else {
+		/*
+		 * We don't actually have a request to unselect the slot.
+		 * So, just do nothing.
+		 */
+		gd->ofono_attached = attached;
+
+		/*
+		 * Call from idle loop, so core can set driver_attached before
+		 * the callback is invoked.
+		 */
+		g_idle_add(ril_gprs_set_attached_cb, cbd);
+	}
+}
+
+static struct ofono_gprs_driver driver = {
+	.name			= QCOMMSIMMODEM,
+	.probe			= ril_gprs_probe,
+	.remove			= ril_gprs_remove,
+	.set_attached		= qcom_msim_gprs_set_attached,
+	.attached_status	= ril_gprs_registration_status,
+	.set_ia_apn		= ril_gprs_set_ia_apn,
+};
+
+void qcom_msim_gprs_init(void)
+{
+	ofono_gprs_driver_register(&driver);
+}
+
+void qcom_msim_gprs_exit(void)
+{
+	ofono_gprs_driver_unregister(&driver);
+}
 
=== modified file 'drivers/qcommsimmodem/qcom_msim_constants.h'
--- drivers/qcommsimmodem/qcom_msim_constants.h	2015-06-11 16:14:06 +0000
+++ drivers/qcommsimmodem/qcom_msim_constants.h	2016-07-01 17:24:58 +0000
@@ -24,6 +24,7 @@
 
 #define QCOMMSIM_NUM_SLOTS_MAX 2
 
-#define QCOM_MSIM_RIL_REQUEST_SET_UICC_SUBSCRIPTION  115
+#define QCOM_MSIM_RIL_REQUEST_SET_UICC_SUBSCRIPTION 115
+#define QCOM_MSIM_RIL_REQUEST_SET_DATA_SUBSCRIPTION 116
 
 #endif /* QCOM_MSIM_CONSTANTS_H */
 
=== modified file 'drivers/qcommsimmodem/qcom_msim_modem.c'
--- drivers/qcommsimmodem/qcom_msim_modem.c	2015-06-11 16:14:06 +0000
+++ drivers/qcommsimmodem/qcom_msim_modem.c	2016-07-01 17:24:58 +0000
@@ -40,6 +40,7 @@
 	DBG("");
 
 	qcom_msim_radio_settings_init();
+	qcom_msim_gprs_init();
 
 	return 0;
 }
@@ -49,6 +50,7 @@
 	DBG("");
 
 	qcom_msim_radio_settings_exit();
+	qcom_msim_gprs_exit();
 }
 
 OFONO_PLUGIN_DEFINE(qcommsimmodem, "Qualcomm multi-sim modem driver", VERSION,
 
=== modified file 'drivers/qcommsimmodem/qcom_msim_modem.h'
--- drivers/qcommsimmodem/qcom_msim_modem.h	2015-06-11 16:14:06 +0000
+++ drivers/qcommsimmodem/qcom_msim_modem.h	2016-07-01 17:24:58 +0000
@@ -23,3 +23,6 @@
 
 extern void qcom_msim_radio_settings_init(void);
 extern void qcom_msim_radio_settings_exit(void);
+
+extern void qcom_msim_gprs_init(void);
+extern void qcom_msim_gprs_exit(void);
 
=== modified file 'drivers/rilmodem/call-barring.c'
--- drivers/rilmodem/call-barring.c	2016-01-05 14:42:38 +0000
+++ drivers/rilmodem/call-barring.c	2016-07-01 17:24:58 +0000
@@ -33,6 +33,7 @@
 #include "call-barring.h"
 #include "rilmodem.h"
 #include "ril_constants.h"
+#include "rilutil.h"
 
 struct barring_data {
 	GRil *ril;
 
=== modified file 'drivers/rilmodem/call-forwarding.c'
--- drivers/rilmodem/call-forwarding.c	2015-09-29 08:46:51 +0000
+++ drivers/rilmodem/call-forwarding.c	2016-07-01 17:24:58 +0000
@@ -42,6 +42,7 @@
 #include "grilreply.h"
 #include "grilunsol.h"
 
+#include "rilutil.h"
 #include "rilmodem.h"
 
 #include "common.h"
 
=== modified file 'drivers/rilmodem/call-settings.c'
--- drivers/rilmodem/call-settings.c	2013-12-10 09:44:10 +0000
+++ drivers/rilmodem/call-settings.c	2016-07-01 17:24:58 +0000
@@ -44,6 +44,7 @@
 #include "grilreply.h"
 
 #include "rilmodem.h"
+#include "rilutil.h"
 #include "ril_constants.h"
 #include "common.h"
 
 
=== modified file 'drivers/rilmodem/call-volume.c'
--- drivers/rilmodem/call-volume.c	2013-12-09 17:09:20 +0000
+++ drivers/rilmodem/call-volume.c	2016-07-01 17:24:58 +0000
@@ -41,6 +41,7 @@
 #include "common.h"
 
 #include "rilmodem.h"
+#include "rilutil.h"
 #include "parcel.h"
 #include "grilrequest.h"
 #include "grilreply.h"
 
=== modified file 'drivers/rilmodem/devinfo.c'
--- drivers/rilmodem/devinfo.c	2013-12-09 17:09:20 +0000
+++ drivers/rilmodem/devinfo.c	2016-07-01 17:24:58 +0000
@@ -39,6 +39,7 @@
 #include "gril.h"
 
 #include "rilmodem.h"
+#include "rilutil.h"
 #include "grilreply.h"
 
 /*
 
=== modified file 'drivers/rilmodem/gprs.c'
--- drivers/rilmodem/gprs.c	2016-04-13 14:35:57 +0000
+++ drivers/rilmodem/gprs.c	2016-07-01 17:24:58 +0000
@@ -38,6 +38,7 @@
 #include <ofono/modem.h>
 #include <ofono/gprs.h>
 #include <ofono/types.h>
+#include <ofono.h>
 
 #include "gril.h"
 #include "grilutil.h"
@@ -49,9 +50,13 @@
 #include "grilunsol.h"
 #include "gprs.h"
 
+#include "plugins/ril.h"
+
 /* Time between get data status retries */
 #define GET_STATUS_TIMER_MS 5000
 
+static void send_allow_data(struct cb_data *cbd, GRil *ril, int attached);
+
 /*
  * This module is the ofono_gprs_driver implementation for rilmodem.
  *
@@ -78,6 +83,7 @@
 	case RADIO_TECH_EDGE:
 		return PACKET_BEARER_EGPRS;
 	case RADIO_TECH_UMTS:
+	case RADIO_TECH_TD_SCDMA:
 		return PACKET_BEARER_UMTS;
 	case RADIO_TECH_HSDPA:
 		return PACKET_BEARER_HSDPA;
@@ -162,6 +168,75 @@
 		ril_gprs_registration_status(gprs, NULL, NULL);
 }
 
+struct gprs_attach_data {
+	struct ril_gprs_data *gd;
+	GRil *ril;
+	gboolean set_attached;
+	gboolean detaching_other_slot;
+};
+
+static void free_attach_cbd(struct cb_data *cbd)
+{
+	g_free(cbd->user);
+	g_free(cbd);
+}
+
+static void gprs_allow_data_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_gprs_cb_t cb = cbd->cb;
+	struct gprs_attach_data *attach_data = cbd->user;
+	struct ril_gprs_data *gd = attach_data->gd;
+
+	g_ril_print_response_no_args(attach_data->ril, message);
+
+	/*
+	 * We do not care if detaching the other slot fails. This happens in
+	 * turbo when the other slot is empty, for instance.
+	 */
+	if (attach_data->detaching_other_slot) {
+		attach_data->ril = gd->ril;
+		attach_data->detaching_other_slot = FALSE;
+
+		send_allow_data(cbd, gd->ril, attach_data->set_attached);
+		return;
+	}
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: RIL error %s", __func__,
+				ril_error_to_string(message->error));
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+		free_attach_cbd(cbd);
+		return;
+	}
+
+	gd->ofono_attached = attach_data->set_attached;
+
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
+
+	free_attach_cbd(cbd);
+}
+
+static void send_allow_data(struct cb_data *cbd, GRil *ril, int attached)
+{
+	ofono_gprs_cb_t cb = cbd->cb;
+	struct parcel rilp;
+
+	/* ALLOW_DATA payload: int[] with attach value */
+	parcel_init(&rilp);
+	parcel_w_int32(&rilp, 1);
+	parcel_w_int32(&rilp, attached);
+
+	g_ril_append_print_buf(ril, "(%d)", attached);
+
+	if (g_ril_send(ril, RIL_REQUEST_ALLOW_DATA, &rilp,
+					gprs_allow_data_cb, cbd, NULL) == 0) {
+		ofono_error("%s: send failed", __func__);
+		free_attach_cbd(cbd);
+		CALLBACK_WITH_FAILURE(cb, cbd->data);
+	}
+}
+
 gboolean ril_gprs_set_attached_cb(gpointer user_data)
 {
 	struct cb_data *cbd = user_data;
@@ -176,44 +251,55 @@
 	return FALSE;
 }
 
-static void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
-					ofono_gprs_cb_t cb, void *data)
+void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
+						ofono_gprs_cb_t cb, void *data)
 {
 	struct cb_data *cbd = cb_data_new(cb, data, NULL);
 	struct ril_gprs_data *gd = ofono_gprs_get_data(gprs);
+	struct gprs_attach_data *attach_data;
+	int attach_aux = attached;
 
 	DBG("attached: %d", attached);
 
-	/*
-	 * As RIL offers no actual control over the GPRS 'attached'
-	 * state, we save the desired state, and use it to override
-	 * the actual modem's state in the 'attached_status' function.
-	 * This is similar to the way the core ofono gprs code handles
-	 * data roaming ( see src/gprs.c gprs_netreg_update().
-	 *
-	 * The core gprs code calls driver->set_attached() when a netreg
-	 * notificaiton is received and any configured roaming conditions
-	 * are met.
-	 */
-	gd->ofono_attached = attached;
-
-	/*
-	 * Call from idle loop, so core can set driver_attached before
-	 * the callback is invoked.
-	 */
-	g_idle_add(ril_gprs_set_attached_cb, cbd);
-}
-
-static gboolean ril_get_status_retry(gpointer user_data)
-{
-	struct ofono_gprs *gprs = user_data;
-	struct ril_gprs_data *gd = ofono_gprs_get_data(gprs);
-
-	gd->status_retry_cb_id = 0;
-
-	ril_gprs_registration_status(gprs, NULL, NULL);
-
-	return FALSE;
+	if (g_ril_get_version(gd->ril) < 10) {
+		/*
+		 * Older RILs offer no actual control over the GPRS 'attached'
+		 * state, we save the desired state, and use it to override
+		 * the actual modem's state in the 'attached_status' function.
+		 * This is similar to the way the core ofono gprs code handles
+		 * data roaming ( see src/gprs.c gprs_netreg_update() ).
+		 *
+		 * The core gprs code calls driver->set_attached() when a netreg
+		 * notificaiton is received and any configured roaming
+		 * conditions are met.
+		 */
+		gd->ofono_attached = attached;
+
+		/*
+		 * Call from idle loop, so core can set driver_attached before
+		 * the callback is invoked.
+		 */
+		g_idle_add(ril_gprs_set_attached_cb, cbd);
+		return;
+	}
+
+	attach_data = g_new0(struct gprs_attach_data, 1);
+	attach_data->gd = gd;
+	attach_data->ril = gd->ril;
+	attach_data->set_attached = attached;
+	attach_data->detaching_other_slot = FALSE;
+
+	/* If we want to attach we have to detach the other slot */
+	if (attached && ril_get_gril_complement(gd->modem)) {
+		attach_data->ril = ril_get_gril_complement(gd->modem);
+		attach_data->detaching_other_slot = TRUE;
+
+		attach_aux = !attached;
+	}
+
+	cbd = cb_data_new(cb, data, attach_data);
+
+	send_allow_data(cbd, attach_data->ril, attach_aux);
 }
 
 static void ril_data_reg_cb(struct ril_msg *message, gpointer user_data)
@@ -229,17 +315,32 @@
 
 	old_status = gd->rild_status;
 
-	if (message->error != RIL_E_SUCCESS) {
+	if (message->error == RIL_E_SUCCESS) {
+		reply = g_ril_reply_parse_data_reg_state(gd->ril, message);
+		if (reply == NULL) {
+			if (cb)
+				CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+			return;
+		}
+	} else {
+		/*
+		 * If we get a RIL error (say, radio not available) it is better
+		 * to return unknown values than to call cb with failure status.
+		 * If we do the last, ConnectionManager would not be created if
+		 * this is the first time we retrieve data status, or we can
+		 * even create infinite loops as the status in gprs atom would
+		 * not be refreshed. When we finally register we will get events
+		 * so we will try to retrieve data state again.
+		 */
 		ofono_error("%s: DATA_REGISTRATION_STATE reply failure: %s",
 				__func__,
 				ril_error_to_string(message->error));
-		goto error;
+
+		reply = g_malloc0(sizeof(*reply));
+		reply->reg_state.status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
+		reply->reg_state.tech = RADIO_TECH_UNKNOWN;
 	}
 
-	reply = g_ril_reply_parse_data_reg_state(gd->ril, message);
-	if (reply == NULL)
-		goto error;
-
 	/*
 	 * There are three cases that can result in this callback
 	 * running:
@@ -344,21 +445,6 @@
 		CALLBACK_WITH_SUCCESS(cb, reply->reg_state.status, cbd->data);
 
 	g_free(reply);
-
-	return;
-error:
-
-	/*
-	 * For some modems DATA_REGISTRATION_STATE will return an error until we
-	 * are registered in the voice network.
-	 */
-	if (old_status == -1 && message->error == RIL_E_GENERIC_FAILURE)
-		gd->status_retry_cb_id =
-			g_timeout_add(GET_STATUS_TIMER_MS,
-					ril_get_status_retry, gprs);
-
-	if (cb)
-		CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
 }
 
 void ril_gprs_registration_status(struct ofono_gprs *gprs,
 
=== modified file 'drivers/rilmodem/gprs.h'
--- drivers/rilmodem/gprs.h	2015-01-29 14:50:30 +0000
+++ drivers/rilmodem/gprs.h	2016-07-01 17:24:58 +0000
@@ -38,6 +38,8 @@
 void ril_gprs_start(struct ril_gprs_driver_data *driver_data,
 			struct ofono_gprs *gprs, struct ril_gprs_data *gd);
 gboolean ril_gprs_set_attached_cb(gpointer user_data);
+void ril_gprs_set_attached(struct ofono_gprs *gprs, int attached,
+						ofono_gprs_cb_t cb, void *data);
 void ril_gprs_registration_status(struct ofono_gprs *gprs,
 					ofono_gprs_status_cb_t cb, void *data);
 void ril_gprs_set_ia_apn(struct ofono_gprs *gprs, const char *apn,
 
=== modified file 'drivers/rilmodem/network-registration.c'
--- drivers/rilmodem/network-registration.c	2015-09-29 08:46:51 +0000
+++ drivers/rilmodem/network-registration.c	2016-07-01 17:24:58 +0000
@@ -40,6 +40,7 @@
 
 #include "common.h"
 #include "gril.h"
+#include "rilutil.h"
 #include "rilmodem.h"
 
 #include "grilreply.h"
@@ -81,6 +82,7 @@
 	case RADIO_TECH_EDGE:
 		return ACCESS_TECHNOLOGY_GSM_EGPRS;
 	case RADIO_TECH_UMTS:
+	case RADIO_TECH_TD_SCDMA:
 		return ACCESS_TECHNOLOGY_UTRAN;
 	case RADIO_TECH_HSDPA:
 		return ACCESS_TECHNOLOGY_UTRAN_HSDPA;
 
=== modified file 'drivers/rilmodem/phonebook.c'
--- drivers/rilmodem/phonebook.c	2015-09-10 07:16:24 +0000
+++ drivers/rilmodem/phonebook.c	2016-07-01 17:24:58 +0000
@@ -48,6 +48,7 @@
 #include "simutil.h"
 #include "common.h"
 
+#include "rilutil.h"
 #include "rilmodem.h"
 
 #define UNUSED	0xFF
 
=== modified file 'drivers/rilmodem/radio-settings.c'
--- drivers/rilmodem/radio-settings.c	2015-09-29 08:46:51 +0000
+++ drivers/rilmodem/radio-settings.c	2016-07-01 17:24:58 +0000
@@ -39,6 +39,7 @@
 
 #include "gril.h"
 
+#include "rilutil.h"
 #include "rilmodem.h"
 
 #include "grilrequest.h"
@@ -229,23 +230,74 @@
 	return FALSE;
 }
 
+static void get_radio_caps_cb(struct ril_msg *message, gpointer user_data)
+{
+	unsigned int available_rats = 0;
+	struct cb_data *cbd = user_data;
+	ofono_radio_settings_available_rats_query_cb_t cb = cbd->cb;
+	struct ofono_radio_settings *rs = cbd->user;
+	struct radio_data *rd = ofono_radio_settings_get_data(rs);
+	struct reply_radio_capability *caps;
+
+	if (message->error != RIL_E_SUCCESS) {
+		ofono_error("%s: error %s", __func__,
+				ril_error_to_string(message->error));
+		CALLBACK_WITH_FAILURE(cb, 0, cbd->data);
+		return;
+	}
+
+	caps = g_ril_reply_parse_get_radio_capability(rd->ril, message);
+	if (caps == NULL) {
+		ofono_error("%s: parse error", __func__);
+		CALLBACK_WITH_FAILURE(cb, 0, cbd->data);
+		return;
+	}
+
+	if (caps->rat & RIL_RAF_GSM)
+		available_rats |= OFONO_RADIO_ACCESS_MODE_GSM;
+
+	if (caps->rat & (RIL_RAF_UMTS | RIL_RAF_TD_SCDMA))
+		available_rats |= OFONO_RADIO_ACCESS_MODE_UMTS;
+
+	if (caps->rat & RIL_RAF_LTE)
+		available_rats |= OFONO_RADIO_ACCESS_MODE_LTE;
+
+	g_free(caps);
+
+	CALLBACK_WITH_SUCCESS(cb, available_rats, cbd->data);
+}
+
 void ril_query_available_rats(struct ofono_radio_settings *rs,
 			ofono_radio_settings_available_rats_query_cb_t cb,
 			void *data)
 {
+	struct radio_data *rd = ofono_radio_settings_get_data(rs);
 	struct cb_data *cbd = cb_data_new(cb, data, rs);
 
-	g_idle_add(query_available_rats_cb, cbd);
+	if (g_ril_get_version(rd->ril) < 11) {
+		g_idle_add(query_available_rats_cb, cbd);
+		return;
+	}
+
+	if (g_ril_send(rd->ril, RIL_REQUEST_GET_RADIO_CAPABILITY, NULL,
+					get_radio_caps_cb, cbd, g_free) <= 0) {
+		g_free(cbd);
+		CALLBACK_WITH_FAILURE(cb, 0, data);
+	}
 }
 
 void ril_delayed_register(const struct ofono_error *error, void *user_data)
 {
 	struct ofono_radio_settings *rs = user_data;
 
-	if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
-		ofono_radio_settings_register(rs);
-	else
+	if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
 		ofono_error("%s: cannot set default fast dormancy", __func__);
+
+	/*
+	 * We register in all cases, setting FD some times fails until radio is
+	 * available (this happens on turbo and maybe in other devices).
+	 */
+	ofono_radio_settings_register(rs);
 }
 
 static int ril_radio_settings_probe(struct ofono_radio_settings *rs,
 
=== modified file 'drivers/rilmodem/rilmodem.h'
--- drivers/rilmodem/rilmodem.h	2014-10-29 15:59:10 +0000
+++ drivers/rilmodem/rilmodem.h	2016-07-01 17:24:58 +0000
@@ -20,8 +20,6 @@
  *
  */
 
-#include "rilutil.h"
-
 #define RILMODEM "rilmodem"
 
 /* Shared constants */
 
=== modified file 'drivers/rilmodem/sim.c'
--- drivers/rilmodem/sim.c	2016-03-14 08:16:40 +0000
+++ drivers/rilmodem/sim.c	2016-07-01 17:24:58 +0000
@@ -46,6 +46,7 @@
 #include "grilutil.h"
 #include "parcel.h"
 #include "ril_constants.h"
+#include "rilutil.h"
 #include "rilmodem.h"
 
 #include "grilreply.h"
@@ -943,7 +944,8 @@
 			g_free(cbd);
 			CALLBACK_WITH_FAILURE(cb, NULL, data);
 		}
-	} else if (sd->vendor == OFONO_RIL_VENDOR_MTK) {
+	} else if (sd->vendor == OFONO_RIL_VENDOR_MTK ||
+			sd->vendor == OFONO_RIL_VENDOR_MTK2) {
 		struct cb_data *cbd = cb_data_new(cb, data, sd);
 		struct parcel rilp;
 		const char *at_epinc[] = { "AT+EPINC", "+EPINC:" };
 
=== modified file 'drivers/rilmodem/sms.c'
--- drivers/rilmodem/sms.c	2016-03-14 08:16:40 +0000
+++ drivers/rilmodem/sms.c	2016-07-01 17:24:58 +0000
@@ -42,6 +42,7 @@
 #include "util.h"
 
 #include "rilmodem.h"
+#include "rilutil.h"
 #include "grilrequest.h"
 #include "grilreply.h"
 #include "grilunsol.h"
 
=== modified file 'drivers/rilmodem/ussd.c'
--- drivers/rilmodem/ussd.c	2014-05-12 14:21:13 +0000
+++ drivers/rilmodem/ussd.c	2016-07-01 17:24:58 +0000
@@ -43,6 +43,7 @@
 #include "grilrequest.h"
 #include "grilunsol.h"
 
+#include "rilutil.h"
 #include "rilmodem.h"
 
 #include "ril_constants.h"
@@ -170,6 +171,7 @@
 	struct ofono_ussd *ussd = user_data;
 	struct ussd_data *ud = ofono_ussd_get_data(ussd);
 	struct unsol_ussd *unsol;
+	enum ofono_ril_vendor vendor;
 
 	unsol = g_ril_unsol_parse_ussd(ud->ril, message);
 	if (unsol == NULL) {
@@ -178,8 +180,10 @@
 	}
 
 	/* To fix bug in MTK: USSD-Notify arrive with type 2 instead of 0 */
-	if (g_ril_vendor(ud->ril) == OFONO_RIL_VENDOR_MTK &&
-			unsol->message != NULL && unsol->type == 2)
+	vendor = g_ril_vendor(ud->ril);
+	if ((vendor == OFONO_RIL_VENDOR_MTK ||
+				vendor == OFONO_RIL_VENDOR_MTK2)
+			&& unsol->message != NULL && unsol->type == 2)
 		unsol->type = 0;
 
 	/*
 
=== modified file 'drivers/rilmodem/vendor.h'
--- drivers/rilmodem/vendor.h	2015-04-23 13:08:30 +0000
+++ drivers/rilmodem/vendor.h	2016-07-01 17:24:58 +0000
@@ -26,7 +26,8 @@
 	OFONO_RIL_VENDOR_AOSP = 0,
 	OFONO_RIL_VENDOR_MTK,
 	OFONO_RIL_VENDOR_INFINEON,
-	OFONO_RIL_VENDOR_QCOM_MSIM
+	OFONO_RIL_VENDOR_QCOM_MSIM,
+	OFONO_RIL_VENDOR_MTK2
 };
 
 #endif /* RILMODEM_VENDOR_H */
 
=== modified file 'drivers/rilmodem/voicecall.c'
--- drivers/rilmodem/voicecall.c	2015-10-07 07:14:11 +0000
+++ drivers/rilmodem/voicecall.c	2016-07-01 17:24:58 +0000
@@ -45,6 +45,7 @@
 #include "grilunsol.h"
 
 #include "common.h"
+#include "rilutil.h"
 #include "rilmodem.h"
 #include "voicecall.h"
 
 
=== modified file 'gril/grilreply.c'
--- gril/grilreply.c	2016-03-14 08:16:40 +0000
+++ gril/grilreply.c	2016-07-01 17:24:58 +0000
@@ -84,8 +84,9 @@
 	unsigned int num_ops, num_strings;
 	unsigned int i;
 	int strings_per_opt;
+	enum ofono_ril_vendor vendor = g_ril_vendor(gril);
 
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+	if (vendor == OFONO_RIL_VENDOR_MTK)
 		strings_per_opt = 5;
 	else
 		strings_per_opt = 4;
@@ -142,7 +143,7 @@
 		 * MTK: additional string with technology: 2G/3G are the only
 		 * valid values currently.
 		 */
-		if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+		if (vendor == OFONO_RIL_VENDOR_MTK) {
 			char *tech = parcel_r_string(&rilp);
 			if (strcmp(tech, "3G") == 0)
 				operator->tech = RADIO_TECH_UMTS;
@@ -336,7 +337,8 @@
 		g_ril_append_print_buf(gril, "%s%s", print_buf,
 					ril_radio_tech_to_string(val));
 
-		if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+		if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK ||
+				g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK2) {
 			switch (val) {
 			case MTK_RADIO_TECH_HSDPAP:
 			case MTK_RADIO_TECH_HSDPAP_UPA:
@@ -452,7 +454,8 @@
 		 * MTK modem does not return max_cids, string for this index
 		 * actually contains the maximum data bearer capability.
 		 */
-		if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+		if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK ||
+				g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK2)
 			reply->max_cids = MTK_MODEM_MAX_CIDS;
 		else
 			reply->max_cids = val;
@@ -1182,7 +1185,8 @@
 	net_type = parcel_net_type;
 
 	/* Try to translate special MTK settings */
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK ||
+			g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK2) {
 		switch (net_type) {
 		/* 4G preferred */
 		case MTK_PREF_NET_TYPE_LTE_GSM_WCDMA:
@@ -1325,6 +1329,7 @@
 		g_ril_append_print_buf(gril, "{%d}", retries[passwd_type]);
 		break;
 	case OFONO_RIL_VENDOR_MTK:
+	case OFONO_RIL_VENDOR_MTK2:
 		/*
 		 * Some versions of MTK modem return just the retries for the
 		 * password just entered while others return the retries for all
@@ -1456,3 +1461,99 @@
 out:
 	return str_arr;
 }
+
+struct reply_radio_capability *g_ril_reply_parse_get_radio_capability(
+				GRil *gril, const struct ril_msg *message)
+{
+	struct reply_radio_capability *reply;
+	struct parcel rilp;
+	char *modem_uuid;
+
+	reply = g_new0(struct reply_radio_capability, 1);
+	g_ril_init_parcel(message, &rilp);
+
+	reply->version = parcel_r_int32(&rilp);
+	reply->session = parcel_r_int32(&rilp);
+	reply->phase = parcel_r_int32(&rilp);
+	reply->rat = parcel_r_int32(&rilp);
+	modem_uuid = parcel_r_string(&rilp);
+	if (modem_uuid != NULL)
+		strcpy(reply->modem_uuid, modem_uuid);
+
+	reply->status = parcel_r_int32(&rilp);
+
+	if (rilp.malformed) {
+		ofono_error("%s: malformed parcel", __func__);
+		g_free(reply);
+		reply = NULL;
+		goto end;
+	}
+
+	g_ril_append_print_buf(gril, "{%d,%d,%s,[",
+				reply->version, reply->session,
+				ril_rc_phase_to_string(reply->phase));
+
+	if (reply->rat & RIL_RAF_UNKNOWN)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_UNKNOWN));
+	if (reply->rat & RIL_RAF_GPRS)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_GPRS));
+	if (reply->rat & RIL_RAF_EDGE)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_EDGE));
+	if (reply->rat & RIL_RAF_UMTS)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_UMTS));
+	if (reply->rat & RIL_RAF_IS95A)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_IS95A));
+	if (reply->rat & RIL_RAF_IS95B)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_IS95B));
+	if (reply->rat & RIL_RAF_1xRTT)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_1xRTT));
+	if (reply->rat & RIL_RAF_EVDO_0)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_EVDO_0));
+	if (reply->rat & RIL_RAF_EVDO_A)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_EVDO_A));
+	if (reply->rat & RIL_RAF_HSDPA)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_HSDPA));
+	if (reply->rat & RIL_RAF_HSUPA)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_HSUPA));
+	if (reply->rat & RIL_RAF_HSPA)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_HSPA));
+	if (reply->rat & RIL_RAF_EVDO_B)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_EVDO_B));
+	if (reply->rat & RIL_RAF_EHRPD)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_EHRPD));
+	if (reply->rat & RIL_RAF_LTE)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_LTE));
+	if (reply->rat & RIL_RAF_HSPAP)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_HSPAP));
+	if (reply->rat & RIL_RAF_GSM)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_GSM));
+	if (reply->rat & RIL_RAF_TD_SCDMA)
+		g_ril_append_print_buf(gril, "%s%s,", print_buf,
+				ril_radio_tech_to_string(RADIO_TECH_TD_SCDMA));
+
+	g_ril_append_print_buf(gril, "%s],%s,%s}", print_buf,
+				reply->modem_uuid,
+				ril_rc_status_to_string(reply->status));
+
+	g_ril_print_response(gril, message);
+
+end:
+	return reply;
+}
 
=== modified file 'gril/grilreply.h'
--- gril/grilreply.h	2015-03-18 14:05:58 +0000
+++ gril/grilreply.h	2016-07-01 17:24:58 +0000
@@ -97,6 +97,15 @@
 	void *data;
 };
 
+struct reply_radio_capability {
+	int version;
+	int session;
+	int phase;
+	int rat;
+	char modem_uuid[RIL_MAX_UUID_LENGTH];
+	int status;
+};
+
 void g_ril_reply_free_avail_ops(struct reply_avail_ops *reply);
 
 struct reply_avail_ops *g_ril_reply_parse_avail_ops(GRil *gril,
@@ -178,6 +187,9 @@
 struct parcel_str_array *g_ril_reply_oem_hook_strings(GRil *gril,
 						const struct ril_msg *message);
 
+struct reply_radio_capability *g_ril_reply_parse_get_radio_capability(
+				GRil *gril, const struct ril_msg *message);
+
 #ifdef __cplusplus
 }
 #endif
 
=== modified file 'gril/grilrequest.c'
--- gril/grilrequest.c	2015-09-29 08:47:19 +0000
+++ gril/grilrequest.c	2016-07-01 17:24:58 +0000
@@ -112,6 +112,7 @@
 	unsigned char *comm_path = db_path;
 	char *hex_path = NULL;
 	int len = 0;
+	enum ofono_ril_vendor vendor = g_ril_vendor(ril);
 
 	if (path_len > 0 && path_len < 7) {
 		memcpy(db_path, path, path_len);
@@ -133,7 +134,8 @@
 	 * ETSI TS 102 221, section 8.4.2 (we are accessing the card in mode
 	 * "select by path from MF", see 3gpp 27.007, +CRSM).
 	 */
-	if (g_ril_vendor(ril) == OFONO_RIL_VENDOR_MTK && len >= (int) ROOTMF_SZ
+	if ((vendor == OFONO_RIL_VENDOR_MTK || vendor == OFONO_RIL_VENDOR_MTK2)
+			&& len >= (int) ROOTMF_SZ
 			&& memcmp(db_path, ROOTMF, ROOTMF_SZ) == 0) {
 		comm_path = db_path + ROOTMF_SZ;
 		len -= ROOTMF_SZ;
@@ -242,10 +244,11 @@
 	gchar *auth_str;
 	gchar *profile_str;
 	int num_param = SETUP_DATA_CALL_PARAMS;
+	enum ofono_ril_vendor vendor = g_ril_vendor(gril);
 
 	DBG("");
 
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+	if (vendor == OFONO_RIL_VENDOR_MTK || vendor == OFONO_RIL_VENDOR_MTK2)
 		num_param = SETUP_DATA_CALL_PARAMS + 1;
 
 	/*
@@ -281,7 +284,7 @@
 		profile_str = DATA_PROFILE_CBS_STR;
 		break;
 	case RIL_DATA_PROFILE_MTK_MMS:
-		if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+		if (vendor == OFONO_RIL_VENDOR_MTK) {
 			profile_str = DATA_PROFILE_MTK_MMS_STR;
 			break;
 		}
@@ -335,7 +338,7 @@
 				auth_str,
 				protocol_str);
 
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+	if (vendor == OFONO_RIL_VENDOR_MTK || vendor == OFONO_RIL_VENDOR_MTK2) {
 		/* MTK request_cid parameter */
 		char cid_str[MAX_CID_DIGITS + 1];
 
@@ -361,6 +364,8 @@
 					const struct req_sim_read_info *req,
 					struct parcel *rilp)
 {
+	enum ofono_ril_vendor vendor = g_ril_vendor(gril);
+
 	parcel_init(rilp);
 
 	parcel_w_int32(rilp, CMD_GET_RESPONSE);
@@ -396,7 +401,7 @@
 	 * It looks like this field selects one or another SIM application, but
 	 * we use only one at a time so using zero here seems safe.
 	 */
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+	if (vendor == OFONO_RIL_VENDOR_MTK || vendor == OFONO_RIL_VENDOR_MTK2)
 		parcel_w_int32(rilp, 0);
 
 	return TRUE;
@@ -409,6 +414,8 @@
 					const struct req_sim_read_binary *req,
 					struct parcel *rilp)
 {
+	enum ofono_ril_vendor vendor = g_ril_vendor(gril);
+
 	g_ril_append_print_buf(gril,
 				"(cmd=0x%.2X,efid=0x%.4X,",
 				CMD_READ_BINARY,
@@ -430,7 +437,7 @@
 	parcel_w_string(rilp, req->aid_str);
 
 	/* sessionId, specific to latest MTK modems (harmless for older ones) */
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+	if (vendor == OFONO_RIL_VENDOR_MTK || vendor == OFONO_RIL_VENDOR_MTK2)
 		parcel_w_int32(rilp, 0);
 
 	return TRUE;
@@ -443,6 +450,8 @@
 					const struct req_sim_read_record *req,
 					struct parcel *rilp)
 {
+	enum ofono_ril_vendor vendor = g_ril_vendor(gril);
+
 	parcel_init(rilp);
 	parcel_w_int32(rilp, CMD_READ_RECORD);
 	parcel_w_int32(rilp, req->fileid);
@@ -464,7 +473,7 @@
 	parcel_w_string(rilp, req->aid_str); /* AID (Application ID) */
 
 	/* sessionId, specific to latest MTK modems (harmless for older ones) */
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+	if (vendor == OFONO_RIL_VENDOR_MTK || vendor == OFONO_RIL_VENDOR_MTK2)
 		parcel_w_int32(rilp, 0);
 
 	return TRUE;
@@ -477,6 +486,7 @@
 					const struct req_sim_write_binary *req,
 					struct parcel *rilp)
 {
+	enum ofono_ril_vendor vendor = g_ril_vendor(gril);
 	char *hex_data;
 	int p1, p2;
 
@@ -503,7 +513,7 @@
 	parcel_w_string(rilp, req->aid_str);	/* AID (Application ID) */
 
 	/* sessionId, specific to latest MTK modems (harmless for older ones) */
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+	if (vendor == OFONO_RIL_VENDOR_MTK || vendor == OFONO_RIL_VENDOR_MTK2)
 		parcel_w_int32(rilp, 0);
 
 	g_ril_append_print_buf(gril,
@@ -543,6 +553,7 @@
 					const struct req_sim_write_record *req,
 					struct parcel *rilp)
 {
+	enum ofono_ril_vendor vendor = g_ril_vendor(gril);
 	char *hex_data;
 	int p2;
 
@@ -568,7 +579,7 @@
 	parcel_w_string(rilp, req->aid_str);	/* AID (Application ID) */
 
 	/* sessionId, specific to latest MTK modems (harmless for older ones) */
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK)
+	if (vendor == OFONO_RIL_VENDOR_MTK || vendor == OFONO_RIL_VENDOR_MTK2)
 		parcel_w_int32(rilp, 0);
 
 	g_ril_append_print_buf(gril,
@@ -1103,6 +1114,7 @@
 						const char *mccmnc,
 						struct parcel *rilp)
 {
+	enum ofono_ril_vendor vendor = g_ril_vendor(gril);
 	const char *proto_str;
 	const int auth_type = RIL_AUTH_ANY;
 
@@ -1121,12 +1133,21 @@
 				ril_authtype_to_string(auth_type),
 				user, passwd);
 
-	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK) {
+	if (vendor == OFONO_RIL_VENDOR_MTK || vendor == OFONO_RIL_VENDOR_MTK2) {
 		parcel_w_string(rilp, mccmnc);
-		g_ril_append_print_buf(gril, "%s,%s)", print_buf, mccmnc);
-	} else {
-		g_ril_append_print_buf(gril, "%s)", print_buf);
+		g_ril_append_print_buf(gril, "%s,%s", print_buf, mccmnc);
+		if (vendor == OFONO_RIL_VENDOR_MTK2) {
+			int can_handle_ims = 0;
+
+			parcel_w_int32(rilp, can_handle_ims);
+			/* dualApnPlmnList */
+			parcel_w_string(rilp, NULL);
+			g_ril_append_print_buf(gril, "%s,%d,(null)", print_buf,
+								can_handle_ims);
+		}
 	}
+
+	g_ril_append_print_buf(gril, "%s)", print_buf);
 }
 
 void g_ril_request_set_uicc_subscription(GRil *gril, int slot_id,
 
=== modified file 'gril/grilunsol.c'
--- gril/grilunsol.c	2016-03-11 04:20:17 +0000
+++ gril/grilunsol.c	2016-07-01 17:24:58 +0000
@@ -61,12 +61,22 @@
 	size = parcel_r_int32(&rilp);
 	version = parcel_r_int32(&rilp);
 
+	/*
+	 * For something that looks like a bug we get an extra int in mtk2
+	 * modems. RIL version is the second integer in this case. This
+	 * happens when we get duplicated connected events, which should
+	 * not happen either. In these cases the first event has the right
+	 * size, but not those appearing after.
+	 */
+	if (g_ril_vendor(gril) == OFONO_RIL_VENDOR_MTK2 && size > 1)
+		version = parcel_r_int32(&rilp);
+
 	if (rilp.malformed) {
 		ofono_error("%s: malformed parcel", __func__);
 		version = RIL_VERSION_UNSPECIFIED;
 	}
 
-	g_ril_append_print_buf(gril, "{size:%d, [%d, ...]}", size, version);
+	g_ril_append_print_buf(gril, "{size: %d, [%d]}", size, version);
 	g_ril_print_unsol(gril, message);
 
 	return version;
 
=== modified file 'gril/grilutil.c'
--- gril/grilutil.c	2015-11-10 09:12:03 +0000
+++ gril/grilutil.c	2016-07-01 17:24:58 +0000
@@ -268,6 +268,10 @@
 		return "HSPAP";
 	case RADIO_TECH_GSM:
 		return "GSM";
+	case RADIO_TECH_TD_SCDMA:
+		return "TD_SCDMA";
+	case RADIO_TECH_IWLAN:
+		return "IWLAN";
 	case MTK_RADIO_TECH_HSDPAP:
 		return "MTK_HSDPAP";
 	case MTK_RADIO_TECH_HSDPAP_UPA:
@@ -517,6 +521,54 @@
 		return "RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS";
 	case RIL_REQUEST_SET_INITIAL_ATTACH_APN:
 		return "RIL_REQUEST_SET_INITIAL_ATTACH_APN";
+	case RIL_REQUEST_IMS_REGISTRATION_STATE:
+		return "RIL_REQUEST_IMS_REGISTRATION_STATE";
+	case RIL_REQUEST_IMS_SEND_SMS:
+		return "RIL_REQUEST_IMS_SEND_SMS";
+	case RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC:
+		return "RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC";
+	case RIL_REQUEST_SIM_OPEN_CHANNEL:
+		return "RIL_REQUEST_SIM_OPEN_CHANNEL";
+	case RIL_REQUEST_SIM_CLOSE_CHANNEL:
+		return "RIL_REQUEST_SIM_CLOSE_CHANNEL";
+	case RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL:
+		return "RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL";
+	case RIL_REQUEST_NV_READ_ITEM:
+		return "RIL_REQUEST_NV_READ_ITEM";
+	case RIL_REQUEST_NV_WRITE_ITEM:
+		return "RIL_REQUEST_NV_WRITE_ITEM";
+	case RIL_REQUEST_NV_WRITE_CDMA_PRL:
+		return "RIL_REQUEST_NV_WRITE_CDMA_PRL";
+	case RIL_REQUEST_NV_RESET_CONFIG:
+		return "RIL_REQUEST_NV_RESET_CONFIG";
+	case RIL_REQUEST_SET_UICC_SUBSCRIPTION :
+		return "RIL_REQUEST_SET_UICC_SUBSCRIPTION ";
+	case RIL_REQUEST_ALLOW_DATA :
+		return "RIL_REQUEST_ALLOW_DATA ";
+	case RIL_REQUEST_GET_HARDWARE_CONFIG:
+		return "RIL_REQUEST_GET_HARDWARE_CONFIG";
+	case RIL_REQUEST_SIM_AUTHENTICATION:
+		return "RIL_REQUEST_SIM_AUTHENTICATION";
+	case RIL_REQUEST_GET_DC_RT_INFO:
+		return "RIL_REQUEST_GET_DC_RT_INFO";
+	case RIL_REQUEST_SET_DC_RT_INFO_RATE:
+		return "RIL_REQUEST_SET_DC_RT_INFO_RATE";
+	case RIL_REQUEST_SET_DATA_PROFILE:
+		return "RIL_REQUEST_SET_DATA_PROFILE";
+	case RIL_REQUEST_SHUTDOWN:
+		return "RIL_REQUEST_SHUTDOWN";
+	case RIL_REQUEST_GET_RADIO_CAPABILITY:
+		return "RIL_REQUEST_GET_RADIO_CAPABILITY";
+	case RIL_REQUEST_SET_RADIO_CAPABILITY:
+		return "RIL_REQUEST_SET_RADIO_CAPABILITY";
+	case RIL_REQUEST_START_LCE:
+		return "RIL_REQUEST_START_LCE";
+	case RIL_REQUEST_STOP_LCE:
+		return "RIL_REQUEST_STOP_LCE";
+	case RIL_REQUEST_PULL_LCEDATA:
+		return "RIL_REQUEST_PULL_LCEDATA";
+	case RIL_REQUEST_GET_ACTIVITY_INFO:
+		return "RIL_REQUEST_GET_ACTIVITY_INFO";
 	default:
 		return "<INVALID>";
 	}
@@ -595,8 +647,30 @@
 		return "UNSOL_EXIT_EMERGENCY_CALLBACK_MODE";
 	case RIL_UNSOL_RIL_CONNECTED:
 		return "UNSOL_RIL_CONNECTED";
+	case RIL_UNSOL_VOICE_RADIO_TECH_CHANGED:
+		return "RIL_UNSOL_VOICE_RADIO_TECH_CHANGED";
+	case RIL_UNSOL_CELL_INFO_LIST:
+		return "RIL_UNSOL_CELL_INFO_LIST";
+	case RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED:
+		return "RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED";
+	case RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED:
+		return "RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED";
+	case RIL_UNSOL_SRVCC_STATE_NOTIFY:
+		return "RIL_UNSOL_SRVCC_STATE_NOTIFY";
+	case RIL_UNSOL_HARDWARE_CONFIG_CHANGED:
+		return "RIL_UNSOL_HARDWARE_CONFIG_CHANGED";
+	case RIL_UNSOL_DC_RT_INFO_CHANGED:
+		return "RIL_UNSOL_DC_RT_INFO_CHANGED";
+	case RIL_UNSOL_RADIO_CAPABILITY:
+		return "RIL_UNSOL_RADIO_CAPABILITY";
+	case RIL_UNSOL_ON_SS:
+		return "RIL_UNSOL_ON_SS";
+	case RIL_UNSOL_STK_CC_ALPHA_NOTIFY:
+		return "RIL_UNSOL_STK_CC_ALPHA_NOTIFY";
+	case RIL_UNSOL_LCEDATA_RECV:
+		return "RIL_UNSOL_LCEDATA_RECV";
 	default:
-		return "<unknown request>";
+		return "<unknown event>";
 	}
 }
 
@@ -660,6 +734,38 @@
 	}
 }
 
+const char *ril_rc_phase_to_string(int phase)
+{
+	switch (phase) {
+	case RIL_RC_PHASE_CONFIGURED:
+		return "RIL_RC_PHASE_CONFIGURED";
+	case RIL_RC_PHASE_START:
+		return "RIL_RC_PHASE_START";
+	case RIL_RC_PHASE_APPLY:
+		return "RIL_RC_PHASE_APPLY";
+	case RIL_RC_PHASE_UNSOL_RSP:
+		return "RIL_RC_PHASE_UNSOL_RSP";
+	case RIL_RC_PHASE_FINISH:
+		return "RIL_RC_PHASE_FINISH";
+	default:
+		return "<UNKNOWN RC PHASE>";
+	}
+}
+
+const char *ril_rc_status_to_string(int status)
+{
+	switch (status) {
+	case RIL_RC_STATUS_NONE:
+		return "RC_STATUS_NONE";
+	case RIL_RC_STATUS_SUCCESS:
+		return "RC_STATUS_SUCCESS";
+	case RIL_RC_STATUS_FAIL:
+		return "RC_STATUS_FAIL";
+	default:
+		return "<UNKNOWN RC STATUS>";
+	}
+}
+
 void g_ril_util_debug_hexdump(gboolean in, const unsigned char *buf, gsize len,
 				GRilDebugFunc debugf, gpointer user_data)
 {
 
=== modified file 'gril/grilutil.h'
--- gril/grilutil.h	2015-11-10 09:11:52 +0000
+++ gril/grilutil.h	2016-07-01 17:24:58 +0000
@@ -44,6 +44,8 @@
 const char *ril_request_id_to_string(int req);
 const char *ril_unsol_request_to_string(int request);
 const char *ril_pdp_fail_to_string(int status);
+const char *ril_rc_phase_to_string(int phase);
+const char *ril_rc_status_to_string(int status);
 
 void g_ril_util_debug_hexdump(gboolean in, const unsigned char *buf, gsize len,
 				GRilDebugFunc debugf, gpointer user_data);
 
=== modified file 'gril/ril_constants.h'
--- gril/ril_constants.h	2016-03-11 04:20:17 +0000
+++ gril/ril_constants.h	2016-07-01 17:24:58 +0000
@@ -26,6 +26,8 @@
 
 #define RIL_VERSION_UNSPECIFIED 0
 
+#define RIL_MAX_UUID_LENGTH 64
+
 /* Error Codes */
 #define RIL_E_SUCCESS 0
 #define RIL_E_RADIO_NOT_AVAILABLE 1
@@ -140,6 +142,8 @@
 #define RADIO_TECH_LTE 14
 #define RADIO_TECH_HSPAP 15
 #define RADIO_TECH_GSM 16
+#define RADIO_TECH_TD_SCDMA 17
+#define RADIO_TECH_IWLAN 18
 /* MTK specific values for radio technologies */
 #define MTK_RADIO_TECH_BASE 128
 #define MTK_RADIO_TECH_HSDPAP (MTK_RADIO_TECH_BASE + 1)
@@ -372,6 +376,30 @@
 #define RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS 107
 #define RIL_REQUEST_VOICE_RADIO_TECH 108
 #define RIL_REQUEST_SET_INITIAL_ATTACH_APN 111
+#define RIL_REQUEST_IMS_REGISTRATION_STATE 112
+#define RIL_REQUEST_IMS_SEND_SMS 113
+#define RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC 114
+#define RIL_REQUEST_SIM_OPEN_CHANNEL 115
+#define RIL_REQUEST_SIM_CLOSE_CHANNEL 116
+#define RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL 117
+#define RIL_REQUEST_NV_READ_ITEM 118
+#define RIL_REQUEST_NV_WRITE_ITEM 119
+#define RIL_REQUEST_NV_WRITE_CDMA_PRL 120
+#define RIL_REQUEST_NV_RESET_CONFIG 121
+#define RIL_REQUEST_SET_UICC_SUBSCRIPTION  122
+#define RIL_REQUEST_ALLOW_DATA  123
+#define RIL_REQUEST_GET_HARDWARE_CONFIG 124
+#define RIL_REQUEST_SIM_AUTHENTICATION 125
+#define RIL_REQUEST_GET_DC_RT_INFO 126
+#define RIL_REQUEST_SET_DC_RT_INFO_RATE 127
+#define RIL_REQUEST_SET_DATA_PROFILE 128
+#define RIL_REQUEST_SHUTDOWN 129
+#define RIL_REQUEST_GET_RADIO_CAPABILITY 130
+#define RIL_REQUEST_SET_RADIO_CAPABILITY 131
+#define RIL_REQUEST_START_LCE 132
+#define RIL_REQUEST_STOP_LCE 133
+#define RIL_REQUEST_PULL_LCEDATA 134
+#define RIL_REQUEST_GET_ACTIVITY_INFO 135
 
 /* RIL Unsolicited Messages */
 #define RIL_UNSOL_RESPONSE_BASE 1000
@@ -411,6 +439,16 @@
 #define RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE 1033
 #define RIL_UNSOL_RIL_CONNECTED 1034
 #define RIL_UNSOL_VOICE_RADIO_TECH_CHANGED 1035
+#define RIL_UNSOL_CELL_INFO_LIST 1036
+#define RIL_UNSOL_RESPONSE_IMS_NETWORK_STATE_CHANGED 1037
+#define RIL_UNSOL_UICC_SUBSCRIPTION_STATUS_CHANGED 1038
+#define RIL_UNSOL_SRVCC_STATE_NOTIFY 1039
+#define RIL_UNSOL_HARDWARE_CONFIG_CHANGED 1040
+#define RIL_UNSOL_DC_RT_INFO_CHANGED 1041
+#define RIL_UNSOL_RADIO_CAPABILITY 1042
+#define RIL_UNSOL_ON_SS 1043
+#define RIL_UNSOL_STK_CC_ALPHA_NOTIFY 1044
+#define RIL_UNSOL_LCEDATA_RECV 1045
 
 /* Suplementary services Service class*/
 #define SERVICE_CLASS_NONE 0
@@ -427,4 +465,36 @@
 #define RIL_REG_STATE_EMERGENCY_DENIED 13
 #define RIL_REG_STATE_EMERGENCY_UNKNOWN 14
 
+/* Radio capability phases */
+#define RIL_RC_PHASE_CONFIGURED 0
+#define RIL_RC_PHASE_START 1
+#define RIL_RC_PHASE_APPLY 2
+#define RIL_RC_PHASE_UNSOL_RSP 3
+#define RIL_RC_PHASE_FINISH 4
+
+/* Radio access family, as flag */
+#define RIL_RAF_UNKNOWN (1 <<  RADIO_TECH_UNKNOWN)
+#define RIL_RAF_GPRS (1 << RADIO_TECH_GPRS)
+#define RIL_RAF_EDGE (1 << RADIO_TECH_EDGE)
+#define RIL_RAF_UMTS (1 << RADIO_TECH_UMTS)
+#define RIL_RAF_IS95A (1 << RADIO_TECH_IS95A)
+#define RIL_RAF_IS95B (1 << RADIO_TECH_IS95B)
+#define RIL_RAF_1xRTT (1 << RADIO_TECH_1xRTT)
+#define RIL_RAF_EVDO_0 (1 << RADIO_TECH_EVDO_0)
+#define RIL_RAF_EVDO_A (1 << RADIO_TECH_EVDO_A)
+#define RIL_RAF_HSDPA (1 << RADIO_TECH_HSDPA)
+#define RIL_RAF_HSUPA (1 << RADIO_TECH_HSUPA)
+#define RIL_RAF_HSPA (1 << RADIO_TECH_HSPA)
+#define RIL_RAF_EVDO_B (1 << RADIO_TECH_EVDO_B)
+#define RIL_RAF_EHRPD (1 << RADIO_TECH_EHRPD)
+#define RIL_RAF_LTE (1 << RADIO_TECH_LTE)
+#define RIL_RAF_HSPAP (1 << RADIO_TECH_HSPAP)
+#define RIL_RAF_GSM (1 << RADIO_TECH_GSM)
+#define RIL_RAF_TD_SCDMA (1 << RADIO_TECH_TD_SCDMA)
+
+/* Radio capability status */
+#define RIL_RC_STATUS_NONE 0
+#define RIL_RC_STATUS_SUCCESS 1
+#define RIL_RC_STATUS_FAIL 2
+
 #endif /*__RIL_CONSTANTS_H*/
 
=== modified file 'include/modem.h'
--- include/modem.h	2015-07-31 12:37:46 +0000
+++ include/modem.h	2016-07-01 17:24:58 +0000
@@ -72,9 +72,6 @@
 
 	/* Populate the atoms available online */
 	void (*post_online)(struct ofono_modem *modem);
-
-	/* Is it a multi-SIM standby modem? */
-	ofono_bool_t (*is_standby)(struct ofono_modem *modem);
 };
 
 void ofono_modem_add_interface(struct ofono_modem *modem,
@@ -122,8 +119,6 @@
 					ofono_bool_t value);
 ofono_bool_t ofono_modem_get_driver_watches_sim(struct ofono_modem *modem);
 
-ofono_bool_t ofono_modem_is_standby(struct ofono_modem *modem);
-
 int ofono_modem_driver_register(const struct ofono_modem_driver *);
 void ofono_modem_driver_unregister(const struct ofono_modem_driver *);
 
 
=== modified file 'plugins/infineon.c'
--- plugins/infineon.c	2015-09-29 08:48:01 +0000
+++ plugins/infineon.c	2016-07-01 17:24:58 +0000
@@ -32,11 +32,12 @@
 #include "ofono.h"
 
 #include "drivers/rilmodem/vendor.h"
+#include "gril.h"
 #include "ril.h"
 
 static int inf_probe(struct ofono_modem *modem)
 {
-	return ril_create(modem, OFONO_RIL_VENDOR_INFINEON);
+	return ril_create(modem, OFONO_RIL_VENDOR_INFINEON, NULL, NULL, NULL);
 }
 
 static struct ofono_modem_driver infineon_driver = {
 
=== modified file 'plugins/mtk.c'
--- plugins/mtk.c	2015-09-29 08:48:01 +0000
+++ plugins/mtk.c	2016-07-01 17:24:58 +0000
@@ -62,6 +62,7 @@
 #include <grilrequest.h>
 #include <grilunsol.h>
 
+#include "drivers/rilmodem/rilutil.h"
 #include "drivers/rilmodem/rilmodem.h"
 #include "drivers/rilmodem/vendor.h"
 
@@ -1669,11 +1670,6 @@
 	return 0;
 }
 
-static ofono_bool_t mtk_is_standby(struct ofono_modem *modem)
-{
-	return TRUE;
-}
-
 static struct ofono_modem_driver mtk_driver = {
 	.name = "mtk",
 	.probe = mtk_probe,
@@ -1684,7 +1680,6 @@
 	.post_sim = mtk_post_sim,
 	.post_online = mtk_post_online,
 	.set_online = mtk_set_online,
-	.is_standby = mtk_is_standby,
 };
 
 static int mtk_init(void)
 
=== added file 'plugins/mtk2.c'
--- plugins/mtk2.c	1970-01-01 00:00:00 +0000
+++ plugins/mtk2.c	2016-07-01 17:24:58 +0000
@@ -0,0 +1,93 @@
+/*
+ *
+ *  oFono - Open Source Telephony - RIL-based devices
+ *
+ *  Copyright (C) 2016 Canonical Ltd.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+
+#include "ofono.h"
+
+#include "drivers/rilmodem/rilmodem.h"
+#include "drivers/rilmodem/vendor.h"
+#include "drivers/mtk2modem/mtk2modem.h"
+#include "drivers/mtk2modem/mtk2util.h"
+#include "gril.h"
+#include "ril.h"
+
+static const char *mtk2_get_driver_type(enum ofono_atom_type atom)
+{
+	switch (atom) {
+	case OFONO_ATOM_TYPE_VOICECALL:
+	case OFONO_ATOM_TYPE_GPRS:
+		return MTK2MODEM;
+	default:
+		return RILMODEM;
+	}
+}
+
+static int mtk2_probe(struct ofono_modem *modem)
+{
+	return ril_create(modem, OFONO_RIL_VENDOR_MTK2,
+				mtk2_request_id_to_string,
+				mtk2_unsol_request_to_string,
+				mtk2_get_driver_type);
+}
+
+static struct ofono_modem_driver mtk2_driver = {
+	.name = "mtk2",
+	.probe = mtk2_probe,
+	.remove = ril_remove,
+	.enable = ril_enable,
+	.disable = ril_disable,
+	.pre_sim = ril_pre_sim,
+	.post_sim = ril_post_sim,
+	.post_online = ril_post_online,
+	.set_online = ril_set_online,
+};
+
+/*
+ * This plugin is a device plugin for MTK modems. It can handle newer modems
+ * than those that use the old mtk.c plugin, therefore the name mtk2.
+ */
+static int mtk2_init(void)
+{
+	int retval = ofono_modem_driver_register(&mtk2_driver);
+
+	if (retval)
+		DBG("ofono_modem_driver_register returned: %d", retval);
+
+	return retval;
+}
+
+static void mtk2_exit(void)
+{
+	DBG("");
+	ofono_modem_driver_unregister(&mtk2_driver);
+}
+
+OFONO_PLUGIN_DEFINE(mtk2, "MTK v2 modem plugin",
+	VERSION, OFONO_PLUGIN_PRIORITY_DEFAULT, mtk2_init, mtk2_exit)
 
=== modified file 'plugins/qcom-msim.c'
--- plugins/qcom-msim.c	2016-03-10 10:15:39 +0000
+++ plugins/qcom-msim.c	2016-07-01 17:24:58 +0000
@@ -31,9 +31,23 @@
 
 #include "ofono.h"
 
+#include "drivers/rilmodem/rilmodem.h"
 #include "drivers/rilmodem/vendor.h"
+#include "drivers/qcommsimmodem/qcom_msim_modem.h"
+#include "gril.h"
 #include "ril.h"
 
+static const char *qcom_msim_get_driver_type(enum ofono_atom_type atom)
+{
+	switch (atom) {
+	case OFONO_ATOM_TYPE_GPRS:
+	case OFONO_ATOM_TYPE_RADIO_SETTINGS:
+		return QCOMMSIMMODEM;
+	default:
+		return RILMODEM;
+	}
+}
+
 static int qcom_msim_probe(struct ofono_modem *modem)
 {
 	int slot_id = ofono_modem_get_integer(modem, "Slot");
@@ -48,7 +62,8 @@
 		g_free(socket);
 	}
 
-	return ril_create(modem, OFONO_RIL_VENDOR_QCOM_MSIM);
+	return ril_create(modem, OFONO_RIL_VENDOR_QCOM_MSIM, NULL, NULL,
+						qcom_msim_get_driver_type);
 }
 
 static struct ofono_modem_driver qcom_msim_driver = {
 
=== modified file 'plugins/ril.c'
--- plugins/ril.c	2016-03-14 08:16:40 +0000
+++ plugins/ril.c	2016-07-01 17:24:58 +0000
@@ -64,9 +64,13 @@
 
 #include "ril.h"
 #include "drivers/rilmodem/rilmodem.h"
+#include "drivers/rilmodem/rilutil.h"
 #include "drivers/rilmodem/vendor.h"
 #include "drivers/qcommsimmodem/qcom_msim_modem.h"
 
+#define MULTISIM_SLOT_0 0
+#define MULTISIM_SLOT_1 1
+
 #define MAX_SIM_STATUS_RETRIES 15
 
 /* this gives 30s for rild to initialize */
@@ -77,14 +81,37 @@
 	GRil *ril;
 	enum ofono_ril_vendor vendor;
 	int sim_status_retries;
-	ofono_bool_t connected;
+	ofono_bool_t init_state;
 	ofono_bool_t ofono_online;
 	int radio_state;
 	struct ofono_sim *sim;
-	struct ofono_radio_settings *radio_settings;
 	int rild_connect_retries;
+	GRilMsgIdToStrFunc request_id_to_string;
+	GRilMsgIdToStrFunc unsol_request_to_string;
+	ril_get_driver_type_func get_driver_type;
+	struct cb_data *set_online_cbd;
 };
 
+/*
+ * Some times we need to access slot B from slot A in dual-SIM modems, so we
+ * need these global variables.
+ */
+static struct ril_data *ril_data_0;
+static struct ril_data *ril_data_1;
+
+/* Get complementary GRil */
+GRil *ril_get_gril_complement(struct ofono_modem *modem)
+{
+	struct ril_data *rd = ofono_modem_get_data(modem);
+
+	if (rd == ril_data_0 && ril_data_1 != NULL)
+		return ril_data_1->ril;
+	else if (rd == ril_data_1 && ril_data_0 != NULL)
+		return ril_data_0->ril;
+
+	return NULL;
+}
+
 static void ril_debug(const char *str, void *user_data)
 {
 	struct ril_data *rd = user_data;
@@ -92,6 +119,46 @@
 	ofono_info("Device %d: %s", g_ril_get_slot(rd->ril), str);
 }
 
+static const char *get_driver_type(struct ril_data *rd,
+					enum ofono_atom_type atom)
+{
+	if (rd->get_driver_type != NULL)
+		return rd->get_driver_type(atom);
+
+	return RILMODEM;
+}
+
+static void ril_send_power(struct ril_data *rd, ofono_bool_t online,
+				GRilResponseFunc func, gpointer user_data)
+{
+	struct parcel rilp;
+
+	DBG("(online = 1, offline = 0)): %d", online);
+
+	g_ril_request_power(rd->ril, (const gboolean) online, &rilp);
+
+	if (g_ril_send(rd->ril, RIL_REQUEST_RADIO_POWER, &rilp,
+			func, user_data, NULL) == 0 && func != NULL) {
+		ofono_error("%s: could not set radio to %d", __func__, online);
+		func(NULL, user_data);
+	}
+}
+
+static void ril_set_powered_off_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct ril_data *rd = ofono_modem_get_data(modem);
+
+	if (message == NULL)
+		return;
+
+	if (message->error == RIL_E_SUCCESS)
+		g_ril_print_response_no_args(rd->ril, message);
+	else
+		ofono_error("%s: RIL error %s", __func__,
+					ril_error_to_string(message->error));
+}
+
 static void ril_radio_state_changed(struct ril_msg *message, gpointer user_data)
 {
 	struct ofono_modem *modem = user_data;
@@ -99,63 +166,76 @@
 	int radio_state = g_ril_unsol_parse_radio_state_changed(rd->ril,
 								message);
 
-	if (radio_state != rd->radio_state) {
-
-		ofono_info("%s: state: %s rd->ofono_online: %d",
-				__func__,
-				ril_radio_state_to_string(radio_state),
-				rd->ofono_online);
-
-		rd->radio_state = radio_state;
-
-		switch (radio_state) {
-		case RADIO_STATE_ON:
-
-			if (rd->radio_settings == NULL) {
-				char *rs_driver;
-				struct ril_radio_settings_driver_data
-						rs_data = { rd->ril, modem };
-
-				if (rd->vendor == OFONO_RIL_VENDOR_QCOM_MSIM)
-					rs_driver = QCOMMSIMMODEM;
-				else
-					rs_driver = RILMODEM;
-
-				rd->radio_settings =
-					ofono_radio_settings_create(modem,
-							rd->vendor, rs_driver,
-							&rs_data);
-			}
-
-			break;
-
-		case RADIO_STATE_UNAVAILABLE:
-		case RADIO_STATE_OFF:
-
-			/*
-			 * Unexpected radio state change, as we are supposed to
-			 * be online. UNAVAILABLE has been seen occassionally
-			 * when powering off the phone. We wait 5 secs to avoid
-			 * too fast re-spawns, then exit with error to make
-			 * upstart re-start ofono.
-			 */
-			if (rd->ofono_online) {
-				ofono_error("%s: radio self-powered off!",
-						__func__);
-				sleep(5);
-				exit(1);
-			}
-			break;
-		default:
-			/* Malformed parcel; no radio state == broken rild */
-			g_assert(FALSE);
+	ofono_info("%s: state: %s, init: %d, rd->ofono_online: %d",
+			__func__, ril_radio_state_to_string(radio_state),
+			rd->init_state, rd->ofono_online);
+
+	rd->radio_state = radio_state;
+
+	/*
+	 * Before showing the modem as powered we make sure the radio is off so
+	 * we start in a sane state (as in AOSP). Note that we must always
+	 * receive an event with the current radio state on initialization
+	 * and also that power state has changed effectively when the event with
+	 * the new radio state has been received (we cannot rely on the reply to
+	 * RIL_REQUEST_RADIO_POWER). Finally, note that powering off on start is
+	 * a must for turbo devices (otherwise radio state never moves from
+	 * unavailable).
+	 */
+	if (rd->init_state) {
+		if (radio_state != RADIO_STATE_OFF) {
+			DBG("powering off radio on init");
+
+			ril_send_power(rd, FALSE, ril_set_powered_off_cb, modem);
+		} else {
+			DBG("calling set_powered(TRUE)");
+			rd->init_state = FALSE;
+
+			/* Note that modem hw is powered, but radio is off */
+			ofono_modem_set_powered(modem, TRUE);
 		}
+		return;
+	}
+
+	/* We process pending callbacks */
+	if (rd->set_online_cbd != NULL && (
+			(rd->ofono_online && radio_state == RADIO_STATE_ON) ||
+			(!rd->ofono_online && radio_state == RADIO_STATE_OFF))
+			) {
+		ofono_modem_online_cb_t cb = rd->set_online_cbd->cb;
+
+		DBG("%s: set_online OK: rd->ofono_online: %d",
+						__func__, rd->ofono_online);
+		CALLBACK_WITH_SUCCESS(cb, rd->set_online_cbd->data);
+
+		g_free(rd->set_online_cbd);
+		rd->set_online_cbd = NULL;
+	}
+
+	if ((radio_state == RADIO_STATE_UNAVAILABLE ||
+				radio_state == RADIO_STATE_OFF)
+			&& rd->ofono_online
+			&& rd->vendor != OFONO_RIL_VENDOR_MTK2) {
+		/*
+		 * Unexpected radio state change, as we are supposed to
+		 * be online. UNAVAILABLE has been seen occassionally
+		 * when powering off the phone. We wait 5 secs to avoid
+		 * too fast re-spawns, then exit with error to make
+		 * upstart re-start ofono. In midori we receive an OFF
+		 * event and immediately after that an ON event when we
+		 * enter the SIM PIN, so do nothing for that device.
+		 */
+		ofono_error("%s: radio self-powered off!", __func__);
+		sleep(5);
+		exit(1);
 	}
 }
 
-int ril_create(struct ofono_modem *modem, enum ofono_ril_vendor vendor)
+int ril_create(struct ofono_modem *modem, enum ofono_ril_vendor vendor,
+		GRilMsgIdToStrFunc request_id_to_string,
+		GRilMsgIdToStrFunc unsol_request_to_string,
+		ril_get_driver_type_func get_driver_type)
 {
-	ofono_bool_t lte_cap;
 	struct ril_data *rd = g_try_new0(struct ril_data, 1);
 	if (rd == NULL) {
 		errno = ENOMEM;
@@ -167,9 +247,10 @@
 	rd->vendor = vendor;
 	rd->ofono_online = FALSE;
 	rd->radio_state = RADIO_STATE_UNAVAILABLE;
-
-	lte_cap = getenv("OFONO_RIL_RAT_LTE") ? TRUE : FALSE;
-	ofono_modem_set_boolean(modem, MODEM_PROP_LTE_CAPABLE, lte_cap);
+	rd->request_id_to_string = request_id_to_string;
+	rd->unsol_request_to_string = unsol_request_to_string;
+	rd->get_driver_type = get_driver_type;
+	rd->init_state = TRUE;
 
 	ofono_modem_set_data(modem, rd);
 
@@ -183,7 +264,7 @@
 
 static int ril_probe(struct ofono_modem *modem)
 {
-	return ril_create(modem, OFONO_RIL_VENDOR_AOSP);
+	return ril_create(modem, OFONO_RIL_VENDOR_AOSP, NULL, NULL, NULL);
 }
 
 void ril_remove(struct ofono_modem *modem)
@@ -205,42 +286,84 @@
 	struct ril_data *rd = ofono_modem_get_data(modem);
 	struct ril_voicecall_driver_data vc_data = { rd->ril, modem };
 	struct ril_sim_data sim_data;
+	struct ril_radio_settings_driver_data rs_data = { rd->ril, modem };
 
 	DBG("");
 
-	ofono_devinfo_create(modem, rd->vendor, RILMODEM, rd->ril);
-	ofono_voicecall_create(modem, rd->vendor, RILMODEM, &vc_data);
-	ofono_call_volume_create(modem, rd->vendor, RILMODEM, rd->ril);
+	ofono_devinfo_create(modem, rd->vendor,
+				get_driver_type(rd, OFONO_ATOM_TYPE_DEVINFO),
+				rd->ril);
+	ofono_voicecall_create(modem, rd->vendor,
+				get_driver_type(rd, OFONO_ATOM_TYPE_VOICECALL),
+				&vc_data);
+	ofono_call_volume_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPES_CALL_VOLUME),
+			rd->ril);
 
 	sim_data.gril = rd->ril;
 	sim_data.modem = modem;
 	sim_data.ril_state_watch = NULL;
 
-	rd->sim = ofono_sim_create(modem, rd->vendor, RILMODEM, &sim_data);
-	g_assert(rd->sim != NULL);
+	rd->sim = ofono_sim_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_SIM), &sim_data);
+
+	/*
+	 * We need to create radio settings here so FastDormancy property is
+	 * available even when there is no SIM (no SIM -> post_sim and
+	 * post_online are not called) so we can make the modem enter low power
+	 * state in that case.
+	 */
+	ofono_radio_settings_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_RADIO_SETTINGS),
+			&rs_data);
 }
 
 void ril_post_sim(struct ofono_modem *modem)
 {
 	struct ril_data *rd = ofono_modem_get_data(modem);
+	struct ofono_message_waiting *mw;
+
+	ofono_sms_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_SMS), rd->ril);
+
+	mw = ofono_message_waiting_create(modem);
+	if (mw)
+		ofono_message_waiting_register(mw);
+
+	ofono_phonebook_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_PHONEBOOK), modem);
+}
+
+static void create_post_online_atoms(struct ofono_modem *modem)
+{
+	struct ril_data *rd = ofono_modem_get_data(modem);
 	struct ofono_gprs *gprs;
 	struct ofono_gprs_context *gc;
-	struct ofono_message_waiting *mw;
 	struct ril_gprs_driver_data gprs_data = { rd->ril, modem };
 	struct ril_gprs_context_data
 		inet_ctx = { rd->ril, modem, OFONO_GPRS_CONTEXT_TYPE_INTERNET };
 	struct ril_gprs_context_data
 		mms_ctx = { rd->ril, modem, OFONO_GPRS_CONTEXT_TYPE_MMS };
 
-	/* TODO: this function should setup:
-	 *  - phonebook
-	 *  - stk ( SIM toolkit )
-	 *  - radio_settings
-	 */
-	ofono_sms_create(modem, rd->vendor, RILMODEM, rd->ril);
-
-	gprs = ofono_gprs_create(modem, rd->vendor, RILMODEM, &gprs_data);
-	gc = ofono_gprs_context_create(modem, rd->vendor, RILMODEM, &inet_ctx);
+	ofono_netreg_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_NETREG), rd->ril);
+	ofono_ussd_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_USSD), rd->ril);
+	ofono_call_settings_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_CALL_SETTINGS),
+			rd->ril);
+	ofono_call_barring_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_CALL_BARRING),
+			rd->ril);
+	ofono_call_forwarding_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_CALL_FORWARDING),
+			rd->ril);
+	gprs = ofono_gprs_create(modem, rd->vendor,
+				get_driver_type(rd, OFONO_ATOM_TYPE_GPRS),
+				&gprs_data);
+	gc = ofono_gprs_context_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_GPRS_CONTEXT),
+			&inet_ctx);
 
 	if (gc) {
 		ofono_gprs_context_set_type(gc,
@@ -248,69 +371,93 @@
 		ofono_gprs_add_context(gprs, gc);
 	}
 
-	gc = ofono_gprs_context_create(modem, rd->vendor, RILMODEM, &mms_ctx);
+	gc = ofono_gprs_context_create(modem, rd->vendor,
+			get_driver_type(rd, OFONO_ATOM_TYPE_GPRS_CONTEXT),
+			&mms_ctx);
 
 	if (gc) {
 		ofono_gprs_context_set_type(gc,
 					OFONO_GPRS_CONTEXT_TYPE_MMS);
 		ofono_gprs_add_context(gprs, gc);
 	}
-
-	mw = ofono_message_waiting_create(modem);
-	if (mw)
-		ofono_message_waiting_register(mw);
-
-	ofono_call_forwarding_create(modem, rd->vendor, RILMODEM, rd->ril);
-
-	ofono_phonebook_create(modem, rd->vendor, RILMODEM, modem);
+}
+
+static void get_radio_caps_cb(struct ril_msg *message, gpointer user_data)
+{
+	struct ofono_modem *modem = user_data;
+	struct ril_data *rd = ofono_modem_get_data(modem);
+	struct reply_radio_capability *caps;
+
+	if (message->error == RIL_E_SUCCESS) {
+		caps = g_ril_reply_parse_get_radio_capability(rd->ril, message);
+		if (caps != NULL && (caps->rat & RIL_RAF_LTE)) {
+			ofono_modem_set_boolean(modem,
+						MODEM_PROP_LTE_CAPABLE, TRUE);
+			g_free(caps);
+		}
+	} else {
+		ofono_error("%s: RIL error %s", __func__,
+					ril_error_to_string(message->error));
+	}
+
+	create_post_online_atoms(modem);
 }
 
 void ril_post_online(struct ofono_modem *modem)
 {
 	struct ril_data *rd = ofono_modem_get_data(modem);
-
-	ofono_netreg_create(modem, rd->vendor, RILMODEM, rd->ril);
-	ofono_ussd_create(modem, rd->vendor, RILMODEM, rd->ril);
-	ofono_call_settings_create(modem, rd->vendor, RILMODEM, rd->ril);
-	ofono_call_barring_create(modem, rd->vendor, RILMODEM, rd->ril);
+	ofono_bool_t lte_cap;
+
+	/* Radio ON -> we can ask for capabilities */
+	if (g_ril_get_version(rd->ril) >= 11) {
+		if (g_ril_send(rd->ril, RIL_REQUEST_GET_RADIO_CAPABILITY, NULL,
+					get_radio_caps_cb, modem, NULL))
+			return;
+
+		ofono_error("%s: error sending GET_RADIO_CAPABILITY", __func__);
+	}
+
+	lte_cap = getenv("OFONO_RIL_RAT_LTE") ? TRUE : FALSE;
+	ofono_modem_set_boolean(modem, MODEM_PROP_LTE_CAPABLE, lte_cap);
+
+	create_post_online_atoms(modem);
 }
 
 static void ril_set_online_cb(struct ril_msg *message, gpointer user_data)
 {
+	struct ril_data *rd = user_data;
+
+	if (message != NULL && message->error == RIL_E_SUCCESS) {
+		g_ril_print_response_no_args(rd->ril, message);
+
+		/*
+		 * Wait for radio state change event now, as that is the real
+		 * moment when radio state changes.
+		 */
+	} else {
+		ofono_modem_online_cb_t cb = rd->set_online_cbd->cb;
+
+		ofono_error("%s: set_online: %d failed", __func__,
+				rd->ofono_online);
+		CALLBACK_WITH_FAILURE(cb, rd->set_online_cbd->data);
+
+		g_free(rd->set_online_cbd);
+		rd->set_online_cbd = NULL;
+	}
+}
+
+static gboolean set_online_done_cb(gpointer user_data)
+{
 	struct cb_data *cbd = user_data;
 	struct ril_data *rd = cbd->user;
 	ofono_modem_online_cb_t cb = cbd->cb;
 
-	if (message != NULL && message->error == RIL_E_SUCCESS) {
-		g_ril_print_response_no_args(rd->ril, message);
-
-		DBG("%s: set_online OK: rd->ofono_online: %d", __func__,
-			rd->ofono_online);
-		CALLBACK_WITH_SUCCESS(cb, cbd->data);
-	} else {
-		ofono_error("%s: set_online: %d failed", __func__,
-				rd->ofono_online);
-		CALLBACK_WITH_FAILURE(cb, cbd->data);
-	}
-
+	DBG("%s: set_online OK: rd->ofono_online: %d",
+						__func__, rd->ofono_online);
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
 	g_free(cbd);
-}
-
-static void ril_send_power(struct ril_data *rd, ofono_bool_t online,
-				GRilResponseFunc func,
-				gpointer user_data)
-{
-	struct parcel rilp;
-
-	DBG("(online = 1, offline = 0)): %i", online);
-
-	g_ril_request_power(rd->ril, (const gboolean) online, &rilp);
-
-	if (g_ril_send(rd->ril, RIL_REQUEST_RADIO_POWER, &rilp,
-			func, user_data, NULL) == 0 && func != NULL) {
-
-		func(NULL, user_data);
-	}
+
+	return FALSE;
 }
 
 void ril_set_online(struct ofono_modem *modem, ofono_bool_t online,
@@ -323,20 +470,13 @@
 
 	DBG("setting rd->ofono_online to: %d", online);
 
-	ril_send_power(rd, online, ril_set_online_cb, cbd);
-}
-
-static void ril_set_powered_off_cb(struct ril_msg *message, gpointer user_data)
-{
-	struct ofono_modem *modem = user_data;
-	struct ril_data *rd = ofono_modem_get_data(modem);
-
-	if (message != NULL && message->error == RIL_E_SUCCESS)
-		g_ril_print_response_no_args(rd->ril, message);
-
-	DBG("calling set_powered(TRUE)");
-
-	ofono_modem_set_powered(modem, TRUE);
+	if ((online && rd->radio_state == RADIO_STATE_ON) ||
+			(!online && rd->radio_state == RADIO_STATE_OFF)) {
+		g_idle_add(set_online_done_cb, cbd);
+	} else {
+		rd->set_online_cbd = cbd;
+		ril_send_power(rd, online, ril_set_online_cb, rd);
+	}
 }
 
 static void ril_connected(struct ril_msg *message, gpointer user_data)
@@ -345,18 +485,21 @@
 	struct ril_data *rd = ofono_modem_get_data(modem);
 	int version;
 
+	/*
+	 * We will use RIL version to check for presence of some features. The
+	 * version is updated in AOSP after major changes. For instance:
+	 *
+	 * Version  9 -> AOSP 4.4
+	 * Version 10 -> AOSP 5.0.0
+	 * Version 11 -> AOSP 6.0.0
+	 *
+	 * Note that all Ubuntu phones are based on BSP >= 4.4.
+	 */
 	version = g_ril_unsol_parse_connected(rd->ril, message);
 	g_ril_set_version(rd->ril, version);
 
 	ofono_info("[%d,UNSOL]< %s, version %d", g_ril_get_slot(rd->ril),
 		g_ril_unsol_request_to_string(rd->ril, message->req), version);
-
-	/* TODO: need a disconnect function to restart things! */
-	rd->connected = TRUE;
-
-	DBG("calling set_powered(FALSE) on connected");
-
-	ril_send_power(rd, FALSE, ril_set_powered_off_cb, modem);
 }
 
 static int create_gril(struct ofono_modem *modem)
@@ -368,19 +511,28 @@
 	ofono_info("Using %s as socket for slot %d.", socket, slot_id);
 	rd->ril = g_ril_new(socket, rd->vendor);
 
-	/* NOTE: Since AT modems open a tty, and then call
+	/*
+	 * NOTE: Since AT modems open a tty, and then call
 	 * g_at_chat_new(), they're able to return -EIO if
 	 * the first fails, and -ENOMEM if the second fails.
 	 * in our case, we already return -EIO if the ril_new
 	 * fails.  If this is important, we can create a ril_socket
 	 * abstraction... ( probaby not a bad idea ).
 	 */
-
 	if (rd->ril == NULL) {
 		ofono_error("g_ril_new() failed to create modem!");
 		return -EIO;
 	}
+
+	if (slot_id == MULTISIM_SLOT_0)
+		ril_data_0 = rd;
+	else
+		ril_data_1 = rd;
+
 	g_ril_set_slot(rd->ril, slot_id);
+	g_ril_set_vendor_print_msg_id_funcs(rd->ril,
+						rd->request_id_to_string,
+						rd->unsol_request_to_string);
 
 	if (getenv("OFONO_RIL_TRACE"))
 		g_ril_set_trace(rd->ril, TRUE);
 
=== modified file 'plugins/ril.h'
--- plugins/ril.h	2014-07-14 12:47:48 +0000
+++ plugins/ril.h	2016-07-01 17:24:58 +0000
@@ -19,7 +19,12 @@
  *
  */
 
-int ril_create(struct ofono_modem *modem, enum ofono_ril_vendor vendor);
+typedef const char *(*ril_get_driver_type_func)(enum ofono_atom_type atom);
+
+int ril_create(struct ofono_modem *modem, enum ofono_ril_vendor vendor,
+		GRilMsgIdToStrFunc request_id_to_string,
+		GRilMsgIdToStrFunc unsol_request_to_string,
+		ril_get_driver_type_func get_driver_type);
 void ril_remove(struct ofono_modem *modem);
 int ril_enable(struct ofono_modem *modem);
 int ril_disable(struct ofono_modem *modem);
@@ -28,3 +33,5 @@
 void ril_post_online(struct ofono_modem *modem);
 void ril_set_online(struct ofono_modem *modem, ofono_bool_t online,
 			ofono_modem_online_cb_t callback, void *data);
+
+GRil *ril_get_gril_complement(struct ofono_modem *modem);
 
=== modified file 'plugins/rildev.c'
--- plugins/rildev.c	2016-03-09 10:35:25 +0000
+++ plugins/rildev.c	2016-07-01 17:24:58 +0000
@@ -55,10 +55,14 @@
 		return -ENODEV;
 	}
 
-	modem_list = g_slist_prepend(modem_list, modem);
-
 	ofono_modem_set_integer(modem, "Slot", slot);
 
+	/*
+	 * We assume all slots of this type belong to a single physical modem
+	 * that works in standby mode.
+	 */
+	ofono_modem_set_string(modem, "StandbyGroup", ril_type);
+
 	/* AOSP has socket path "rild", "rild2"..., while others may differ */
 	if (slot != 0)
 		socket = g_strdup_printf("/dev/socket/rild%d", slot + 1);
@@ -73,9 +77,12 @@
 	if (retval != 0) {
 		ofono_error("%s: ofono_modem_register returned: %d",
 				__func__, retval);
+		ofono_modem_remove(modem);
 		return retval;
 	}
 
+	modem_list = g_slist_prepend(modem_list, modem);
+
 	/*
 	 * kickstart the modem:
 	 * causes core modem code to call
 
=== modified file 'src/gprs.c'
--- src/gprs.c	2016-04-13 14:35:57 +0000
+++ src/gprs.c	2016-07-01 17:24:58 +0000
@@ -1824,11 +1824,17 @@
 	struct ofono_modem *modem_notif = data;
 	DBusConnection *conn;
 	const char *path = ofono_modem_get_path(modem);
+	const char *standby_group, *modem_group;
 
 	if (strcmp(path, ofono_modem_get_path(modem_notif)) == 0)
 		return;
 
-	if (!ofono_modem_is_standby(modem))
+	standby_group = ofono_modem_get_string(modem_notif, "StandbyGroup");
+	if (standby_group == NULL)
+		return;
+
+	modem_group = ofono_modem_get_string(modem, "StandbyGroup");
+	if (g_strcmp0(standby_group, modem_group) != 0)
 		return;
 
 	atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_GPRS);
@@ -1984,9 +1990,10 @@
 					gprs->settings);
 		}
 
-		gprs_netreg_update(gprs);
-
 		notify_powered_change(gprs);
+
+		gprs_netreg_update(gprs);
+
 	} else {
 		return __ofono_error_invalid_args(msg);
 	}
 
=== modified file 'src/modem.c'
--- src/modem.c	2015-11-02 09:18:14 +0000
+++ src/modem.c	2016-07-01 17:24:58 +0000
@@ -2278,11 +2278,3 @@
 out:
 	modem->emergency--;
 }
-
-ofono_bool_t ofono_modem_is_standby(struct ofono_modem *modem)
-{
-	if (modem->driver->is_standby == NULL)
-		return FALSE;
-
-	return modem->driver->is_standby(modem);
-}
 
=== modified file 'src/voicecall.c'
--- src/voicecall.c	2016-03-14 08:16:40 +0000
+++ src/voicecall.c	2016-07-01 17:24:58 +0000
@@ -118,7 +118,7 @@
 
 static const char *default_en_list[] = { "911", "112", NULL };
 static const char *default_en_list_no_sim[] = { "119", "118", "999", "110",
-						"08", "000", NULL };
+					"08", "000", "120", "122", NULL };
 
 static void send_ciev_after_swap_callback(const struct ofono_error *error,
 								void *data);
@@ -2504,10 +2504,6 @@
 	vc->en_list = g_hash_table_new_full(g_str_hash, g_str_equal,
 							g_free, NULL);
 
-	/* Emergency numbers from modem/network */
-	if (vc->nw_en_list)
-		add_to_en_list(vc, vc->nw_en_list);
-
 	/* Emergency numbers read from SIM */
 	if (vc->flags & VOICECALL_FLAG_SIM_ECC_READY) {
 		GSList *l;
@@ -2515,9 +2511,16 @@
 		for (l = vc->sim_en_list; l; l = l->next)
 			g_hash_table_insert(vc->en_list, g_strdup(l->data),
 							NULL);
-	} else
+	}
+
+	/* add the default emergency number, if there no number from SIM */
+	if (g_hash_table_size(vc->en_list) == 0)
 		add_to_en_list(vc, (char **) default_en_list_no_sim);
 
+	/* Emergency numbers from modem/network */
+	if (vc->nw_en_list)
+		add_to_en_list(vc, vc->nw_en_list);
+
 	/* Default emergency numbers */
 	add_to_en_list(vc, (char **) default_en_list);