modem: rename xmm626_sec_modem to xmm626_kernel_smdk4412

The XMM626 is the modem model, and SEC is a reference to
Samsung Electronics.

However, in practice the xmm626_sec_modem file and
functions are tied to a specific kernel interface which is
not upstream.

In CyanogenMod, LineageOS and Replicant (up to the 6.0
version), most of the devices supported by libsamsung-ipc
use a kernel named android_kernel_samsung_smdk4412, which
implements this interface.

So it is more clear to use a name that reflects that
instead of using the generic xmm626_sec_modem name.

Even if SMDK4412 is also a Samsung evaluation board for the
Exynos 4412 System on a chip, the kernel name is probably
way more known to people working on supporting devices with
an XMM626 modem in libsamsung-ipc.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

6 files changed, 141 insertions, 141 deletions

diff --git a/samsung-ipc/devices/galaxys2/galaxys2.c b/samsung-ipc/devices/galaxys2/galaxys2.c
index 3c46121..3529cf5 100644
--- a/samsung-ipc/devices/galaxys2/galaxys2.c
+++ b/samsung-ipc/devices/galaxys2/galaxys2.c
@@ -29,7 +29,7 @@
 #include "galaxys2.h"
 #include "xmm626.h"
 #include "xmm626_hsic.h"
-#include "xmm626_sec_modem.h"
+#include "xmm626_kernel_smdk4412.h"
 
 int galaxys2_boot(struct ipc_client *client)
 {
@@ -75,10 +75,10 @@ int galaxys2_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Opened modem link device");
 
-    rc = xmm626_sec_modem_power(client, modem_boot_fd, 0);
-    rc |= xmm626_sec_modem_link_control_enable(client, modem_link_fd, 0);
-    rc |= xmm626_sec_modem_hci_power(client, 0);
-    rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 0);
+    rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 0);
+    rc |= xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 0);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 0);
+    rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 0);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
@@ -86,10 +86,10 @@ int galaxys2_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Turned the modem off");
 
-    rc = xmm626_sec_modem_power(client, modem_boot_fd, 1);
-    rc |= xmm626_sec_modem_link_control_enable(client, modem_link_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(client, 1);
-    rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 1);
+    rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1);
+    rc |= xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 1);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
+    rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
@@ -97,7 +97,7 @@ int galaxys2_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Turned the modem on");
 
-    rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for link connected failed");
         goto error;
@@ -174,37 +174,37 @@ int galaxys2_boot(struct ipc_client *client)
 
     usleep(300000);
 
-    rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for host wake failed");
     }
 
-    rc = xmm626_sec_modem_link_control_enable(client, modem_link_fd, 0);
-    rc |= xmm626_sec_modem_hci_power(client, 0);
-    rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 0);
+    rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 0);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 0);
+    rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 0);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
     }
 
-    rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for host wake failed");
         goto error;
     }
     ipc_client_log(client, "Waited for host wake");
 
-    rc = xmm626_sec_modem_link_control_enable(client, modem_link_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(client, 1);
-    rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 1);
+    rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 1);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
+    rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
         goto error;
     }
 
-    rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for link connected failed");
         goto error;
@@ -245,7 +245,7 @@ int galaxys2_open(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct galaxys2_transport_data *) data;
 
-    transport_data->fd = xmm626_sec_modem_open(client, type);
+    transport_data->fd = xmm626_kernel_smdk4412_open(client, type);
     if (transport_data->fd < 0)
         return -1;
 
@@ -262,7 +262,7 @@ int galaxys2_close(__attribute__((unused)) struct ipc_client *client,
 
     transport_data = (struct galaxys2_transport_data *) data;
 
-    xmm626_sec_modem_close(client, transport_data->fd);
+    xmm626_kernel_smdk4412_close(client, transport_data->fd);
     transport_data->fd = -1;
 
     return 0;
@@ -279,7 +279,7 @@ int galaxys2_read(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct galaxys2_transport_data *) data;
 
-    rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -295,7 +295,7 @@ int galaxys2_write(__attribute__((unused)) struct ipc_client *client,
 
     transport_data = (struct galaxys2_transport_data *) data;
 
-    rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -311,7 +311,7 @@ int galaxys2_poll(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct galaxys2_transport_data *) data;
 
-    rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
+    rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout);
 
     return rc;
 }
@@ -332,7 +332,7 @@ int galaxys2_power_off(__attribute__((unused)) struct ipc_client *client,
     if (fd < 0)
         return -1;
 
-    rc = xmm626_sec_modem_power(client, fd, 0);
+    rc = xmm626_kernel_smdk4412_power(client, fd, 0);
 
     close(fd);
 
@@ -380,14 +380,14 @@ int galaxys2_data_destroy(void *transport_data,
 
 struct ipc_client_ops galaxys2_fmt_ops = {
     .boot = galaxys2_boot,
-    .send = xmm626_sec_modem_fmt_send,
-    .recv = xmm626_sec_modem_fmt_recv,
+    .send = xmm626_kernel_smdk4412_fmt_send,
+    .recv = xmm626_kernel_smdk4412_fmt_recv,
 };
 
 struct ipc_client_ops galaxys2_rfs_ops = {
     .boot = NULL,
-    .send = xmm626_sec_modem_rfs_send,
-    .recv = xmm626_sec_modem_rfs_recv,
+    .send = xmm626_kernel_smdk4412_rfs_send,
+    .recv = xmm626_kernel_smdk4412_rfs_recv,
 };
 
 struct ipc_client_handlers galaxys2_handlers = {
@@ -408,8 +408,8 @@ struct ipc_client_handlers galaxys2_handlers = {
 };
 
 struct ipc_client_gprs_specs galaxys2_gprs_specs = {
-    .gprs_get_iface = xmm626_sec_modem_gprs_get_iface,
-    .gprs_get_capabilities = xmm626_sec_modem_gprs_get_capabilities,
+    .gprs_get_iface = xmm626_kernel_smdk4412_gprs_get_iface,
+    .gprs_get_capabilities = xmm626_kernel_smdk4412_gprs_get_capabilities,
 };
 
 struct ipc_client_nv_data_specs galaxys2_nv_data_specs = {
diff --git a/samsung-ipc/devices/i9300/i9300.c b/samsung-ipc/devices/i9300/i9300.c
index 06633f9..ba1481b 100644
--- a/samsung-ipc/devices/i9300/i9300.c
+++ b/samsung-ipc/devices/i9300/i9300.c
@@ -29,7 +29,7 @@
 #include "i9300.h"
 #include "xmm626.h"
 #include "xmm626_hsic.h"
-#include "xmm626_sec_modem.h"
+#include "xmm626_kernel_smdk4412.h"
 
 int i9300_boot(struct ipc_client *client)
 {
@@ -75,15 +75,15 @@ int i9300_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Opened modem link device");
 
-    rc = xmm626_sec_modem_hci_power(client, 0);
+    rc = xmm626_kernel_smdk4412_hci_power(client, 0);
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
     }
     ipc_client_log(client, "Turned the modem off");
 
-    rc = xmm626_sec_modem_power(client, modem_boot_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(client, 1);
+    rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
@@ -91,7 +91,7 @@ int i9300_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Turned the modem on");
 
-    rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for link connected failed");
         goto error;
@@ -168,37 +168,37 @@ int i9300_boot(struct ipc_client *client)
 
     usleep(300000);
 
-    rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for host wake failed");
     }
 
-    rc = xmm626_sec_modem_link_control_enable(client, modem_link_fd, 0);
-    rc |= xmm626_sec_modem_hci_power(client, 0);
-    rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 0);
+    rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 0);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 0);
+    rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 0);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
     }
 
-    rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for host wake failed");
         goto error;
     }
     ipc_client_log(client, "Waited for host wake");
 
-    rc = xmm626_sec_modem_link_control_enable(client, modem_link_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(client, 1);
-    rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 1);
+    rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 1);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
+    rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
         goto error;
     }
 
-    rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for link connected failed");
         goto error;
@@ -239,7 +239,7 @@ int i9300_open(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct i9300_transport_data *) data;
 
-    transport_data->fd = xmm626_sec_modem_open(client, type);
+    transport_data->fd = xmm626_kernel_smdk4412_open(client, type);
     if (transport_data->fd < 0)
         return -1;
 
@@ -255,7 +255,7 @@ int i9300_close(__attribute__((unused)) struct ipc_client *client, void *data)
 
     transport_data = (struct i9300_transport_data *) data;
 
-    xmm626_sec_modem_close(client, transport_data->fd);
+    xmm626_kernel_smdk4412_close(client, transport_data->fd);
     transport_data->fd = -1;
 
     return 0;
@@ -272,7 +272,7 @@ int i9300_read(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct i9300_transport_data *) data;
 
-    rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -288,7 +288,7 @@ int i9300_write(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct i9300_transport_data *) data;
 
-    rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -304,7 +304,7 @@ int i9300_poll(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct i9300_transport_data *) data;
 
-    rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
+    rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout);
 
     return rc;
 }
@@ -325,7 +325,7 @@ int i9300_power_off(__attribute__((unused)) struct ipc_client *client,
     if (fd < 0)
         return -1;
 
-    rc = xmm626_sec_modem_power(client, fd, 0);
+    rc = xmm626_kernel_smdk4412_power(client, fd, 0);
 
     close(fd);
 
@@ -373,14 +373,14 @@ int i9300_data_destroy(void *transport_data,
 
 struct ipc_client_ops i9300_fmt_ops = {
     .boot = i9300_boot,
-    .send = xmm626_sec_modem_fmt_send,
-    .recv = xmm626_sec_modem_fmt_recv,
+    .send = xmm626_kernel_smdk4412_fmt_send,
+    .recv = xmm626_kernel_smdk4412_fmt_recv,
 };
 
 struct ipc_client_ops i9300_rfs_ops = {
     .boot = NULL,
-    .send = xmm626_sec_modem_rfs_send,
-    .recv = xmm626_sec_modem_rfs_recv,
+    .send = xmm626_kernel_smdk4412_rfs_send,
+    .recv = xmm626_kernel_smdk4412_rfs_recv,
 };
 
 struct ipc_client_handlers i9300_handlers = {
@@ -401,8 +401,8 @@ struct ipc_client_handlers i9300_handlers = {
 };
 
 struct ipc_client_gprs_specs i9300_gprs_specs = {
-    .gprs_get_iface = xmm626_sec_modem_gprs_get_iface,
-    .gprs_get_capabilities = xmm626_sec_modem_gprs_get_capabilities,
+    .gprs_get_iface = xmm626_kernel_smdk4412_gprs_get_iface,
+    .gprs_get_capabilities = xmm626_kernel_smdk4412_gprs_get_capabilities,
 };
 
 struct ipc_client_nv_data_specs i9300_nv_data_specs = {
diff --git a/samsung-ipc/devices/maguro/maguro.c b/samsung-ipc/devices/maguro/maguro.c
index bc2b4f6..7b4c6be 100644
--- a/samsung-ipc/devices/maguro/maguro.c
+++ b/samsung-ipc/devices/maguro/maguro.c
@@ -30,7 +30,7 @@
 #include "maguro.h"
 #include "xmm626.h"
 #include "xmm626_mipi.h"
-#include "xmm626_sec_modem.h"
+#include "xmm626_kernel_smdk4412.h"
 
 int maguro_boot(struct ipc_client *client)
 {
@@ -69,14 +69,14 @@ int maguro_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Opened modem boot device");
 
-    rc = xmm626_sec_modem_power(client, modem_boot_fd, 0);
+    rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 0);
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
     }
     ipc_client_log(client, "Turned the modem off");
 
-    rc = xmm626_sec_modem_power(client, modem_boot_fd, 1);
+    rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1);
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
         goto error;
@@ -177,14 +177,14 @@ int maguro_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Sent XMM626 MIPI HW reset");
 
-    rc = xmm626_sec_modem_status_online_wait(client, modem_boot_fd);
+    rc = xmm626_kernel_smdk4412_status_online_wait(client, modem_boot_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for online status failed");
         goto error;
     }
     ipc_client_log(client, "Waited for online status");
 
-    rc = xmm626_sec_modem_boot_power(client, modem_boot_fd, 0);
+    rc = xmm626_kernel_smdk4412_boot_power(client, modem_boot_fd, 0);
     if (rc < 0) {
         ipc_client_log(client, "Turning modem boot off failed");
         goto error;
@@ -223,7 +223,7 @@ int maguro_open(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct maguro_transport_data *) data;
 
-    transport_data->fd = xmm626_sec_modem_open(client, type);
+    transport_data->fd = xmm626_kernel_smdk4412_open(client, type);
     if (transport_data->fd < 0)
         return -1;
 
@@ -239,7 +239,7 @@ int maguro_close(__attribute__((unused)) struct ipc_client *client, void *data)
 
     transport_data = (struct maguro_transport_data *) data;
 
-    xmm626_sec_modem_close(client, transport_data->fd);
+    xmm626_kernel_smdk4412_close(client, transport_data->fd);
     transport_data->fd = -1;
 
     return 0;
@@ -256,7 +256,7 @@ int maguro_read(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct maguro_transport_data *) data;
 
-    rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -272,7 +272,7 @@ int maguro_write(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct maguro_transport_data *) data;
 
-    rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -288,7 +288,7 @@ int maguro_poll(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct maguro_transport_data *) data;
 
-    rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
+    rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout);
 
     return rc;
 }
@@ -309,7 +309,7 @@ int maguro_power_off(__attribute__((unused)) struct ipc_client *client,
     if (fd < 0)
         return -1;
 
-    rc = xmm626_sec_modem_power(client, fd, 0);
+    rc = xmm626_kernel_smdk4412_power(client, fd, 0);
 
     close(fd);
 
@@ -357,14 +357,14 @@ int maguro_data_destroy(void *transport_data,
 
 struct ipc_client_ops maguro_fmt_ops = {
     .boot = maguro_boot,
-    .send = xmm626_sec_modem_fmt_send,
-    .recv = xmm626_sec_modem_fmt_recv,
+    .send = xmm626_kernel_smdk4412_fmt_send,
+    .recv = xmm626_kernel_smdk4412_fmt_recv,
 };
 
 struct ipc_client_ops maguro_rfs_ops = {
     .boot = NULL,
-    .send = xmm626_sec_modem_rfs_send,
-    .recv = xmm626_sec_modem_rfs_recv,
+    .send = xmm626_kernel_smdk4412_rfs_send,
+    .recv = xmm626_kernel_smdk4412_rfs_recv,
 };
 
 struct ipc_client_handlers maguro_handlers = {
@@ -385,8 +385,8 @@ struct ipc_client_handlers maguro_handlers = {
 };
 
 struct ipc_client_gprs_specs maguro_gprs_specs = {
-    .gprs_get_iface = xmm626_sec_modem_gprs_get_iface,
-    .gprs_get_capabilities = xmm626_sec_modem_gprs_get_capabilities,
+    .gprs_get_iface = xmm626_kernel_smdk4412_gprs_get_iface,
+    .gprs_get_capabilities = xmm626_kernel_smdk4412_gprs_get_capabilities,
 };
 
 struct ipc_client_nv_data_specs maguro_nv_data_specs = {
diff --git a/samsung-ipc/devices/n5100/n5100.c b/samsung-ipc/devices/n5100/n5100.c
index c768750..1120c99 100644
--- a/samsung-ipc/devices/n5100/n5100.c
+++ b/samsung-ipc/devices/n5100/n5100.c
@@ -30,7 +30,7 @@
 #include "n5100.h"
 #include "xmm626.h"
 #include "xmm626_hsic.h"
-#include "xmm626_sec_modem.h"
+#include "xmm626_kernel_smdk4412.h"
 
 int n5100_boot(struct ipc_client *client)
 {
@@ -76,15 +76,15 @@ int n5100_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Opened modem link device");
 
-    rc = xmm626_sec_modem_hci_power(client, 0);
+    rc = xmm626_kernel_smdk4412_hci_power(client, 0);
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
     }
     ipc_client_log(client, "Turned the modem off");
 
-    rc = xmm626_sec_modem_power(client, modem_boot_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(client, 1);
+    rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
@@ -92,7 +92,7 @@ int n5100_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Turned the modem on");
 
-    rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for link connected failed");
         goto error;
@@ -169,37 +169,37 @@ int n5100_boot(struct ipc_client *client)
 
     usleep(300000);
 
-    rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for host wake failed");
     }
 
-    rc = xmm626_sec_modem_link_control_enable(client, modem_link_fd, 0);
-    rc |= xmm626_sec_modem_hci_power(client, 0);
-    rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 0);
+    rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 0);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 0);
+    rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 0);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
     }
 
-    rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for host wake failed");
         goto error;
     }
     ipc_client_log(client, "Waited for host wake");
 
-    rc = xmm626_sec_modem_link_control_enable(client, modem_link_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(client, 1);
-    rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 1);
+    rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 1);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
+    rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
         goto error;
     }
 
-    rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for link connected failed");
         goto error;
@@ -240,7 +240,7 @@ int n5100_open(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct n5100_transport_data *) data;
 
-    transport_data->fd = xmm626_sec_modem_open(client, type);
+    transport_data->fd = xmm626_kernel_smdk4412_open(client, type);
     if (transport_data->fd < 0)
         return -1;
 
@@ -256,7 +256,7 @@ int n5100_close(__attribute__((unused)) struct ipc_client *client, void *data)
 
     transport_data = (struct n5100_transport_data *) data;
 
-    xmm626_sec_modem_close(client, transport_data->fd);
+    xmm626_kernel_smdk4412_close(client, transport_data->fd);
     transport_data->fd = -1;
 
     return 0;
@@ -273,7 +273,7 @@ int n5100_read(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct n5100_transport_data *) data;
 
-    rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -289,7 +289,7 @@ int n5100_write(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct n5100_transport_data *) data;
 
-    rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -305,7 +305,7 @@ int n5100_poll(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct n5100_transport_data *) data;
 
-    rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
+    rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout);
 
     return rc;
 }
@@ -326,7 +326,7 @@ int n5100_power_off(__attribute__((unused)) struct ipc_client *client,
     if (fd < 0)
         return -1;
 
-    rc = xmm626_sec_modem_power(client, fd, 0);
+    rc = xmm626_kernel_smdk4412_power(client, fd, 0);
 
     close(fd);
 
@@ -374,14 +374,14 @@ int n5100_data_destroy(void *transport_data,
 
 struct ipc_client_ops n5100_fmt_ops = {
     .boot = n5100_boot,
-    .send = xmm626_sec_modem_fmt_send,
-    .recv = xmm626_sec_modem_fmt_recv,
+    .send = xmm626_kernel_smdk4412_fmt_send,
+    .recv = xmm626_kernel_smdk4412_fmt_recv,
 };
 
 struct ipc_client_ops n5100_rfs_ops = {
     .boot = NULL,
-    .send = xmm626_sec_modem_rfs_send,
-    .recv = xmm626_sec_modem_rfs_recv,
+    .send = xmm626_kernel_smdk4412_rfs_send,
+    .recv = xmm626_kernel_smdk4412_rfs_recv,
 };
 
 struct ipc_client_handlers n5100_handlers = {
@@ -402,8 +402,8 @@ struct ipc_client_handlers n5100_handlers = {
 };
 
 struct ipc_client_gprs_specs n5100_gprs_specs = {
-    .gprs_get_iface = xmm626_sec_modem_gprs_get_iface,
-    .gprs_get_capabilities = xmm626_sec_modem_gprs_get_capabilities,
+    .gprs_get_iface = xmm626_kernel_smdk4412_gprs_get_iface,
+    .gprs_get_capabilities = xmm626_kernel_smdk4412_gprs_get_capabilities,
 };
 
 struct ipc_client_nv_data_specs n5100_nv_data_specs = {
diff --git a/samsung-ipc/devices/n7100/n7100.c b/samsung-ipc/devices/n7100/n7100.c
index 5b27585..c9c0919 100644
--- a/samsung-ipc/devices/n7100/n7100.c
+++ b/samsung-ipc/devices/n7100/n7100.c
@@ -29,7 +29,7 @@
 #include "n7100.h"
 #include "xmm626.h"
 #include "xmm626_hsic.h"
-#include "xmm626_sec_modem.h"
+#include "xmm626_kernel_smdk4412.h"
 
 int n7100_boot(struct ipc_client *client)
 {
@@ -75,15 +75,15 @@ int n7100_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Opened modem link device");
 
-    rc = xmm626_sec_modem_hci_power(client, 0);
+    rc = xmm626_kernel_smdk4412_hci_power(client, 0);
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
     }
     ipc_client_log(client, "Turned the modem off");
 
-    rc = xmm626_sec_modem_power(client, modem_boot_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(client, 1);
+    rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
@@ -91,7 +91,7 @@ int n7100_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Turned the modem on");
 
-    rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for link connected failed");
         goto error;
@@ -168,37 +168,37 @@ int n7100_boot(struct ipc_client *client)
 
     usleep(300000);
 
-    rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for host wake failed");
     }
 
-    rc = xmm626_sec_modem_link_control_enable(client, modem_link_fd, 0);
-    rc |= xmm626_sec_modem_hci_power(client, 0);
-    rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 0);
+    rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 0);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 0);
+    rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 0);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
     }
 
-    rc = xmm626_sec_modem_link_get_hostwake_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_get_hostwake_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for host wake failed");
         goto error;
     }
     ipc_client_log(client, "Waited for host wake");
 
-    rc = xmm626_sec_modem_link_control_enable(client, modem_link_fd, 1);
-    rc |= xmm626_sec_modem_hci_power(client, 1);
-    rc |= xmm626_sec_modem_link_control_active(client, modem_link_fd, 1);
+    rc = xmm626_kernel_smdk4412_link_control_enable(client, modem_link_fd, 1);
+    rc |= xmm626_kernel_smdk4412_hci_power(client, 1);
+    rc |= xmm626_kernel_smdk4412_link_control_active(client, modem_link_fd, 1);
 
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
         goto error;
     }
 
-    rc = xmm626_sec_modem_link_connected_wait(client, modem_link_fd);
+    rc = xmm626_kernel_smdk4412_link_connected_wait(client, modem_link_fd);
     if (rc < 0) {
         ipc_client_log(client, "Waiting for link connected failed");
         goto error;
@@ -239,7 +239,7 @@ int n7100_open(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct n7100_transport_data *) data;
 
-    transport_data->fd = xmm626_sec_modem_open(client, type);
+    transport_data->fd = xmm626_kernel_smdk4412_open(client, type);
     if (transport_data->fd < 0)
         return -1;
 
@@ -255,7 +255,7 @@ int n7100_close(__attribute__((unused)) struct ipc_client *client, void *data)
 
     transport_data = (struct n7100_transport_data *) data;
 
-    xmm626_sec_modem_close(client, transport_data->fd);
+    xmm626_kernel_smdk4412_close(client, transport_data->fd);
     transport_data->fd = -1;
 
     return 0;
@@ -272,7 +272,7 @@ int n7100_read(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct n7100_transport_data *) data;
 
-    rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -288,7 +288,7 @@ int n7100_write(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct n7100_transport_data *) data;
 
-    rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -304,7 +304,7 @@ int n7100_poll(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct n7100_transport_data *) data;
 
-    rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
+    rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout);
 
     return rc;
 }
@@ -325,7 +325,7 @@ int n7100_power_off(__attribute__((unused)) struct ipc_client *client,
     if (fd < 0)
         return -1;
 
-    rc = xmm626_sec_modem_power(client, fd, 0);
+    rc = xmm626_kernel_smdk4412_power(client, fd, 0);
 
     close(fd);
 
@@ -373,14 +373,14 @@ int n7100_data_destroy(void *transport_data,
 
 struct ipc_client_ops n7100_fmt_ops = {
     .boot = n7100_boot,
-    .send = xmm626_sec_modem_fmt_send,
-    .recv = xmm626_sec_modem_fmt_recv,
+    .send = xmm626_kernel_smdk4412_fmt_send,
+    .recv = xmm626_kernel_smdk4412_fmt_recv,
 };
 
 struct ipc_client_ops n7100_rfs_ops = {
     .boot = NULL,
-    .send = xmm626_sec_modem_rfs_send,
-    .recv = xmm626_sec_modem_rfs_recv,
+    .send = xmm626_kernel_smdk4412_rfs_send,
+    .recv = xmm626_kernel_smdk4412_rfs_recv,
 };
 
 struct ipc_client_handlers n7100_handlers = {
@@ -401,8 +401,8 @@ struct ipc_client_handlers n7100_handlers = {
 };
 
 struct ipc_client_gprs_specs n7100_gprs_specs = {
-    .gprs_get_iface = xmm626_sec_modem_gprs_get_iface,
-    .gprs_get_capabilities = xmm626_sec_modem_gprs_get_capabilities,
+    .gprs_get_iface = xmm626_kernel_smdk4412_gprs_get_iface,
+    .gprs_get_capabilities = xmm626_kernel_smdk4412_gprs_get_capabilities,
 };
 
 struct ipc_client_nv_data_specs n7100_nv_data_specs = {
diff --git a/samsung-ipc/devices/piranha/piranha.c b/samsung-ipc/devices/piranha/piranha.c
index 9029a5f..12f4e47 100644
--- a/samsung-ipc/devices/piranha/piranha.c
+++ b/samsung-ipc/devices/piranha/piranha.c
@@ -29,7 +29,7 @@
 #include "piranha.h"
 #include "xmm626.h"
 #include "xmm626_mipi.h"
-#include "xmm626_sec_modem.h"
+#include "xmm626_kernel_smdk4412.h"
 
 int piranha_boot(struct ipc_client *client)
 {
@@ -67,14 +67,14 @@ int piranha_boot(struct ipc_client *client)
     }
     ipc_client_log(client, "Opened modem boot device");
 
-    rc = xmm626_sec_modem_power(client, modem_boot_fd, 0);
+    rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 0);
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem off failed");
         goto error;
     }
     ipc_client_log(client, "Turned the modem off");
 
-    rc = xmm626_sec_modem_power(client, modem_boot_fd, 1);
+    rc = xmm626_kernel_smdk4412_power(client, modem_boot_fd, 1);
     if (rc < 0) {
         ipc_client_log(client, "Turning the modem on failed");
         goto error;
@@ -188,7 +188,7 @@ int piranha_open(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct piranha_transport_data *) data;
 
-    transport_data->fd = xmm626_sec_modem_open(client, type);
+    transport_data->fd = xmm626_kernel_smdk4412_open(client, type);
     if (transport_data->fd < 0)
         return -1;
 
@@ -204,7 +204,7 @@ int piranha_close(__attribute__((unused)) struct ipc_client *client, void *data)
 
     transport_data = (struct piranha_transport_data *) data;
 
-    xmm626_sec_modem_close(client, transport_data->fd);
+    xmm626_kernel_smdk4412_close(client, transport_data->fd);
     transport_data->fd = -1;
 
     return 0;
@@ -221,7 +221,7 @@ int piranha_read(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct piranha_transport_data *) data;
 
-    rc = xmm626_sec_modem_read(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_read(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -237,7 +237,7 @@ int piranha_write(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct piranha_transport_data *) data;
 
-    rc = xmm626_sec_modem_write(client, transport_data->fd, buffer, length);
+    rc = xmm626_kernel_smdk4412_write(client, transport_data->fd, buffer, length);
 
     return rc;
 }
@@ -253,7 +253,7 @@ int piranha_poll(__attribute__((unused)) struct ipc_client *client, void *data,
 
     transport_data = (struct piranha_transport_data *) data;
 
-    rc = xmm626_sec_modem_poll(client, transport_data->fd, fds, timeout);
+    rc = xmm626_kernel_smdk4412_poll(client, transport_data->fd, fds, timeout);
 
     return rc;
 }
@@ -274,7 +274,7 @@ int piranha_power_off(__attribute__((unused)) struct ipc_client *client,
     if (fd < 0)
         return -1;
 
-    rc = xmm626_sec_modem_power(client, fd, 0);
+    rc = xmm626_kernel_smdk4412_power(client, fd, 0);
 
     close(fd);
 
@@ -322,14 +322,14 @@ int piranha_data_destroy(void *transport_data,
 
 struct ipc_client_ops piranha_fmt_ops = {
     .boot = piranha_boot,
-    .send = xmm626_sec_modem_fmt_send,
-    .recv = xmm626_sec_modem_fmt_recv,
+    .send = xmm626_kernel_smdk4412_fmt_send,
+    .recv = xmm626_kernel_smdk4412_fmt_recv,
 };
 
 struct ipc_client_ops piranha_rfs_ops = {
     .boot = NULL,
-    .send = xmm626_sec_modem_rfs_send,
-    .recv = xmm626_sec_modem_rfs_recv,
+    .send = xmm626_kernel_smdk4412_rfs_send,
+    .recv = xmm626_kernel_smdk4412_rfs_recv,
 };
 
 struct ipc_client_handlers piranha_handlers = {
@@ -350,8 +350,8 @@ struct ipc_client_handlers piranha_handlers = {
 };
 
 struct ipc_client_gprs_specs piranha_gprs_specs = {
-    .gprs_get_iface = xmm626_sec_modem_gprs_get_iface,
-    .gprs_get_capabilities = xmm626_sec_modem_gprs_get_capabilities,
+    .gprs_get_iface = xmm626_kernel_smdk4412_gprs_get_iface,
+    .gprs_get_capabilities = xmm626_kernel_smdk4412_gprs_get_capabilities,
 };
 
 struct ipc_client_nv_data_specs piranha_nv_data_specs = {