diff --git a/arch/Kconfig b/arch/Kconfig
index 4935dc12fd13..818c9333f69f 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -53,6 +53,14 @@ endchoice
 
 menu "General Architecture Options"
 
+module = ARCH
+module-str = arch
+source "subsys/logging/Kconfig.template.log_config"
+
+module = MPU
+module-str = mpu
+source "subsys/logging/Kconfig.template.log_config"
+
 config HW_STACK_PROTECTION
 	bool "Hardware Stack Protection"
 	depends on ARCH_HAS_STACK_PROTECTION
diff --git a/arch/arc/core/mpu/arc_core_mpu.c b/arch/arc/core/mpu/arc_core_mpu.c
index b7825670a314..3897981de7a7 100644
--- a/arch/arc/core/mpu/arc_core_mpu.c
+++ b/arch/arc/core/mpu/arc_core_mpu.c
@@ -9,7 +9,10 @@
 #include <kernel.h>
 #include <soc.h>
 #include <arch/arc/v2/mpu/arc_core_mpu.h>
-#include <logging/sys_log.h>
+
+#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(mpu);
 
 /*
  * @brief Configure MPU for the thread
@@ -81,7 +84,7 @@ void configure_mpu_stack_guard(struct k_thread *thread)
  */
 void configure_mpu_user_context(struct k_thread *thread)
 {
-	SYS_LOG_DBG("configure user thread %p's context", thread);
+	LOG_DBG("configure user thread %p's context", thread);
 	arc_core_mpu_configure_user_context(thread);
 }
 
@@ -96,7 +99,7 @@ void configure_mpu_user_context(struct k_thread *thread)
  */
 void configure_mpu_mem_domain(struct k_thread *thread)
 {
-	SYS_LOG_DBG("configure thread %p's domain", thread);
+	LOG_DBG("configure thread %p's domain", thread);
 	arc_core_mpu_configure_mem_domain(thread->mem_domain_info.mem_domain);
 }
 
diff --git a/arch/arc/core/mpu/arc_mpu.c b/arch/arc/core/mpu/arc_mpu.c
index 1eb0754a3f9b..55ae3659b9c8 100644
--- a/arch/arc/core/mpu/arc_mpu.c
+++ b/arch/arc/core/mpu/arc_mpu.c
@@ -12,8 +12,10 @@
 #include <arch/arc/v2/mpu/arc_mpu.h>
 #include <arch/arc/v2/mpu/arc_core_mpu.h>
 #include <linker/linker-defs.h>
-#include <logging/sys_log.h>
 
+#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_DECLARE(mpu);
 
 #define AUX_MPU_RDB_VALID_MASK (0x1)
 #define AUX_MPU_EN_ENABLE   (0x40000000)
@@ -330,7 +332,7 @@ void arc_core_mpu_configure(u8_t type, u32_t base, u32_t size)
 	u32_t region_index =  _get_region_index_by_type(type);
 	u32_t region_attr = _get_region_attr_by_type(type);
 
-	SYS_LOG_DBG("Region info: 0x%x 0x%x", base, size);
+	LOG_DBG("Region info: 0x%x 0x%x", base, size);
 
 	if (region_attr == 0) {
 		return;
@@ -488,11 +490,11 @@ void arc_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
 	struct k_mem_partition *pparts;
 
 	if (mem_domain) {
-		SYS_LOG_DBG("configure domain: %p", mem_domain);
+		LOG_DBG("configure domain: %p", mem_domain);
 		num_partitions = mem_domain->num_partitions;
 		pparts = mem_domain->partitions;
 	} else {
-		SYS_LOG_DBG("disable domain partition regions");
+		LOG_DBG("disable domain partition regions");
 		num_partitions = 0;
 		pparts = NULL;
 	}
@@ -511,13 +513,13 @@ void arc_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
 	for (; region_index < num_regions; region_index++) {
 #endif
 		if (num_partitions && pparts->size) {
-			SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
+			LOG_DBG("set region 0x%x 0x%x 0x%x",
 				    region_index, pparts->start, pparts->size);
 			_region_init(region_index, pparts->start, pparts->size,
 					pparts->attr);
 			num_partitions--;
 		} else {
-			SYS_LOG_DBG("disable region 0x%x", region_index);
+			LOG_DBG("disable region 0x%x", region_index);
 			/* Disable region */
 			_region_init(region_index, 0, 0, 0);
 		}
@@ -537,15 +539,15 @@ void arc_core_mpu_configure_mem_partition(u32_t part_index,
 	u32_t region_index =
 		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
 
-	SYS_LOG_DBG("configure partition index: %u", part_index);
+	LOG_DBG("configure partition index: %u", part_index);
 
 	if (part) {
-		SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
+		LOG_DBG("set region 0x%x 0x%x 0x%x",
 			    region_index + part_index, part->start, part->size);
 		_region_init(region_index, part->start, part->size,
 				part->attr);
 	} else {
-		SYS_LOG_DBG("disable region 0x%x", region_index + part_index);
+		LOG_DBG("disable region 0x%x", region_index + part_index);
 		/* Disable region */
 		_region_init(region_index + part_index, 0, 0, 0);
 	}
@@ -561,7 +563,7 @@ void arc_core_mpu_mem_partition_remove(u32_t part_index)
 	u32_t region_index =
 		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
 
-	SYS_LOG_DBG("disable region 0x%x", region_index + part_index);
+	LOG_DBG("disable region 0x%x", region_index + part_index);
 	/* Disable region */
 	_region_init(region_index + part_index, 0, 0, 0);
 }
diff --git a/arch/arm/core/cortex_m/mpu/arm_core_mpu.c b/arch/arm/core/cortex_m/mpu/arm_core_mpu.c
index 2b3e971e33f2..ab1066271d11 100644
--- a/arch/arm/core/cortex_m/mpu/arm_core_mpu.c
+++ b/arch/arm/core/cortex_m/mpu/arm_core_mpu.c
@@ -10,7 +10,10 @@
 #include <soc.h>
 #include <arch/arm/cortex_m/cmsis.h>
 #include <arch/arm/cortex_m/mpu/arm_core_mpu.h>
-#include <logging/sys_log.h>
+
+#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(mpu);
 
 #if defined(CONFIG_MPU_STACK_GUARD)
 /*
@@ -50,7 +53,7 @@ void configure_mpu_stack_guard(struct k_thread *thread)
  */
 void configure_mpu_user_context(struct k_thread *thread)
 {
-	SYS_LOG_DBG("configure user thread %p's context", thread);
+	LOG_DBG("configure user thread %p's context", thread);
 	arm_core_mpu_disable();
 	arm_core_mpu_configure_user_context(thread);
 	arm_core_mpu_enable();
@@ -66,7 +69,7 @@ void configure_mpu_user_context(struct k_thread *thread)
  */
 void configure_mpu_mem_domain(struct k_thread *thread)
 {
-	SYS_LOG_DBG("configure thread %p's domain", thread);
+	LOG_DBG("configure thread %p's domain", thread);
 	arm_core_mpu_disable();
 	arm_core_mpu_configure_mem_domain(thread->mem_domain_info.mem_domain);
 	arm_core_mpu_enable();
diff --git a/arch/arm/core/cortex_m/mpu/arm_mpu.c b/arch/arm/core/cortex_m/mpu/arm_mpu.c
index 770a8f15bb3f..58ae89661267 100644
--- a/arch/arm/core/cortex_m/mpu/arm_mpu.c
+++ b/arch/arm/core/cortex_m/mpu/arm_mpu.c
@@ -11,9 +11,12 @@
 #include <arch/arm/cortex_m/cmsis.h>
 #include <arch/arm/cortex_m/mpu/arm_mpu.h>
 #include <arch/arm/cortex_m/mpu/arm_core_mpu.h>
-#include <logging/sys_log.h>
 #include <linker/linker-defs.h>
 
+#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_DECLARE(mpu);
+
 #if defined(CONFIG_CPU_CORTEX_M0PLUS) || \
 	defined(CONFIG_CPU_CORTEX_M3) || \
 	defined(CONFIG_CPU_CORTEX_M4) || \
@@ -149,7 +152,7 @@ static inline void _disable_region(u32_t r_index)
 		"Index 0x%x out-of-bound (supported regions: 0x%x)\n",
 		r_index,
 		_get_num_regions());
-	SYS_LOG_DBG("disable region 0x%x", r_index);
+	LOG_DBG("disable region 0x%x", r_index);
 	/* Disable region */
 	ARM_MPU_ClrRegion(r_index);
 }
@@ -165,7 +168,7 @@ void arm_core_mpu_configure(u8_t type, u32_t base, u32_t size)
 {
 	struct arm_mpu_region region_conf;
 
-	SYS_LOG_DBG("Region info: 0x%x 0x%x", base, size);
+	LOG_DBG("Region info: 0x%x 0x%x", base, size);
 	u32_t region_index = _get_region_index_by_type(type);
 
 	if (_get_region_attr_by_type(&region_conf.attr, type, base, size)) {
@@ -208,18 +211,18 @@ void arm_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
 	struct arm_mpu_region region_conf;
 
 	if (mem_domain) {
-		SYS_LOG_DBG("configure domain: %p", mem_domain);
+		LOG_DBG("configure domain: %p", mem_domain);
 		num_partitions = mem_domain->num_partitions;
 		pparts = mem_domain->partitions;
 	} else {
-		SYS_LOG_DBG("disable domain partition regions");
+		LOG_DBG("disable domain partition regions");
 		num_partitions = 0;
 		pparts = NULL;
 	}
 
 	for (; region_index < _get_num_regions(); region_index++) {
 		if (num_partitions && pparts->size) {
-			SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
+			LOG_DBG("set region 0x%x 0x%x 0x%x",
 				    region_index, pparts->start, pparts->size);
 			region_conf.base = pparts->start;
 			_get_ram_region_attr_by_conf(&region_conf.attr,
@@ -246,11 +249,11 @@ void arm_core_mpu_configure_mem_partition(u32_t part_index,
 		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
 	struct arm_mpu_region region_conf;
 
-	SYS_LOG_DBG("configure partition index: %u", part_index);
+	LOG_DBG("configure partition index: %u", part_index);
 
 	if (part &&
 		(region_index + part_index < _get_num_regions())) {
-		SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
+		LOG_DBG("set region 0x%x 0x%x 0x%x",
 			    region_index + part_index, part->start, part->size);
 		_get_ram_region_attr_by_conf(&region_conf.attr,
 			part->attr, part->start, part->size);
@@ -327,7 +330,7 @@ static int arm_mpu_init(struct device *arg)
 		return -1;
 	}
 
-	SYS_LOG_DBG("total region count: %d", _get_num_regions());
+	LOG_DBG("total region count: %d", _get_num_regions());
 
 	arm_core_mpu_disable();
 
diff --git a/arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h b/arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h
index de9a6083d79c..71ff8b5c4ecd 100644
--- a/arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h
+++ b/arch/arm/core/cortex_m/mpu/arm_mpu_v7_internal.h
@@ -8,6 +8,10 @@
 #ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_
 #define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_
 
+
+#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
+#include <logging/log.h>
+
 /* Global MPU configuration at system initialization. */
 static void _mpu_init(void)
 {
@@ -27,7 +31,7 @@ static void _region_init(u32_t index, struct arm_mpu_region *region_conf)
 	MPU->RBAR = (region_conf->base & MPU_RBAR_ADDR_Msk)
 				| MPU_RBAR_VALID_Msk | index;
 	MPU->RASR = region_conf->attr.rasr | MPU_RASR_ENABLE_Msk;
-	SYS_LOG_DBG("[%d] 0x%08x 0x%08x",
+	LOG_DBG("[%d] 0x%08x 0x%08x",
 		index, region_conf->base, region_conf->attr.rasr);
 }
 
diff --git a/arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h b/arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h
index d353ca12dbc3..f24c3e58bffc 100644
--- a/arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h
+++ b/arch/arm/core/cortex_m/mpu/arm_mpu_v8_internal.h
@@ -9,6 +9,8 @@
 #define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_
 
 #include <cmse.h>
+#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
+#include <logging/log.h>
 
 /* Global MPU configuration at system initialization. */
 static void _mpu_init(void)
@@ -49,7 +51,7 @@ static void _region_init(u32_t index, struct arm_mpu_region *region_conf)
 		| MPU_RLAR_EN_Msk
 	);
 
-	SYS_LOG_DBG("[%d] 0x%08x 0x%08x 0x%08x 0x%08x",
+	LOG_DBG("[%d] 0x%08x 0x%08x 0x%08x 0x%08x",
 			index, region_conf->base, region_conf->attr.rbar,
 			region_conf->attr.mair_idx, region_conf->attr.r_limit);
 }
diff --git a/arch/arm/core/cortex_m/mpu/nxp_mpu.c b/arch/arm/core/cortex_m/mpu/nxp_mpu.c
index 133efea064ce..625c254e992d 100644
--- a/arch/arm/core/cortex_m/mpu/nxp_mpu.c
+++ b/arch/arm/core/cortex_m/mpu/nxp_mpu.c
@@ -10,10 +10,13 @@
 #include <soc.h>
 #include <arch/arm/cortex_m/cmsis.h>
 #include <arch/arm/cortex_m/mpu/nxp_mpu.h>
-#include <logging/sys_log.h>
 #include <misc/__assert.h>
 #include <linker/linker-defs.h>
 
+#define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_DECLARE(mpu);
+
 /* NXP MPU Enabled state */
 static u8_t nxp_mpu_enabled;
 
@@ -92,11 +95,11 @@ static void _region_init(u32_t index, u32_t region_base,
 		SYSMPU->WORD[index][3] = SYSMPU_WORD_VLD_MASK;
 	}
 
-	SYS_LOG_DBG("[%d] 0x%08x 0x%08x 0x%08x 0x%08x", index,
-		    SYSMPU->WORD[index][0],
-		    SYSMPU->WORD[index][1],
-		    SYSMPU->WORD[index][2],
-		    SYSMPU->WORD[index][3]);
+	LOG_DBG("[%d] 0x%08x 0x%08x 0x%08x 0x%08x", index,
+		    (u32_t)SYSMPU->WORD[index][0],
+		    (u32_t)SYSMPU->WORD[index][1],
+		    (u32_t)SYSMPU->WORD[index][2],
+		    (u32_t)SYSMPU->WORD[index][3]);
 }
 
 /**
@@ -225,7 +228,7 @@ void arm_core_mpu_disable(void)
  */
 void arm_core_mpu_configure(u8_t type, u32_t base, u32_t size)
 {
-	SYS_LOG_DBG("Region info: 0x%x 0x%x", base, size);
+	LOG_DBG("Region info: 0x%x 0x%x", base, size);
 	u32_t region_index = _get_region_index_by_type(type);
 	u32_t region_attr = _get_region_attr_by_type(type);
 
@@ -265,11 +268,11 @@ void arm_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
 	struct k_mem_partition *pparts;
 
 	if (mem_domain) {
-		SYS_LOG_DBG("configure domain: %p", mem_domain);
+		LOG_DBG("configure domain: %p", mem_domain);
 		num_partitions = mem_domain->num_partitions;
 		pparts = mem_domain->partitions;
 	} else {
-		SYS_LOG_DBG("disable domain partition regions");
+		LOG_DBG("disable domain partition regions");
 		num_partitions = 0;
 		pparts = NULL;
 	}
@@ -280,7 +283,7 @@ void arm_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
 	 */
 	for (; region_index < _get_num_usable_regions(); region_index++) {
 		if (num_partitions && pparts->size) {
-			SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
+			LOG_DBG("set region 0x%x 0x%x 0x%x",
 				    region_index, pparts->start, pparts->size);
 			region_attr = pparts->attr;
 			_region_init(region_index, pparts->start,
@@ -288,7 +291,7 @@ void arm_core_mpu_configure_mem_domain(struct k_mem_domain *mem_domain)
 				     region_attr);
 			num_partitions--;
 		} else {
-			SYS_LOG_DBG("disable region 0x%x", region_index);
+			LOG_DBG("disable region 0x%x", region_index);
 			/* Disable region */
 			SYSMPU->WORD[region_index][0] = 0;
 			SYSMPU->WORD[region_index][1] = 0;
@@ -312,17 +315,17 @@ void arm_core_mpu_configure_mem_partition(u32_t part_index,
 		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
 	u32_t region_attr;
 
-	SYS_LOG_DBG("configure partition index: %u", part_index);
+	LOG_DBG("configure partition index: %u", part_index);
 
 	if (part) {
-		SYS_LOG_DBG("set region 0x%x 0x%x 0x%x",
+		LOG_DBG("set region 0x%x 0x%x 0x%x",
 			    region_index + part_index, part->start, part->size);
 		region_attr = part->attr;
 		_region_init(region_index + part_index, part->start,
 			     ENDADDR_ROUND(part->start + part->size),
 			     region_attr);
 	} else {
-		SYS_LOG_DBG("disable region 0x%x", region_index);
+		LOG_DBG("disable region 0x%x", region_index);
 		/* Disable region */
 		SYSMPU->WORD[region_index + part_index][0] = 0;
 		SYSMPU->WORD[region_index + part_index][1] = 0;
@@ -341,7 +344,7 @@ void arm_core_mpu_mem_partition_remove(u32_t part_index)
 	u32_t region_index =
 		_get_region_index_by_type(THREAD_DOMAIN_PARTITION_REGION);
 
-	SYS_LOG_DBG("disable region 0x%x", region_index);
+	LOG_DBG("disable region 0x%x", region_index);
 	/* Disable region */
 	SYSMPU->WORD[region_index + part_index][0] = 0;
 	SYSMPU->WORD[region_index + part_index][1] = 0;
@@ -424,7 +427,7 @@ static void _nxp_mpu_config(void)
 
 	__ASSERT(mpu_config.num_regions <= _get_num_regions(),
 		 "too many static MPU regions defined");
-	SYS_LOG_DBG("total region count: %d", _get_num_regions());
+	LOG_DBG("total region count: %d", _get_num_regions());
 
 	/* Disable MPU */
 	SYSMPU->CESR &= ~SYSMPU_CESR_VLD_MASK;
@@ -491,7 +494,7 @@ static int nxp_mpu_init(struct device *arg)
 	return 0;
 }
 
-#if defined(CONFIG_SYS_LOG)
+#if defined(CONFIG_LOG)
 /* To have logging the driver needs to be initialized later */
 SYS_INIT(nxp_mpu_init, POST_KERNEL,
 	 CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
diff --git a/drivers/adc/Kconfig b/drivers/adc/Kconfig
index 241bc05b0d9c..98de617a19ac 100644
--- a/drivers/adc/Kconfig
+++ b/drivers/adc/Kconfig
@@ -31,26 +31,9 @@ config ADC_ASYNC
 	help
 	  This option enables the asynchronous API calls.
 
-config SYS_LOG_ADC_LEVEL
-	int "ADC drivers log level"
-	depends on SYS_LOG
-	default 0
-	range 0 4
-	help
-
-	  Sets log level for ADC driver.
-
-	  Levels are:
-
-	  - 0 OFF, do not write
-
-	  - 1 ERROR, only write SYS_LOG_ERR
-
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = ADC
+module-str = ADC
+source "subsys/logging/Kconfig.template.log_config"
 
 config ADC_INIT_PRIORITY
 	int "Init priority"
diff --git a/drivers/adc/adc_dw.c b/drivers/adc/adc_dw.c
index f2e321242846..99b2ce3f9fea 100644
--- a/drivers/adc/adc_dw.c
+++ b/drivers/adc/adc_dw.c
@@ -19,7 +19,10 @@
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
 #include "adc_dw.h"
-#include <logging/sys_log.h>
+
+#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(adc_dw);
 
 #define ADC_CLOCK_GATE      (1 << 31)
 #define ADC_DEEP_POWER_DOWN  0x01
@@ -231,27 +234,27 @@ static int adc_dw_channel_setup(struct device *dev,
 	struct adc_info *info = dev->driver_data;
 
 	if (channel_id >= DW_CHANNEL_COUNT) {
-		SYS_LOG_ERR("Invalid channel id");
+		LOG_ERR("Invalid channel id");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->gain != ADC_GAIN_1) {
-		SYS_LOG_ERR("Invalid channel gain");
+		LOG_ERR("Invalid channel gain");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->reference != ADC_REF_INTERNAL) {
-		SYS_LOG_ERR("Invalid channel reference");
+		LOG_ERR("Invalid channel reference");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->acquisition_time != ADC_ACQ_TIME_DEFAULT) {
-		SYS_LOG_ERR("Invalid channel acquisition time");
+		LOG_ERR("Invalid channel acquisition time");
 		return -EINVAL;
 	}
 
 	if (info->state != ADC_STATE_IDLE) {
-		SYS_LOG_ERR("ADC is busy or in error state");
+		LOG_ERR("ADC is busy or in error state");
 		return -EAGAIN;
 	}
 
diff --git a/drivers/adc/adc_intel_quark_d2000.c b/drivers/adc/adc_intel_quark_d2000.c
index 88b2b31eb889..35e8b07414f7 100644
--- a/drivers/adc/adc_intel_quark_d2000.c
+++ b/drivers/adc/adc_intel_quark_d2000.c
@@ -14,9 +14,9 @@
 #include <adc.h>
 #include <arch/cpu.h>
 
-#define SYS_LOG_DOMAIN "dev/adc_quark_d2000"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_ADC_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(adc_intel_quark_d2000);
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
@@ -201,27 +201,27 @@ static int adc_quark_d2000_channel_setup(struct device *dev,
 	u8_t channel_id = channel_cfg->channel_id;
 
 	if (channel_id > MAX_CHANNELS) {
-		SYS_LOG_ERR("Channel %d is not valid", channel_id);
+		LOG_ERR("Channel %d is not valid", channel_id);
 		return -EINVAL;
 	}
 
 	if (channel_cfg->acquisition_time != ADC_ACQ_TIME_DEFAULT) {
-		SYS_LOG_ERR("Invalid channel acquisition time");
+		LOG_ERR("Invalid channel acquisition time");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->differential) {
-		SYS_LOG_ERR("Differential channels are not supported");
+		LOG_ERR("Differential channels are not supported");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->gain != ADC_GAIN_1) {
-		SYS_LOG_ERR("Invalid channel gain");
+		LOG_ERR("Invalid channel gain");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->reference != ADC_REF_INTERNAL) {
-		SYS_LOG_ERR("Invalid channel reference");
+		LOG_ERR("Invalid channel reference");
 		return -EINVAL;
 	}
 
diff --git a/drivers/adc/adc_mcux_adc16.c b/drivers/adc/adc_mcux_adc16.c
index 0d62499ef87b..77ec65ad660c 100644
--- a/drivers/adc/adc_mcux_adc16.c
+++ b/drivers/adc/adc_mcux_adc16.c
@@ -8,8 +8,9 @@
 #include <adc.h>
 #include <fsl_adc16.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_ADC_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(adc_mcux_adc16);
 
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
@@ -34,27 +35,27 @@ static int mcux_adc16_channel_setup(struct device *dev,
 	u8_t channel_id = channel_cfg->channel_id;
 
 	if (channel_id > (ADC_SC1_ADCH_MASK >> ADC_SC1_ADCH_SHIFT)) {
-		SYS_LOG_ERR("Channel %d is not valid", channel_id);
+		LOG_ERR("Channel %d is not valid", channel_id);
 		return -EINVAL;
 	}
 
 	if (channel_cfg->acquisition_time != ADC_ACQ_TIME_DEFAULT) {
-		SYS_LOG_ERR("Invalid channel acquisition time");
+		LOG_ERR("Invalid channel acquisition time");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->differential) {
-		SYS_LOG_ERR("Differential channels are not supported");
+		LOG_ERR("Differential channels are not supported");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->gain != ADC_GAIN_1) {
-		SYS_LOG_ERR("Invalid channel gain");
+		LOG_ERR("Invalid channel gain");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->reference != ADC_REF_INTERNAL) {
-		SYS_LOG_ERR("Invalid channel reference");
+		LOG_ERR("Invalid channel reference");
 		return -EINVAL;
 	}
 
@@ -69,7 +70,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 	int error;
 
 	if (sequence->resolution != 12) {
-		SYS_LOG_ERR("Invalid resolution");
+		LOG_ERR("Invalid resolution");
 		return -EINVAL;
 	}
 
@@ -90,7 +91,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 		mode = kADC16_HardwareAverageCount32;
 		break;
 	default:
-		SYS_LOG_ERR("Invalid oversampling");
+		LOG_ERR("Invalid oversampling");
 		return -EINVAL;
 	}
 	ADC16_SetHardwareAverage(config->base, mode);
@@ -136,7 +137,7 @@ static void mcux_adc16_start_channel(struct device *dev)
 
 	data->channel_id = find_lsb_set(data->channels) - 1;
 
-	SYS_LOG_DBG("Starting channel %d", data->channel_id);
+	LOG_DBG("Starting channel %d", data->channel_id);
 
 #if defined(FSL_FEATURE_ADC16_HAS_DIFF_MODE) && FSL_FEATURE_ADC16_HAS_DIFF_MODE
 	channel_config.enableDifferentialConversion = false;
@@ -177,7 +178,7 @@ static void mcux_adc16_isr(void *arg)
 	u16_t result;
 
 	result = ADC16_GetChannelConversionValue(base, channel_group);
-	SYS_LOG_DBG("Finished channel %d. Result is 0x%04x",
+	LOG_DBG("Finished channel %d. Result is 0x%04x",
 		    data->channel_id, result);
 
 	*data->buffer++ = result;
diff --git a/drivers/adc/adc_nrfx_adc.c b/drivers/adc/adc_nrfx_adc.c
index 5fe4a19e5910..4224f42e1662 100644
--- a/drivers/adc/adc_nrfx_adc.c
+++ b/drivers/adc/adc_nrfx_adc.c
@@ -8,9 +8,9 @@
 #include "adc_context.h"
 #include <nrfx_adc.h>
 
-#define SYS_LOG_DOMAIN "adc_nrfx_adc"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_ADC_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(adc_mcux_adc16);
 
 struct driver_data {
 	struct adc_context ctx;
@@ -40,12 +40,12 @@ static int adc_nrfx_channel_setup(struct device *dev,
 	}
 
 	if (channel_cfg->acquisition_time != ADC_ACQ_TIME_DEFAULT) {
-		SYS_LOG_ERR("Selected ADC acquisition time is not valid");
+		LOG_ERR("Selected ADC acquisition time is not valid");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->differential) {
-		SYS_LOG_ERR("Differential channels are not supported");
+		LOG_ERR("Differential channels are not supported");
 		return -EINVAL;
 	}
 
@@ -60,7 +60,7 @@ static int adc_nrfx_channel_setup(struct device *dev,
 		config->scaling = NRF_ADC_CONFIG_SCALING_INPUT_FULL_SCALE;
 		break;
 	default:
-		SYS_LOG_ERR("Selected ADC gain is not valid");
+		LOG_ERR("Selected ADC gain is not valid");
 		return -EINVAL;
 	}
 
@@ -86,7 +86,7 @@ static int adc_nrfx_channel_setup(struct device *dev,
 		config->extref    = NRF_ADC_CONFIG_EXTREFSEL_AREF1;
 		break;
 	default:
-		SYS_LOG_ERR("Selected ADC reference is not valid");
+		LOG_ERR("Selected ADC reference is not valid");
 		return -EINVAL;
 	}
 
@@ -126,7 +126,7 @@ static int check_buffer_size(const struct adc_sequence *sequence,
 	}
 
 	if (sequence->buffer_size < needed_buffer_size) {
-		SYS_LOG_ERR("Provided buffer is too small (%u/%u)",
+		LOG_ERR("Provided buffer is too small (%u/%u)",
 				sequence->buffer_size, needed_buffer_size);
 		return -ENOMEM;
 	}
@@ -148,12 +148,12 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 	if (!selected_channels ||
 	    (selected_channels &
 			~BIT_MASK(CONFIG_ADC_NRFX_ADC_CHANNEL_COUNT))) {
-		SYS_LOG_ERR("Invalid selection of channels");
+		LOG_ERR("Invalid selection of channels");
 		return -EINVAL;
 	}
 
 	if (sequence->oversampling != 0) {
-		SYS_LOG_ERR("Oversampling is not supported");
+		LOG_ERR("Oversampling is not supported");
 		return -EINVAL;
 	}
 
@@ -168,7 +168,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 		nrf_resolution = NRF_ADC_CONFIG_RES_10BIT;
 		break;
 	default:
-		SYS_LOG_ERR("ADC resolution value %d is not valid",
+		LOG_ERR("ADC resolution value %d is not valid",
 			    sequence->resolution);
 		return -EINVAL;
 	}
@@ -248,7 +248,7 @@ static int init_adc(struct device *dev)
 	nrfx_err_t result = nrfx_adc_init(&config, event_handler);
 
 	if (result != NRFX_SUCCESS) {
-		SYS_LOG_ERR("Failed to initialize device: %s",
+		LOG_ERR("Failed to initialize device: %s",
 			    dev->config->name);
 		return -EBUSY;
 	}
diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
index d751e96f7ffe..4f8db7b6b3b2 100644
--- a/drivers/adc/adc_nrfx_saadc.c
+++ b/drivers/adc/adc_nrfx_saadc.c
@@ -8,9 +8,9 @@
 #include "adc_context.h"
 #include <hal/nrf_saadc.h>
 
-#define SYS_LOG_DOMAIN "adc_nrfx_saadc"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_ADC_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(adc_nrfx_saadc);
 
 struct driver_data {
 	struct adc_context ctx;
@@ -66,7 +66,7 @@ static int adc_nrfx_channel_setup(struct device *dev,
 		config.gain = NRF_SAADC_GAIN4;
 		break;
 	default:
-		SYS_LOG_ERR("Selected ADC gain is not valid");
+		LOG_ERR("Selected ADC gain is not valid");
 		return -EINVAL;
 	}
 
@@ -78,7 +78,7 @@ static int adc_nrfx_channel_setup(struct device *dev,
 		config.reference = NRF_SAADC_REFERENCE_VDD4;
 		break;
 	default:
-		SYS_LOG_ERR("Selected ADC reference is not valid");
+		LOG_ERR("Selected ADC reference is not valid");
 		return -EINVAL;
 	}
 
@@ -103,7 +103,7 @@ static int adc_nrfx_channel_setup(struct device *dev,
 		config.acq_time = NRF_SAADC_ACQTIME_40US;
 		break;
 	default:
-		SYS_LOG_ERR("Selected ADC acquisition time is not valid");
+		LOG_ERR("Selected ADC acquisition time is not valid");
 		return -EINVAL;
 	}
 
@@ -168,7 +168,7 @@ static int set_resolution(const struct adc_sequence *sequence)
 		nrf_resolution = NRF_SAADC_RESOLUTION_14BIT;
 		break;
 	default:
-		SYS_LOG_ERR("ADC resolution value %d is not valid",
+		LOG_ERR("ADC resolution value %d is not valid",
 			    sequence->resolution);
 		return -EINVAL;
 	}
@@ -183,7 +183,7 @@ static int set_oversampling(const struct adc_sequence *sequence,
 	nrf_saadc_oversample_t nrf_oversampling;
 
 	if ((active_channels > 1) && (sequence->oversampling > 0)) {
-		SYS_LOG_ERR(
+		LOG_ERR(
 			"Oversampling is supported for single channel only");
 		return -EINVAL;
 	}
@@ -217,7 +217,7 @@ static int set_oversampling(const struct adc_sequence *sequence,
 		nrf_oversampling = NRF_SAADC_OVERSAMPLE_256X;
 		break;
 	default:
-		SYS_LOG_ERR("Oversampling value %d is not valid",
+		LOG_ERR("Oversampling value %d is not valid",
 			    sequence->oversampling);
 		return -EINVAL;
 	}
@@ -237,7 +237,7 @@ static int check_buffer_size(const struct adc_sequence *sequence,
 	}
 
 	if (sequence->buffer_size < needed_buffer_size) {
-		SYS_LOG_ERR("Provided buffer is too small (%u/%u)",
+		LOG_ERR("Provided buffer is too small (%u/%u)",
 			    sequence->buffer_size, needed_buffer_size);
 		return -ENOMEM;
 	}
@@ -257,7 +257,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 	 */
 	if (!selected_channels ||
 	    (selected_channels & ~BIT_MASK(NRF_SAADC_CHANNEL_COUNT))) {
-		SYS_LOG_ERR("Invalid selection of channels");
+		LOG_ERR("Invalid selection of channels");
 		return -EINVAL;
 	}
 
@@ -273,7 +273,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 			 * configured yet.
 			 */
 			if (m_data.positive_inputs[channel_id] == 0) {
-				SYS_LOG_ERR("Channel %u not configured",
+				LOG_ERR("Channel %u not configured",
 					    channel_id);
 				return -EINVAL;
 			}
diff --git a/drivers/adc/adc_sam_afec.c b/drivers/adc/adc_sam_afec.c
index d964b26eb5f1..89e812667005 100644
--- a/drivers/adc/adc_sam_afec.c
+++ b/drivers/adc/adc_sam_afec.c
@@ -23,9 +23,9 @@
 #define ADC_CONTEXT_USES_KERNEL_TIMER
 #include "adc_context.h"
 
-#define SYS_LOG_DOMAIN "dev/adc_sam_afec"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_ADC_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(adc_sam_afec);
 
 #define NUM_CHANNELS 12
 
@@ -88,22 +88,22 @@ static int adc_sam_channel_setup(struct device *dev,
 		afec->AFEC_CGR |= (2 << (channel_id * 2));
 		break;
 	default:
-		SYS_LOG_ERR("Selected ADC gain is not valid");
+		LOG_ERR("Selected ADC gain is not valid");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->acquisition_time != ADC_ACQ_TIME_DEFAULT) {
-		SYS_LOG_ERR("Selected ADC acquisition time is not valid");
+		LOG_ERR("Selected ADC acquisition time is not valid");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->reference != ADC_REF_EXTERNAL0) {
-		SYS_LOG_ERR("Selected reference is not valid");
+		LOG_ERR("Selected reference is not valid");
 		return -EINVAL;
 	}
 
 	if (channel_cfg->differential) {
-		SYS_LOG_ERR("Differential input is not supported");
+		LOG_ERR("Differential input is not supported");
 		return -EINVAL;
 	}
 
@@ -124,7 +124,7 @@ static void adc_sam_start_conversion(struct device *dev)
 
 	data->channel_id = find_lsb_set(data->channels) - 1;
 
-	SYS_LOG_DBG("Starting channel %d", data->channel_id);
+	LOG_DBG("Starting channel %d", data->channel_id);
 
 	/* Disable all channels. */
 	afec->AFEC_CHDR = 0xfff;
@@ -174,7 +174,7 @@ static int check_buffer_size(const struct adc_sequence *sequence,
 		needed_buffer_size *= (1 + sequence->options->extra_samplings);
 	}
 	if (sequence->buffer_size < needed_buffer_size) {
-		SYS_LOG_ERR("Provided buffer is too small (%u/%u)",
+		LOG_ERR("Provided buffer is too small (%u/%u)",
 				sequence->buffer_size, needed_buffer_size);
 		return -ENOMEM;
 	}
@@ -194,12 +194,12 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 	 */
 	if (channels == 0 ||
 	   (channels & (~0UL << NUM_CHANNELS))) {
-		SYS_LOG_ERR("Invalid selection of channels");
+		LOG_ERR("Invalid selection of channels");
 		return -EINVAL;
 	}
 
 	if (sequence->oversampling != 0) {
-		SYS_LOG_ERR("Oversampling is not supported");
+		LOG_ERR("Oversampling is not supported");
 		return -EINVAL;
 	}
 
@@ -207,7 +207,7 @@ static int start_read(struct device *dev, const struct adc_sequence *sequence)
 		/* TODO JKW: Support the Enhanced Resolution Mode 50.6.3 page
 		 * 1544.
 		 */
-		SYS_LOG_ERR("ADC resolution value %d is not valid",
+		LOG_ERR("ADC resolution value %d is not valid",
 			    sequence->resolution);
 		return -EINVAL;
 	}
diff --git a/drivers/adc/adc_ti_adc108s102.c b/drivers/adc/adc_ti_adc108s102.c
index 4d483a1c0d3d..a0d857ff2002 100644
--- a/drivers/adc/adc_ti_adc108s102.c
+++ b/drivers/adc/adc_ti_adc108s102.c
@@ -10,12 +10,13 @@
 
 #include <kernel.h>
 #include <misc/util.h>
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_ADC_LEVEL
-#include <logging/sys_log.h>
 #include <string.h>
 #include <init.h>
 
 #include "adc_ti_adc108s102.h"
+#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(adc_ti_adc108s102);
 
 static inline int _ti_adc108s102_sampling(struct device *dev)
 {
@@ -37,7 +38,7 @@ static inline int _ti_adc108s102_sampling(struct device *dev)
 		.count = 1
 	};
 
-	SYS_LOG_DBG("Sampling!");
+	LOG_DBG("Sampling!");
 
 	return spi_transceive(adc->spi, &adc->spi_cfg, &tx, &rx);
 }
@@ -50,7 +51,7 @@ static inline void _ti_adc108s102_handle_result(struct device *dev)
 	struct adc_seq_entry *entry;
 	u32_t s_i, i;
 
-	SYS_LOG_DBG("_ti_adc108s102_handle_result()");
+	LOG_DBG("_ti_adc108s102_handle_result()");
 
 	for (i = 0, s_i = 1; i < seq_table->num_entries; i++, s_i++) {
 		entry = &seq_table->entries[i];
@@ -87,7 +88,7 @@ static inline s32_t _ti_adc108s102_prepare(struct device *dev)
 			continue;
 		}
 
-		SYS_LOG_DBG("Requesting channel %d", entry->channel_id);
+		LOG_DBG("Requesting channel %d", entry->channel_id);
 		adc->cmd_buffer[adc->cmd_buf_len] =
 				ADC108S102_CHANNEL_CMD(entry->channel_id);
 
@@ -105,7 +106,7 @@ static inline s32_t _ti_adc108s102_prepare(struct device *dev)
 	adc->cmd_buffer[adc->cmd_buf_len] = 0;
 	adc->cmd_buf_len++;
 
-	SYS_LOG_DBG("ADC108S102 is prepared...");
+	LOG_DBG("ADC108S102 is prepared...");
 
 	return sampling_delay;
 }
@@ -221,7 +222,7 @@ static int ti_adc108s102_init(struct device *dev)
 	adc->spi_cfg.slave = CONFIG_ADC_TI_ADC108S102_SPI_SLAVE;
 
 
-	SYS_LOG_DBG("ADC108s102 initialized");
+	LOG_DBG("ADC108s102 initialized");
 
 	dev->driver_api = &ti_adc108s102_api;
 
diff --git a/drivers/audio/Kconfig b/drivers/audio/Kconfig
index 46c7f33b6d4b..5de26185e420 100644
--- a/drivers/audio/Kconfig
+++ b/drivers/audio/Kconfig
@@ -28,18 +28,9 @@ config AUDIO_CODEC_INIT_PRIORITY
 	help
 	  Audio codec device driver initialization priority.
 
-config SYS_LOG_AUDIO_CODEC_LEVEL
-	int "Audio codec driver log level"
-	depends on SYS_LOG
-	default 0
-	help
-	  Sets log level for Audio codec drivers.
-	  Levels are:
-	  - 0 OFF, do not write
-	  - 1 ERROR, only write SYS_LOG_ERR
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = AUDIO_CODEC
+module-str = audio codec
+source "subsys/logging/Kconfig.template.log_config"
 
 source "drivers/audio/Kconfig.tlv320dac"
 
diff --git a/drivers/audio/tlv320dac310x.c b/drivers/audio/tlv320dac310x.c
index eca4b23952b8..be62b93ffc19 100644
--- a/drivers/audio/tlv320dac310x.c
+++ b/drivers/audio/tlv320dac310x.c
@@ -6,10 +6,6 @@
 
 #include <errno.h>
 
-#define SYS_LOG_DOMAIN "dev/codec"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_AUDIO_CODEC_LEVEL
-#include <logging/sys_log.h>
-
 #include <misc/util.h>
 
 #include <device.h>
@@ -18,6 +14,10 @@
 #include <audio/codec.h>
 #include "tlv320dac310x.h"
 
+#define LOG_LEVEL CONFIG_AUDIO_CODEC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(tlv320dac310x);
+
 #define CODEC_OUTPUT_VOLUME_MAX		0
 #define CODEC_OUTPUT_VOLUME_MIN		(-78 * 2)
 
@@ -55,7 +55,7 @@ static enum osr_multiple codec_get_osr_multiple(audio_dai_cfg_t *cfg);
 static void codec_configure_output(struct device *dev);
 static int codec_set_output_volume(struct device *dev, int vol);
 
-#if (SYS_LOG_LEVEL >= SYS_LOG_LEVEL_DEBUG)
+#if (LOG_LEVEL >= LOG_LEVEL_DEBUG)
 static void codec_read_all_regs(struct device *dev);
 #define CODEC_DUMP_REGS(dev)	codec_read_all_regs((dev))
 #else
@@ -70,7 +70,7 @@ static int codec_initialize(struct device *dev)
 	dev_cfg->i2c_device = device_get_binding(dev_cfg->i2c_dev_name);
 
 	if (dev_cfg->i2c_device == NULL) {
-		SYS_LOG_ERR("I2C device binding error");
+		LOG_ERR("I2C device binding error");
 		return -ENXIO;
 	}
 	return 0;
@@ -82,7 +82,7 @@ static int codec_configure(struct device *dev,
 	int ret;
 
 	if (cfg->dai_type != AUDIO_DAI_TYPE_I2S) {
-		SYS_LOG_ERR("dai_type must be AUDIO_DAI_TYPE_I2S");
+		LOG_ERR("dai_type must be AUDIO_DAI_TYPE_I2S");
 		return -EINVAL;
 	}
 
@@ -138,7 +138,7 @@ static int codec_set_property(struct device *dev,
 {
 	/* individual channel control not currently supported */
 	if (channel != AUDIO_CHANNEL_ALL) {
-		SYS_LOG_ERR("channel %u invalid. must be AUDIO_CHANNEL_ALL");
+		LOG_ERR("channel %u invalid. must be AUDIO_CHANNEL_ALL");
 		return -EINVAL;
 	}
 
@@ -181,7 +181,7 @@ static void codec_write_reg(struct device *dev, struct reg_addr reg, u8_t val)
 
 	i2c_reg_write_byte(dev_cfg->i2c_device,
 			DAC_I2C_DEV_ADDR, reg.reg_addr, val);
-	SYS_LOG_DBG("WR PG:%u REG:%02u VAL:0x%02x",
+	LOG_DBG("WR PG:%u REG:%02u VAL:0x%02x",
 			reg.page, reg.reg_addr, val);
 }
 
@@ -199,7 +199,7 @@ static void codec_read_reg(struct device *dev, struct reg_addr reg, u8_t *val)
 
 	i2c_reg_read_byte(dev_cfg->i2c_device,
 			DAC_I2C_DEV_ADDR, reg.reg_addr, val);
-	SYS_LOG_DBG("RD PG:%u REG:%02u VAL:0x%02x",
+	LOG_DBG("RD PG:%u REG:%02u VAL:0x%02x",
 			reg.page, reg.reg_addr, *val);
 }
 
@@ -237,7 +237,7 @@ static int codec_configure_dai(struct device *dev, audio_dai_cfg_t *cfg)
 		val |= IF_CTRL_WLEN(IF_CTRL_WLEN_32);
 		break;
 	default:
-		SYS_LOG_ERR("Unsupported PCM sample bit width %u",
+		LOG_ERR("Unsupported PCM sample bit width %u",
 				cfg->i2s.word_size);
 		return -EINVAL;
 	}
@@ -256,7 +256,7 @@ static int codec_configure_clocks(struct device *dev,
 	int mdac, ndac, bclk_div, mclk_div;
 
 	i2s = &cfg->dai_cfg.i2s;
-	SYS_LOG_DBG("MCLK %u Hz PCM Rate: %u Hz", cfg->mclk_freq,
+	LOG_DBG("MCLK %u Hz PCM Rate: %u Hz", cfg->mclk_freq,
 			i2s->frame_clk_freq);
 
 	if (cfg->mclk_freq <= DAC_PROC_CLK_FREQ_MAX) {
@@ -301,23 +301,23 @@ static int codec_configure_clocks(struct device *dev,
 
 	/* check if suitable value was found */
 	if (osr < osr_min) {
-		SYS_LOG_ERR("Unable to find suitable mdac and osr values");
+		LOG_ERR("Unable to find suitable mdac and osr values");
 		return -EINVAL;
 	}
 
-	SYS_LOG_DBG("Processing freq: %u Hz Modulator freq: %u Hz",
+	LOG_DBG("Processing freq: %u Hz Modulator freq: %u Hz",
 			dac_clk, mod_clk);
-	SYS_LOG_DBG("NDAC: %u MDAC: %u OSR: %u", ndac, mdac, osr);
+	LOG_DBG("NDAC: %u MDAC: %u OSR: %u", ndac, mdac, osr);
 
 	if (i2s->options & I2S_OPT_BIT_CLK_MASTER) {
 		bclk_div = osr * mdac / (i2s->word_size * 2); /* stereo */
 		if ((bclk_div * i2s->word_size * 2) != (osr * mdac)) {
-			SYS_LOG_ERR("Unable to generate BCLK %u from MCLK %u",
+			LOG_ERR("Unable to generate BCLK %u from MCLK %u",
 				i2s->frame_clk_freq * i2s->word_size * 2,
 				cfg->mclk_freq);
 			return -EINVAL;
 		}
-		SYS_LOG_DBG("I2S Master BCLKDIV: %u", bclk_div);
+		LOG_DBG("I2S Master BCLKDIV: %u", bclk_div);
 		codec_write_reg(dev, BCLK_DIV_ADDR,
 				BCLK_DIV_POWER_UP | BCLK_DIV(bclk_div));
 	}
@@ -340,7 +340,7 @@ static int codec_configure_clocks(struct device *dev,
 	/* setup timer clock to be MCLK divided */
 	codec_write_reg(dev, TIMER_MCLK_DIV_ADDR,
 			TIMER_MCLK_DIV_EN_EXT | TIMER_MCLK_DIV_VAL(mclk_div));
-	SYS_LOG_DBG("Timer MCLK Divider: %u", mclk_div);
+	LOG_DBG("Timer MCLK Divider: %u", mclk_div);
 
 	return 0;
 }
@@ -352,15 +352,15 @@ static int codec_configure_filters(struct device *dev, audio_dai_cfg_t *cfg)
 	/* determine decimation filter type */
 	if (cfg->i2s.frame_clk_freq >= AUDIO_PCM_RATE_192K) {
 		proc_blk = PRB_P18_DECIMATION_C;
-		SYS_LOG_INF("PCM Rate: %u Filter C PRB P18 selected",
+		LOG_INF("PCM Rate: %u Filter C PRB P18 selected",
 				cfg->i2s.frame_clk_freq);
 	} else if (cfg->i2s.frame_clk_freq >= AUDIO_PCM_RATE_96K) {
 		proc_blk = PRB_P10_DECIMATION_B;
-		SYS_LOG_INF("PCM Rate: %u Filter B PRB P10 selected",
+		LOG_INF("PCM Rate: %u Filter B PRB P10 selected",
 				cfg->i2s.frame_clk_freq);
 	} else {
 		proc_blk = PRB_P25_DECIMATION_A;
-		SYS_LOG_INF("PCM Rate: %u Filter A PRB P25 selected",
+		LOG_INF("PCM Rate: %u Filter A PRB P25 selected",
 				cfg->i2s.frame_clk_freq);
 	}
 
@@ -380,7 +380,7 @@ static enum osr_multiple codec_get_osr_multiple(audio_dai_cfg_t *cfg)
 		osr = OSR_MULTIPLE_8;
 	}
 
-	SYS_LOG_INF("PCM Rate: %u OSR Multiple: %u", cfg->i2s.frame_clk_freq,
+	LOG_INF("PCM Rate: %u OSR Multiple: %u", cfg->i2s.frame_clk_freq,
 			osr);
 	return osr;
 }
@@ -435,7 +435,7 @@ static int codec_set_output_volume(struct device *dev, int vol)
 
 	if ((vol > CODEC_OUTPUT_VOLUME_MAX) ||
 			(vol < CODEC_OUTPUT_VOLUME_MIN)) {
-		SYS_LOG_ERR("Invalid volume %d.%d dB",
+		LOG_ERR("Invalid volume %d.%d dB",
 				vol >> 1, ((u32_t)vol & 1) ? 5 : 0);
 		return -EINVAL;
 	}
@@ -464,7 +464,7 @@ static int codec_set_output_volume(struct device *dev, int vol)
 	return 0;
 }
 
-#if (SYS_LOG_LEVEL >= SYS_LOG_LEVEL_DEBUG)
+#if (LOG_LEVEL >= LOG_LEVEL_DEBUG)
 static void codec_read_all_regs(struct device *dev)
 {
 	u8_t val;
diff --git a/drivers/can/Kconfig b/drivers/can/Kconfig
index 0cb23f6d37a4..8bb2a99eb440 100644
--- a/drivers/can/Kconfig
+++ b/drivers/can/Kconfig
@@ -16,19 +16,9 @@ menuconfig CAN
 
 if CAN
 
-config SYS_LOG_CAN_LEVEL
-	int "CAN driver log level"
-	depends on SYS_LOG
-	default 0
-	range 0 4
-	help
-	  Sets log level for CAN Device Drivers.
-	  Levels are:
-	  0 OFF, do not write
-	  1 ERROR, only write SYS_LOG_ERR
-	  2 WARNING, write SYS_LOG_WRN in addition to previous level
-	  3 INFO, write SYS_LOG_INF in addition to previous levels
-	  4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = CAN
+module-str = CAN
+source "subsys/logging/Kconfig.template.log_config"
 
 config CAN_INIT_PRIORITY
 	int "CAN driver init priority"
diff --git a/drivers/can/stm32_can.c b/drivers/can/stm32_can.c
index 321b736da6e5..7bf15c908462 100644
--- a/drivers/can/stm32_can.c
+++ b/drivers/can/stm32_can.c
@@ -14,8 +14,9 @@
 #include <stdbool.h>
 #include "stm32_can.h"
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_CAN_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_CAN_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(stm32_can);
 
 static void can_stm32_signal_tx_complete(struct can_mailbox *mb)
 {
@@ -59,7 +60,7 @@ void can_stm32_rx_isr_handler(CAN_TypeDef *can, struct can_stm32_data *data)
 			break;
 		}
 
-		SYS_LOG_DBG("Message on filter index %d", filter_match_index);
+		LOG_DBG("Message on filter index %d", filter_match_index);
 		can_stm32_get_msg_fifo(mbox, &msg);
 
 		if (data->rx_response[filter_match_index]) {
@@ -213,13 +214,13 @@ int can_stm32_runtime_configure(struct device *dev, enum can_mode mode,
 
 	prescaler = clock_rate / (BIT_SEG_LENGTH(cfg) * bitrate);
 	if (prescaler == 0 || prescaler > 1024) {
-		SYS_LOG_ERR("HAL_CAN_Init failed: prescaler > max (%d > 1024)",
+		LOG_ERR("HAL_CAN_Init failed: prescaler > max (%d > 1024)",
 					prescaler);
 		return -EINVAL;
 	}
 
 	if (clock_rate % (BIT_SEG_LENGTH(cfg) * bitrate)) {
-		SYS_LOG_ERR("Prescaler is not a natural number! "
+		LOG_ERR("Prescaler is not a natural number! "
 			    "prescaler = clock_rate / ((PROP_SEG1 + SEG2 + 1)"
 			    " * bus_speed); "
 			    "prescaler = %d / ((%d + %d + 1) * %d)",
@@ -258,11 +259,11 @@ int can_stm32_runtime_configure(struct device *dev, enum can_mode mode,
 
 	hal_ret = HAL_CAN_Init(&hcan);
 	if (hal_ret != HAL_OK) {
-		SYS_LOG_ERR("HAL_CAN_Init failed: %d", hal_ret);
+		LOG_ERR("HAL_CAN_Init failed: %d", hal_ret);
 		return -EIO;
 	}
 
-	SYS_LOG_DBG("Runtime configure of %s done", dev->config->name);
+	LOG_DBG("Runtime configure of %s done", dev->config->name);
 	return 0;
 }
 
@@ -294,7 +295,7 @@ static int can_stm32_init(struct device *dev)
 
 	ret = clock_control_on(clock, (clock_control_subsys_t *) &cfg->pclken);
 	if (ret != 0) {
-		SYS_LOG_ERR("HAL_CAN_Init clock control on failed: %d", ret);
+		LOG_ERR("HAL_CAN_Init clock control on failed: %d", ret);
 		return -EIO;
 	}
 
@@ -305,7 +306,7 @@ static int can_stm32_init(struct device *dev)
 
 	cfg->config_irq(can);
 	can->IER |= CAN_IT_TME;
-	SYS_LOG_INF("Init of %s done", dev->config->name);
+	LOG_INF("Init of %s done", dev->config->name);
 	return 0;
 }
 
@@ -320,7 +321,7 @@ int can_stm32_send(struct device *dev, struct can_msg *msg, s32_t timeout,
 	struct k_mutex *tx_mutex = &data->tx_mutex;
 	struct can_mailbox *mb = NULL;
 
-	SYS_LOG_DBG("Sending %d bytes on %s. "
+	LOG_DBG("Sending %d bytes on %s. "
 		    "Id: 0x%x, "
 		    "ID type: %s, "
 		    "Remote Frame: %s"
@@ -341,7 +342,7 @@ int can_stm32_send(struct device *dev, struct can_msg *msg, s32_t timeout,
 	k_mutex_lock(tx_mutex, K_FOREVER);
 	while (!(transmit_status_register & CAN_TSR_TME)) {
 		k_mutex_unlock(tx_mutex);
-		SYS_LOG_DBG("Transmit buffer full. Wait with timeout (%dms)",
+		LOG_DBG("Transmit buffer full. Wait with timeout (%dms)",
 			    timeout);
 		if (k_sem_take(&data->tx_int_sem, timeout)) {
 			return CAN_TIMEOUT;
@@ -352,15 +353,15 @@ int can_stm32_send(struct device *dev, struct can_msg *msg, s32_t timeout,
 	}
 
 	if (transmit_status_register & CAN_TSR_TME0) {
-		SYS_LOG_DBG("Using mailbox 0");
+		LOG_DBG("Using mailbox 0");
 		mailbox = &can->sTxMailBox[CAN_TXMAILBOX_0];
 		mb = &(data->mb0);
 	} else if (transmit_status_register & CAN_TSR_TME1) {
-		SYS_LOG_DBG("Using mailbox 1");
+		LOG_DBG("Using mailbox 1");
 		mailbox = &can->sTxMailBox[CAN_TXMAILBOX_1];
 		mb = &data->mb1;
 	} else if (transmit_status_register & CAN_TSR_TME2) {
-		SYS_LOG_DBG("Using mailbox 2");
+		LOG_DBG("Using mailbox 2");
 		mailbox = &can->sTxMailBox[CAN_TXMAILBOX_2];
 		mb = &data->mb2;
 	}
@@ -636,9 +637,9 @@ static inline int can_stm32_set_filter(const struct can_filter *filter,
 		}
 	}
 
-	SYS_LOG_DBG("Setting filter ID: 0x%x, mask: 0x%x", filter->ext_id,
+	LOG_DBG("Setting filter ID: 0x%x, mask: 0x%x", filter->ext_id,
 		    filter->ext_id_mask);
-	SYS_LOG_DBG("Filter type: %s ID %s mask (%d)",
+	LOG_DBG("Filter type: %s ID %s mask (%d)",
 		    (filter_type == CAN_FILTER_STANDARD ||
 		     filter_type == CAN_FILTER_STANDARD_MASKED) ?
 		    "standard" : "extended",
@@ -673,7 +674,7 @@ static inline int can_stm32_set_filter(const struct can_filter *filter,
 		}
 
 		if (!usage_shifted) {
-			SYS_LOG_INF("No free filter bank found");
+			LOG_INF("No free filter bank found");
 			return CAN_NO_FREE_FILTER;
 		}
 	} while (filter_nr < CAN_MAX_NUMBER_OF_FILTES);
@@ -702,7 +703,7 @@ static inline int can_stm32_set_filter(const struct can_filter *filter,
 					  filter_index_tmp + 1, shift_width);
 
 		if (filter_index_tmp >= CAN_MAX_NUMBER_OF_FILTES || res) {
-			SYS_LOG_INF("No space for a new filter!");
+			LOG_INF("No space for a new filter!");
 			filter_nr = CAN_NO_FREE_FILTER;
 			goto done;
 		}
@@ -725,7 +726,7 @@ static inline int can_stm32_set_filter(const struct can_filter *filter,
 done:
 	can->FA1R |= bank_bit;
 	can->FMR &= ~(CAN_FMR_FINIT);
-	SYS_LOG_DBG("Filter set! Filter number: %d (index %d)",
+	LOG_DBG("Filter set! Filter number: %d (index %d)",
 		    filter_nr, filter_index_tmp);
 	*filter_index = filter_index_tmp;
 	return filter_nr;
@@ -804,7 +805,7 @@ void can_stm32_detach(struct device *dev, int filter_nr)
 	filter_index = can_calc_filter_index(filter_nr, mode_reg, scale_reg);
 	type = can_stm32_get_filter_type(bank_bit, mode_reg, scale_reg);
 
-	SYS_LOG_DBG("Detatch filter number %d (index %d), type %d", filter_nr,
+	LOG_DBG("Detatch filter number %d (index %d), type %d", filter_nr,
 		    filter_index,
 		    type);
 
@@ -823,7 +824,7 @@ void can_stm32_detach(struct device *dev, int filter_nr)
 	if (!CAN_BANK_IS_EMPTY(data->filter_usage, bank_nr)) {
 		can->FA1R |= bank_bit;
 	} else {
-		SYS_LOG_DBG("Bank number %d is empty -> deakivate", bank_nr);
+		LOG_DBG("Bank number %d is empty -> deakivate", bank_nr);
 	}
 
 	can->FMR &= ~(CAN_FMR_FINIT);
@@ -866,7 +867,7 @@ DEVICE_AND_API_INIT(can_stm32_1, CONFIG_CAN_1_NAME, &can_stm32_init,
 
 static void config_can_1_irq(CAN_TypeDef *can)
 {
-	SYS_LOG_DBG("Enable CAN1 IRQ");
+	LOG_DBG("Enable CAN1 IRQ");
 #ifdef CONFIG_SOC_SERIES_STM32F0X
 	IRQ_CONNECT(CONFIG_CAN_1_IRQ, CONFIG_CAN_1_IRQ_PRIORITY, can_stm32_isr,
 		    DEVICE_GET(can_stm32_1), 0);
diff --git a/drivers/clock_control/Kconfig b/drivers/clock_control/Kconfig
index 4bbbe702a9ec..e565c7c2acf6 100644
--- a/drivers/clock_control/Kconfig
+++ b/drivers/clock_control/Kconfig
@@ -19,24 +19,9 @@ menuconfig CLOCK_CONTROL
 
 if CLOCK_CONTROL
 
-config SYS_LOG_CLOCK_CONTROL_LEVEL
-	int "Hardware clock controller drivers log level"
-	depends on SYS_LOG
-	default 0
-	help
-	  Sets log level for clock controller drivers
-
-	  Levels are:
-
-	  - 0 OFF, do not write
-
-	  - 1 ERROR, only write SYS_LOG_ERR
-
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = CLOCK_CONTROL
+module-str = clock control
+source "subsys/logging/Kconfig.template.log_config"
 
 source "drivers/clock_control/Kconfig.nrf5"
 
diff --git a/drivers/clock_control/clock_control_mcux_ccm.c b/drivers/clock_control/clock_control_mcux_ccm.c
index 01c7ea2096c9..4101b04a5b69 100644
--- a/drivers/clock_control/clock_control_mcux_ccm.c
+++ b/drivers/clock_control/clock_control_mcux_ccm.c
@@ -9,8 +9,9 @@
 #include <dt-bindings/clock/imx_ccm.h>
 #include <fsl_clock.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_CLOCK_CONTROL_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(clock_control);
 
 static const clock_name_t lpspi_clocks[] = {
 	kCLOCK_Usb1PllPfd1Clk,
diff --git a/drivers/clock_control/clock_control_mcux_sim.c b/drivers/clock_control/clock_control_mcux_sim.c
index a9f58d2b75bd..09197e8b18be 100644
--- a/drivers/clock_control/clock_control_mcux_sim.c
+++ b/drivers/clock_control/clock_control_mcux_sim.c
@@ -9,7 +9,7 @@
 #include <dt-bindings/clock/kinetis_sim.h>
 #include <fsl_clock.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_CLOCK_CONTROL_LEVEL
+#define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
 #include <logging/sys_log.h>
 
 static int mcux_sim_on(struct device *dev, clock_control_subsys_t sub_system)
diff --git a/drivers/clock_control/quark_se_clock_control.c b/drivers/clock_control/quark_se_clock_control.c
index ff48ea028db9..ed6353d67ada 100644
--- a/drivers/clock_control/quark_se_clock_control.c
+++ b/drivers/clock_control/quark_se_clock_control.c
@@ -19,8 +19,9 @@
 #include <clock_control.h>
 #include <clock_control/quark_se_clock_control.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_CLOCK_CONTROL_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(clock_control);
 
 #ifdef CONFIG_ARC
 #define WRITE(__data, __base_address)		\
@@ -46,13 +47,13 @@ static inline int quark_se_clock_control_on(struct device *dev,
 	u32_t subsys = POINTER_TO_INT(sub_system);
 
 	if (sub_system == CLOCK_CONTROL_SUBSYS_ALL) {
-		SYS_LOG_DBG("Enabling all clock gates on dev %p", dev);
+		LOG_DBG("Enabling all clock gates on dev %p", dev);
 		WRITE(0xffffffff, info->base_address);
 
 		return 0;
 	}
 
-	SYS_LOG_DBG("Enabling clock gate on dev %p subsystem %u", dev, subsys);
+	LOG_DBG("Enabling clock gate on dev %p subsystem %u", dev, subsys);
 
 	return TEST_CLEAR_BIT(info->base_address, subsys);
 }
@@ -65,13 +66,13 @@ static inline int quark_se_clock_control_off(struct device *dev,
 	u32_t subsys = POINTER_TO_INT(sub_system);
 
 	if (sub_system == CLOCK_CONTROL_SUBSYS_ALL) {
-		SYS_LOG_DBG("Disabling all clock gates on dev %p", dev);
+		LOG_DBG("Disabling all clock gates on dev %p", dev);
 		WRITE(0x00000000, info->base_address);
 
 		return 0;
 	}
 
-	SYS_LOG_DBG("clock gate on dev %p subsystem %u", dev, subsys);
+	LOG_DBG("clock gate on dev %p subsystem %u", dev, subsys);
 
 	return TEST_CLEAR_BIT(info->base_address, subsys);
 }
@@ -84,7 +85,7 @@ static const struct clock_control_driver_api quark_se_clock_control_api = {
 
 int quark_se_clock_control_init(struct device *dev)
 {
-	SYS_LOG_DBG("Quark_SE clock controller on: %p", dev);
+	LOG_DBG("Quark_SE clock controller on: %p", dev);
 	return 0;
 }
 
diff --git a/drivers/console/Kconfig.telnet b/drivers/console/Kconfig.telnet
index 220cef1b139e..1763b0ded211 100644
--- a/drivers/console/Kconfig.telnet
+++ b/drivers/console/Kconfig.telnet
@@ -84,24 +84,9 @@ config TELNET_CONSOLE_PRIO
 	help
 	  This option helps to fine-tune telnet's inner thread priority.
 
-config SYS_LOG_TELNET_CONSOLE_LEVEL
-	int "Telnet console log level"
-	default 0
-	depends on SYS_LOG
-	help
-	  Sets log level for telnet console (for telnet console dev only)
-
-	  Levels are:
-
-	  - 0 OFF, do not write
-
-	  - 1 ERROR, only write SYS_LOG_ERR
-
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = TELNET_CONSOLE
+module-str = telnet console
+source "subsys/logging/Kconfig.template.log_config"
 
 config TELNET_CONSOLE_DEBUG_DEEP
 	bool "Forward output to original console handler"
diff --git a/drivers/console/Kconfig.ws b/drivers/console/Kconfig.ws
index 74a97958aed0..b3984fcf56fa 100644
--- a/drivers/console/Kconfig.ws
+++ b/drivers/console/Kconfig.ws
@@ -72,24 +72,9 @@ config WEBSOCKET_CONSOLE_PRIO
 	help
 	This option helps to fine-tune WS console inner thread priority.
 
-config SYS_LOG_WEBSOCKET_CONSOLE_LEVEL
-	int "WS console log level"
-	default 0
-	depends on SYS_LOG
-	help
-	Sets log level for websocket console (for WS console dev only)
-
-	Levels are:
-
-	- 0 OFF, do not write
-
-	- 1 ERROR, only write SYS_LOG_ERR
-
-	- 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	- 3 INFO, write SYS_LOG_INF in addition to previous levels
-
-	- 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = WEBSOCKET_CONSOLE
+module-str = web socket console
+source "subsys/logging/Kconfig.template.log_config"
 
 config WEBSOCKET_CONSOLE_DEBUG_DEEP
 	bool "Forward output to original console handler"
diff --git a/drivers/console/telnet_console.c b/drivers/console/telnet_console.c
index 49b3f401f91b..fe55307a1a54 100644
--- a/drivers/console/telnet_console.c
+++ b/drivers/console/telnet_console.c
@@ -16,9 +16,10 @@
  * RFC 854 - https://tools.ietf.org/html/rfc854
  */
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_TELNET_CONSOLE_LEVEL
-#define SYS_LOG_DOMAIN "net/telnet"
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_TELNET_CONSOLE_LOG_LEVEL
+#define LOG_DOMAIN net_telnet
+#include <logging/log.h>
+LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 #include <zephyr.h>
 #include <init.h>
@@ -33,15 +34,15 @@
 #include "telnet_protocol.h"
 
 /* Various definitions mapping the telnet service configuration options */
-#define TELNET_PORT		CONFIG_TELNET_CONSOLE_PORT
-#define TELNET_STACK_SIZE	CONFIG_TELNET_CONSOLE_THREAD_STACK
-#define TELNET_PRIORITY		CONFIG_TELNET_CONSOLE_PRIO
-#define TELNET_LINES		CONFIG_TELNET_CONSOLE_LINE_BUF_NUMBERS
-#define TELNET_LINE_SIZE	CONFIG_TELNET_CONSOLE_LINE_BUF_SIZE
-#define TELNET_TIMEOUT		K_MSEC(CONFIG_TELNET_CONSOLE_SEND_TIMEOUT)
-#define TELNET_THRESHOLD	CONFIG_TELNET_CONSOLE_SEND_THRESHOLD
+#define TELNET_PORT             CONFIG_TELNET_CONSOLE_PORT
+#define TELNET_STACK_SIZE       CONFIG_TELNET_CONSOLE_THREAD_STACK
+#define TELNET_PRIORITY         CONFIG_TELNET_CONSOLE_PRIO
+#define TELNET_LINES            CONFIG_TELNET_CONSOLE_LINE_BUF_NUMBERS
+#define TELNET_LINE_SIZE        CONFIG_TELNET_CONSOLE_LINE_BUF_SIZE
+#define TELNET_TIMEOUT          K_MSEC(CONFIG_TELNET_CONSOLE_SEND_TIMEOUT)
+#define TELNET_THRESHOLD        CONFIG_TELNET_CONSOLE_SEND_THRESHOLD
 
-#define TELNET_MIN_MSG		2
+#define TELNET_MIN_MSG          2
 
 /* These 2 structures below are used to store the console output
  * before sending it to the client. This is done to keep some
@@ -190,7 +191,7 @@ static int telnet_console_out(int c)
 	lb->buf[lb->len++] = (char)c;
 
 	if (c == '\n' || lb->len == TELNET_LINE_SIZE - 1) {
-		lb->buf[lb->len-1] = NVT_CR;
+		lb->buf[lb->len - 1] = NVT_CR;
 		lb->buf[lb->len++] = NVT_LF;
 		telnet_rb_switch();
 		yield = true;
@@ -226,7 +227,7 @@ static void telnet_sent_cb(struct net_context *client,
 {
 	if (status) {
 		telnet_end_client_connection();
-		SYS_LOG_ERR("Could not sent last packet");
+		LOG_ERR("Could not sent last packet");
 	}
 }
 
@@ -313,8 +314,7 @@ static inline void telnet_reply_command(void)
 		telnet_reply_do_command();
 		break;
 	default:
-		SYS_LOG_DBG("Operation %u not handled",
-			    telnet_cmd.op);
+		LOG_DBG("Operation %u not handled", telnet_cmd.op);
 		break;
 	}
 
@@ -340,7 +340,7 @@ static inline bool telnet_handle_command(struct net_pkt *pkt)
 #ifdef CONFIG_TELNET_CONSOLE_SUPPORT_COMMAND
 	cmd = (struct telnet_simple_command *)l_start;
 
-	SYS_LOG_DBG("Got a command %u/%u/%u", cmd->iac, cmd->op, cmd->opt);
+	LOG_DBG("Got a command %u/%u/%u", cmd->iac, cmd->op, cmd->opt);
 
 	if (!k_sem_take(&cmd_lock, K_NO_WAIT)) {
 		telnet_command_cpy(&telnet_cmd, cmd);
@@ -348,7 +348,7 @@ static inline bool telnet_handle_command(struct net_pkt *pkt)
 		k_sem_give(&cmd_lock);
 		k_sem_give(&send_lock);
 	}
-#endif /* CONFIG_TELNET_CONSOLE_SUPPORT_COMMAND */
+#endif  /* CONFIG_TELNET_CONSOLE_SUPPORT_COMMAND */
 
 	return true;
 }
@@ -380,13 +380,13 @@ static inline void telnet_handle_input(struct net_pkt *pkt)
 	net_frag_read(pkt->frags, offset, &pos, len, (u8_t *)input->line);
 
 	/* LF/CR will be removed if only the line is not NUL terminated */
-	if (input->line[len-1] != NVT_NUL) {
-		if (input->line[len-1] == NVT_LF) {
-			input->line[len-1] = NVT_NUL;
+	if (input->line[len - 1] != NVT_NUL) {
+		if (input->line[len - 1] == NVT_LF) {
+			input->line[len - 1] = NVT_NUL;
 		}
 
-		if (input->line[len-2] == NVT_CR) {
-			input->line[len-2] = NVT_NUL;
+		if (input->line[len - 2] == NVT_CR) {
+			input->line[len - 2] = NVT_NUL;
 		}
 	}
 
@@ -401,9 +401,9 @@ static void telnet_recv(struct net_context *client,
 	if (!pkt || status) {
 		telnet_end_client_connection();
 
-		SYS_LOG_DBG("Telnet client dropped (AF_INET%s) status %d",
-			    net_context_get_family(client) == AF_INET ?
-			    "" : "6", status);
+		LOG_DBG("Telnet client dropped (AF_INET%s) status %d",
+			net_context_get_family(client) == AF_INET ?
+			"" : "6", status);
 		return;
 	}
 
@@ -433,18 +433,18 @@ static void telnet_accept(struct net_context *client,
 			  void *user_data)
 {
 	if (error) {
-		SYS_LOG_ERR("Error %d", error);
+		LOG_ERR("Error %d", error);
 		goto error;
 	}
 
 	if (client_cnx) {
-		SYS_LOG_WRN("A telnet client is already in.");
+		LOG_WRN("A telnet client is already in.");
 		goto error;
 	}
 
 	if (net_context_recv(client, telnet_recv, 0, NULL)) {
-		SYS_LOG_ERR("Unable to setup reception (family %u)",
-			    net_context_get_family(client));
+		LOG_ERR("Unable to setup reception (family %u)",
+			net_context_get_family(client));
 		goto error;
 	}
 
@@ -452,8 +452,8 @@ static void telnet_accept(struct net_context *client,
 		goto error;
 	}
 
-	SYS_LOG_DBG("Telnet client connected (family AF_INET%s)",
-		    net_context_get_family(client) == AF_INET ? "" : "6");
+	LOG_DBG("Telnet client connected (family AF_INET%s)",
+		net_context_get_family(client) == AF_INET ? "" : "6");
 
 	orig_printk_hook = __printk_get_hook();
 	__printk_hook_install(telnet_console_out);
@@ -470,33 +470,33 @@ static void telnet_setup_server(struct net_context **ctx, sa_family_t family,
 				struct sockaddr *addr, socklen_t addrlen)
 {
 	if (net_context_get(family, SOCK_STREAM, IPPROTO_TCP, ctx)) {
-		SYS_LOG_ERR("No context available");
+		LOG_ERR("No context available");
 		goto error;
 	}
 
 	if (net_context_bind(*ctx, addr, addrlen)) {
-		SYS_LOG_ERR("Cannot bind on family AF_INET%s",
-			    family == AF_INET ? "" : "6");
+		LOG_ERR("Cannot bind on family AF_INET%s",
+			family == AF_INET ? "" : "6");
 		goto error;
 	}
 
 	if (net_context_listen(*ctx, 0)) {
-		SYS_LOG_ERR("Cannot listen on");
+		LOG_ERR("Cannot listen on");
 		goto error;
 	}
 
 	if (net_context_accept(*ctx, telnet_accept, K_NO_WAIT, NULL)) {
-		SYS_LOG_ERR("Cannot accept");
+		LOG_ERR("Cannot accept");
 		goto error;
 	}
 
-	SYS_LOG_DBG("Telnet console enabled on AF_INET%s",
-		    family == AF_INET ? "" : "6");
+	LOG_DBG("Telnet console enabled on AF_INET%s",
+		family == AF_INET ? "" : "6");
 
 	return;
 error:
-	SYS_LOG_ERR("Unable to start telnet on AF_INET%s",
-		    family == AF_INET ? "" : "6");
+	LOG_ERR("Unable to start telnet on AF_INET%s",
+		family == AF_INET ? "" : "6");
 
 	if (*ctx) {
 		net_context_put(*ctx);
@@ -549,7 +549,7 @@ static int telnet_console_init(struct device *arg)
 			NULL, NULL, NULL,
 			K_PRIO_COOP(TELNET_PRIORITY), 0, K_MSEC(10));
 
-	SYS_LOG_INF("Telnet console initialized");
+	LOG_INF("Telnet console initialized");
 
 	return 0;
 }
diff --git a/drivers/console/websocket_console.c b/drivers/console/websocket_console.c
index b05f3e40fdb7..34aa307dffb8 100644
--- a/drivers/console/websocket_console.c
+++ b/drivers/console/websocket_console.c
@@ -13,9 +13,10 @@
  * a websocket connection.
  */
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_WEBSOCKET_CONSOLE_LEVEL
-#define SYS_LOG_DOMAIN "ws/console"
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_WEBSOCKET_CONSOLE_LOG_LEVEL
+#define LOG_DOMAIN ws_console
+#include <logging/log.h>
+LOG_MODULE_REGISTER(LOG_DOMAIN);
 
 #include <zephyr.h>
 #include <init.h>
@@ -26,19 +27,19 @@
 #include <net/net_pkt.h>
 #include <net/websocket_console.h>
 
-#define NVT_NUL	0
-#define NVT_LF	10
-#define NVT_CR	13
+#define NVT_NUL 0
+#define NVT_LF  10
+#define NVT_CR  13
 
-#define WS_CONSOLE_STACK_SIZE	CONFIG_WEBSOCKET_CONSOLE_STACK_SIZE
-#define WS_CONSOLE_PRIORITY	CONFIG_WEBSOCKET_CONSOLE_PRIO
-#define WS_CONSOLE_TIMEOUT	K_MSEC(CONFIG_WEBSOCKET_CONSOLE_SEND_TIMEOUT)
-#define WS_CONSOLE_LINES	CONFIG_WEBSOCKET_CONSOLE_LINE_BUF_NUMBERS
-#define WS_CONSOLE_LINE_SIZE	CONFIG_WEBSOCKET_CONSOLE_LINE_BUF_SIZE
-#define WS_CONSOLE_TIMEOUT	K_MSEC(CONFIG_WEBSOCKET_CONSOLE_SEND_TIMEOUT)
-#define WS_CONSOLE_THRESHOLD	CONFIG_WEBSOCKET_CONSOLE_SEND_THRESHOLD
+#define WS_CONSOLE_STACK_SIZE   CONFIG_WEBSOCKET_CONSOLE_STACK_SIZE
+#define WS_CONSOLE_PRIORITY     CONFIG_WEBSOCKET_CONSOLE_PRIO
+#define WS_CONSOLE_TIMEOUT      K_MSEC(CONFIG_WEBSOCKET_CONSOLE_SEND_TIMEOUT)
+#define WS_CONSOLE_LINES        CONFIG_WEBSOCKET_CONSOLE_LINE_BUF_NUMBERS
+#define WS_CONSOLE_LINE_SIZE    CONFIG_WEBSOCKET_CONSOLE_LINE_BUF_SIZE
+#define WS_CONSOLE_TIMEOUT      K_MSEC(CONFIG_WEBSOCKET_CONSOLE_SEND_TIMEOUT)
+#define WS_CONSOLE_THRESHOLD    CONFIG_WEBSOCKET_CONSOLE_SEND_THRESHOLD
 
-#define WS_CONSOLE_MIN_MSG	2
+#define WS_CONSOLE_MIN_MSG      2
 
 /* These 2 structures below are used to store the console output
  * before sending it to the client. This is done to keep some
@@ -176,7 +177,7 @@ static int ws_console_out(int c)
 	lb->buf[lb->len++] = (char)c;
 
 	if (c == '\n' || lb->len == WS_CONSOLE_LINE_SIZE - 1) {
-		lb->buf[lb->len-1] = NVT_CR;
+		lb->buf[lb->len - 1] = NVT_CR;
 		lb->buf[lb->len++] = NVT_LF;
 		ws_rb_switch();
 		yield = true;
@@ -235,13 +236,13 @@ static inline void ws_handle_input(struct net_pkt *pkt)
 	input->line[len] = NVT_NUL;
 
 	/* LF/CR will be removed if only the line is not NUL terminated */
-	if (input->line[len-1] != NVT_NUL) {
-		if (input->line[len-1] == NVT_LF) {
-			input->line[len-1] = NVT_NUL;
+	if (input->line[len - 1] != NVT_NUL) {
+		if (input->line[len - 1] == NVT_LF) {
+			input->line[len - 1] = NVT_NUL;
 		}
 
-		if (input->line[len-2] == NVT_CR) {
-			input->line[len-2] = NVT_NUL;
+		if (input->line[len - 2] == NVT_CR) {
+			input->line[len - 2] = NVT_NUL;
 		}
 	}
 
@@ -328,7 +329,7 @@ static int ws_console_init(struct device *arg)
 			NULL, NULL, NULL,
 			K_PRIO_COOP(WS_CONSOLE_PRIORITY), 0, K_MSEC(10));
 
-	SYS_LOG_INF("Websocket console initialized");
+	LOG_INF("Websocket console initialized");
 
 	return 0;
 }
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index f637ed6c45d2..d1cb1d78c55c 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -20,24 +20,9 @@ config CRYPTO_INIT_PRIORITY
 	help
 	  Crypto devices initialization priority.
 
-config SYS_LOG_CRYPTO_LEVEL
-	int "Crypto drivers log level"
-	default 0
-	depends on SYS_LOG
-	help
-	  Sets log level for crypto drivers
-
-	  Levels are:
-
-	  - 0 OFF, do not write
-
-	  - 1 ERROR, only write SYS_LOG_ERR
-
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = CRYPTO
+module-str = CRYPTO
+source "subsys/logging/Kconfig.template.log_config"
 
 config CRYPTO_TINYCRYPT_SHIM
 	bool "Enable TinyCrypt shim driver [EXPERIMENTAL]"
diff --git a/drivers/crypto/crypto_ataes132a.c b/drivers/crypto/crypto_ataes132a.c
index aad3cfb451ca..fdd90c085c77 100644
--- a/drivers/crypto/crypto_ataes132a.c
+++ b/drivers/crypto/crypto_ataes132a.c
@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
-
-#include <logging/sys_log.h>
 #include <init.h>
 #include <kernel.h>
 #include <string.h>
@@ -24,6 +21,10 @@
 /* ATAES132A can store up to 16 different crypto keys */
 #define CRYPTO_MAX_SESSION 16
 
+#define LOG_LEVEL CONFIG_CRYPTO_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(ataes132a);
+
 static struct ataes132a_driver_state ataes132a_state[CRYPTO_MAX_SESSION];
 
 static void ataes132a_init_states(void)
@@ -51,7 +52,7 @@ static int ataes132a_send_command(struct device *dev, u8_t opcode,
 
 	count = nparams + 5;
 	if (count > 64) {
-		SYS_LOG_ERR("command too large for command buffer");
+		LOG_ERR("command too large for command buffer");
 		return -EDOM;
 	}
 
@@ -88,7 +89,7 @@ static int ataes132a_send_command(struct device *dev, u8_t opcode,
 				     ATAES_COMMAND_MEM_ADDR,
 				     data->command_buffer, count);
 
-	SYS_LOG_DBG("BURST WRITE RETURN: %d", i2c_return);
+	LOG_DBG("BURST WRITE RETURN: %d", i2c_return);
 
 	/* Idle-waiting for the command completion*/
 	do {
@@ -98,12 +99,12 @@ static int ataes132a_send_command(struct device *dev, u8_t opcode,
 	} while (status & ATAES_STATUS_WIP);
 
 	if (status & ATAES_STATUS_CRC) {
-		SYS_LOG_ERR("incorrect CRC command");
+		LOG_ERR("incorrect CRC command");
 		return -EINVAL;
 	}
 
 	if (!(status & ATAES_STATUS_RDY)) {
-		SYS_LOG_ERR("expected response is not in place");
+		LOG_ERR("expected response is not in place");
 		return -EINVAL;
 	}
 
@@ -117,15 +118,15 @@ static int ataes132a_send_command(struct device *dev, u8_t opcode,
 	/* Calculate and validate response CRC */
 	ataes132a_atmel_crc(data->command_buffer, count - 2, crc);
 
-	SYS_LOG_DBG("COMMAND CRC %x%x", data->command_buffer[count - 2],
+	LOG_DBG("COMMAND CRC %x%x", data->command_buffer[count - 2],
 		     data->command_buffer[count - 1]);
-	SYS_LOG_DBG("CALCULATED CRC %x%x", crc[0], crc[1]);
+	LOG_DBG("CALCULATED CRC %x%x", crc[0], crc[1]);
 
 	/* If CRC fails retry reading MAX RETRIES times */
 	while (crc[0] != data->command_buffer[count - 2] ||
 	       crc[1] != data->command_buffer[count - 1]) {
 		if (retry_count > MAX_RETRIES - 1) {
-			SYS_LOG_ERR("response crc validation rebase"
+			LOG_ERR("response crc validation rebase"
 				    " max retries");
 			return -EINVAL;
 		}
@@ -139,20 +140,20 @@ static int ataes132a_send_command(struct device *dev, u8_t opcode,
 		ataes132a_atmel_crc(data->command_buffer, count -  2, crc);
 		retry_count++;
 
-		SYS_LOG_DBG("COMMAND RETRY %d", retry_count);
-		SYS_LOG_DBG("COMMAND CRC %x%x",
+		LOG_DBG("COMMAND RETRY %d", retry_count);
+		LOG_DBG("COMMAND CRC %x%x",
 			    data->command_buffer[count - 2],
 			    data->command_buffer[count - 1]);
-		SYS_LOG_DBG("CALCULATED CRC %x%x", crc[0], crc[1]);
+		LOG_DBG("CALCULATED CRC %x%x", crc[0], crc[1]);
 		}
 
 	if ((status & ATAES_STATUS_ERR) || data->command_buffer[1] != 0x00) {
-		SYS_LOG_ERR("command execution error %x",
+		LOG_ERR("command execution error %x",
 			    data->command_buffer[1]);
 		return -EIO;
 	}
 
-	SYS_LOG_DBG("Read the response count: %d", count);
+	LOG_DBG("Read the response count: %d", count);
 
 	for (i = 0; i < count - 3; i++) {
 		response[i] = data->command_buffer[i + 1];
@@ -169,11 +170,11 @@ int ataes132a_init(struct device *dev)
 	const struct ataes132a_device_config *cfg = dev->config->config_info;
 	u32_t i2c_cfg;
 
-	SYS_LOG_DBG("ATAES132A INIT");
+	LOG_DBG("ATAES132A INIT");
 
 	ataes132a->i2c = device_get_binding((char *)cfg->i2c_port);
 	if (!ataes132a->i2c) {
-		SYS_LOG_DBG("ATAE132A master controller not found!");
+		LOG_DBG("ATAE132A master controller not found!");
 		return -EINVAL;
 	}
 
@@ -204,12 +205,12 @@ int ataes132a_aes_ccm_decrypt(struct device *dev,
 	u8_t param_buffer[52];
 
 	if (!aead_op) {
-		SYS_LOG_ERR("Parameter cannot be null");
+		LOG_ERR("Parameter cannot be null");
 		return -EINVAL;
 	}
 
 	if (!aead_op->pkt) {
-		SYS_LOG_ERR("Parameter cannot be null");
+		LOG_ERR("Parameter cannot be null");
 		return -EINVAL;
 	}
 
@@ -218,18 +219,18 @@ int ataes132a_aes_ccm_decrypt(struct device *dev,
 
 	/*The KeyConfig[EKeyID].ExternalCrypto bit must be 1b.*/
 	if (!ataes132a_state[key_id].key_config & ATAES_KEYCONFIG_EXTERNAL) {
-		SYS_LOG_ERR("key %x external mode disabled", key_id);
+		LOG_ERR("key %x external mode disabled", key_id);
 		return -EINVAL;
 	}
 
 	if (in_buf_len != 16 && in_buf_len != 32) {
-		SYS_LOG_ERR("ccm mode only accepts input blocks of 16"
+		LOG_ERR("ccm mode only accepts input blocks of 16"
 			    " and 32 bytes");
 		return -EINVAL;
 	}
 
 	if (expected_out_len > 32) {
-		SYS_LOG_ERR("ccm mode cannot generate more than"
+		LOG_ERR("ccm mode cannot generate more than"
 			    " 32 output bytes");
 		return -EINVAL;
 	}
@@ -238,7 +239,7 @@ int ataes132a_aes_ccm_decrypt(struct device *dev,
 	 * is required
 	 */
 	if (!(ataes132a_state[key_id].key_config & ATAES_KEYCONFIG_AUTHKEY)) {
-		SYS_LOG_DBG("keep in mind key %x will require"
+		LOG_DBG("keep in mind key %x will require"
 			    " previous authentication", key_id);
 	}
 
@@ -253,10 +254,10 @@ int ataes132a_aes_ccm_decrypt(struct device *dev,
 	 * the decrypt operation will fail accordingly.
 	 */
 	if (ataes132a_state[key_id].key_config & ATAES_KEYCONFIG_RAND_NONCE) {
-		SYS_LOG_DBG("key %x requires random nonce,"
+		LOG_DBG("key %x requires random nonce,"
 			    " nonce_buf will be ignored", key_id);
 
-		SYS_LOG_DBG("current nonce register will be used");
+		LOG_DBG("current nonce register will be used");
 
 	}
 
@@ -279,14 +280,14 @@ int ataes132a_aes_ccm_decrypt(struct device *dev,
 						     param_buffer, &out_len);
 
 		if (return_code != 0) {
-			SYS_LOG_ERR("nonce command ended with code %d",
+			LOG_ERR("nonce command ended with code %d",
 				    return_code);
 			k_sem_give(&data->device_sem);
 			return -EINVAL;
 		}
 
 		if (param_buffer[0] != 0) {
-			SYS_LOG_ERR("nonce command failed with error"
+			LOG_ERR("nonce command failed with error"
 				    " code %d", param_buffer[0]);
 			k_sem_give(&data->device_sem);
 			return -EIO;
@@ -299,7 +300,7 @@ int ataes132a_aes_ccm_decrypt(struct device *dev,
 	 */
 	if (!(ataes132a_state[key_id].key_config & ATAES_KEYCONFIG_RAND_NONCE)
 	    && !nonce_buf) {
-		SYS_LOG_DBG("current nonce register will be used");
+		LOG_DBG("current nonce register will be used");
 	}
 
 	/* Client decryption mode requires a MAC packet to specify the
@@ -312,7 +313,7 @@ int ataes132a_aes_ccm_decrypt(struct device *dev,
 	} else {
 		param_buffer[0] = 0x0;
 		param_buffer[2] = 0x0;
-		SYS_LOG_DBG("normal decryption mode"
+		LOG_DBG("normal decryption mode"
 			    " ignores mac_packet parameter");
 	}
 
@@ -322,19 +323,19 @@ int ataes132a_aes_ccm_decrypt(struct device *dev,
 	 */
 	if (mac_mode) {
 		if (mac_mode->include_counter) {
-			SYS_LOG_DBG("including usage counter in the MAC: "
+			LOG_DBG("including usage counter in the MAC: "
 				    "decrypt and encrypt dev must be the same");
 			command_mode = command_mode | ATAES_MAC_MODE_COUNTER;
 		}
 
 		if (mac_mode->include_serial) {
-			SYS_LOG_DBG("including serial number in the MAC: "
+			LOG_DBG("including serial number in the MAC: "
 				    "decrypt and encrypt dev must be the same");
 			command_mode = command_mode | ATAES_MAC_MODE_SERIAL;
 		}
 
 		if (mac_mode->include_smallzone) {
-			SYS_LOG_DBG("including small zone in the MAC: "
+			LOG_DBG("including small zone in the MAC: "
 				    "decrypt and encrypt dev share the "
 				    "first four bytes of their small zone");
 			command_mode = command_mode | ATAES_MAC_MODE_SMALLZONE;
@@ -354,27 +355,27 @@ int ataes132a_aes_ccm_decrypt(struct device *dev,
 					     &out_len);
 
 	if (return_code != 0) {
-		SYS_LOG_ERR("decrypt command ended with code %d", return_code);
+		LOG_ERR("decrypt command ended with code %d", return_code);
 		k_sem_give(&data->device_sem);
 		return -EINVAL;
 	}
 
 	if (out_len < 2 || out_len > 33) {
-		SYS_LOG_ERR("decrypt command response has invalid"
+		LOG_ERR("decrypt command response has invalid"
 			    " size %d", out_len);
 		k_sem_give(&data->device_sem);
 		return -EINVAL;
 	}
 
 	if (param_buffer[0] != 0) {
-		SYS_LOG_ERR("legacy command failed with error"
+		LOG_ERR("legacy command failed with error"
 			    " code %d", param_buffer[0]);
 		k_sem_give(&data->device_sem);
 		return -param_buffer[0];
 	}
 
 	if (expected_out_len != out_len - 1) {
-		SYS_LOG_ERR("decrypted output data size %d and expected data"
+		LOG_ERR("decrypted output data size %d and expected data"
 			    " size %d  are different", out_len - 1,
 			    expected_out_len);
 		k_sem_give(&data->device_sem);
@@ -403,12 +404,12 @@ int ataes132a_aes_ccm_encrypt(struct device *dev,
 	u8_t param_buffer[40];
 
 	if (!aead_op) {
-		SYS_LOG_ERR("Parameter cannot be null");
+		LOG_ERR("Parameter cannot be null");
 		return -EINVAL;
 	}
 
 	if (!aead_op->pkt) {
-		SYS_LOG_ERR("Parameter cannot be null");
+		LOG_ERR("Parameter cannot be null");
 		return -EINVAL;
 	}
 
@@ -416,12 +417,12 @@ int ataes132a_aes_ccm_encrypt(struct device *dev,
 
 	/*The KeyConfig[EKeyID].ExternalCrypto bit must be 1b.*/
 	if (!ataes132a_state[key_id].key_config & ATAES_KEYCONFIG_EXTERNAL) {
-		SYS_LOG_ERR("key %x external mode disabled", key_id);
+		LOG_ERR("key %x external mode disabled", key_id);
 		return -EINVAL;
 	}
 
 	if (buf_len > 32) {
-		SYS_LOG_ERR("only up to 32 bytes accepted for ccm mode");
+		LOG_ERR("only up to 32 bytes accepted for ccm mode");
 			return -EINVAL;
 	}
 
@@ -429,7 +430,7 @@ int ataes132a_aes_ccm_encrypt(struct device *dev,
 	 * is required
 	 */
 	if (!(ataes132a_state[key_id].key_config & ATAES_KEYCONFIG_AUTHKEY)) {
-		SYS_LOG_DBG("keep in mind key %x will require"
+		LOG_DBG("keep in mind key %x will require"
 			    " previous authentication", key_id);
 	}
 
@@ -444,10 +445,10 @@ int ataes132a_aes_ccm_encrypt(struct device *dev,
 	 * the decrypt operation will fail accordingly.
 	 */
 	if (ataes132a_state[key_id].key_config & ATAES_KEYCONFIG_RAND_NONCE) {
-		SYS_LOG_DBG("key %x requires random nonce,"
+		LOG_DBG("key %x requires random nonce,"
 			    " nonce_buf will be ignored", key_id);
 
-		SYS_LOG_DBG("current nonce register will be used");
+		LOG_DBG("current nonce register will be used");
 
 	}
 
@@ -470,14 +471,14 @@ int ataes132a_aes_ccm_encrypt(struct device *dev,
 						     param_buffer, &out_len);
 
 		if (return_code != 0) {
-			SYS_LOG_ERR("nonce command ended with code %d",
+			LOG_ERR("nonce command ended with code %d",
 				    return_code);
 			k_sem_give(&data->device_sem);
 			return -EINVAL;
 		}
 
 		if (param_buffer[0] != 0) {
-			SYS_LOG_ERR("nonce command failed with error"
+			LOG_ERR("nonce command failed with error"
 				    " code %d", param_buffer[0]);
 			k_sem_give(&data->device_sem);
 			return -EIO;
@@ -489,7 +490,7 @@ int ataes132a_aes_ccm_encrypt(struct device *dev,
 	 */
 	if (!(ataes132a_state[key_id].key_config & ATAES_KEYCONFIG_RAND_NONCE)
 	    && !nonce_buf) {
-		SYS_LOG_DBG("current nonce register will be used");
+		LOG_DBG("current nonce register will be used");
 	}
 
 	/* MAC packet to specify if MAC counter, serial number and small zone
@@ -497,19 +498,19 @@ int ataes132a_aes_ccm_encrypt(struct device *dev,
 	 */
 	if (mac_mode) {
 		if (mac_mode->include_counter) {
-			SYS_LOG_DBG("including usage counter in the MAC: "
+			LOG_DBG("including usage counter in the MAC: "
 				    "decrypt and encrypt dev must be the same");
 			command_mode = command_mode | ATAES_MAC_MODE_COUNTER;
 		}
 
 		if (mac_mode->include_serial) {
-			SYS_LOG_DBG("including serial number in the MAC: "
+			LOG_DBG("including serial number in the MAC: "
 				    "decrypt and encrypt dev must be the same");
 			command_mode = command_mode | ATAES_MAC_MODE_SERIAL;
 		}
 
 		if (mac_mode->include_smallzone) {
-			SYS_LOG_DBG("including small zone in the MAC: "
+			LOG_DBG("including small zone in the MAC: "
 				    "decrypt and encrypt dev share the "
 				    "first four bytes of their small zone");
 			command_mode = command_mode | ATAES_MAC_MODE_SMALLZONE;
@@ -526,20 +527,20 @@ int ataes132a_aes_ccm_encrypt(struct device *dev,
 					     &out_len);
 
 	if (return_code != 0) {
-		SYS_LOG_ERR("encrypt command ended with code %d", return_code);
+		LOG_ERR("encrypt command ended with code %d", return_code);
 		k_sem_give(&data->device_sem);
 		return -EINVAL;
 	}
 
 	if (out_len < 33 || out_len > 49) {
-		SYS_LOG_ERR("encrypt command response has invalid"
+		LOG_ERR("encrypt command response has invalid"
 			    " size %d", out_len);
 		k_sem_give(&data->device_sem);
 		return -EINVAL;
 	}
 
 	if (param_buffer[0] != 0) {
-		SYS_LOG_ERR("encrypt command failed with error"
+		LOG_ERR("encrypt command failed with error"
 			    " code %d", param_buffer[0]);
 		k_sem_give(&data->device_sem);
 		return -EIO;
@@ -560,7 +561,7 @@ int ataes132a_aes_ccm_encrypt(struct device *dev,
 					       param_buffer,	4,
 					       param_buffer, &out_len);
 			if (param_buffer[0] != 0) {
-				SYS_LOG_ERR("info command failed with error"
+				LOG_ERR("info command failed with error"
 					    " code %d", param_buffer[0]);
 				k_sem_give(&data->device_sem);
 				return -EIO;
@@ -587,13 +588,13 @@ int ataes132a_aes_ecb_block(struct device *dev,
 	u8_t param_buffer[19];
 
 	if (!pkt) {
-		SYS_LOG_ERR("Parameter cannot be null");
+		LOG_ERR("Parameter cannot be null");
 		return -EINVAL;
 	}
 
 	buf_len = pkt->in_len;
 	if (buf_len > 16) {
-		SYS_LOG_ERR("input block cannot be above 16 bytes");
+		LOG_ERR("input block cannot be above 16 bytes");
 		return -EINVAL;
 	}
 
@@ -601,24 +602,24 @@ int ataes132a_aes_ecb_block(struct device *dev,
 	 * is set to 1 and if KeyConfig[key_id].LegacyOK is set to 1.
 	 */
 	if (!ataes132a_state[key_id].chip_config & ATAES_CHIPCONFIG_LEGACYE) {
-		SYS_LOG_ERR("legacy mode disabled");
+		LOG_ERR("legacy mode disabled");
 		return -EINVAL;
 	}
 
 	if (!(ataes132a_state[key_id].key_config & ATAES_KEYCONFIG_LEGACYOK)) {
-		SYS_LOG_ERR("key %x legacy mode disabled", key_id);
+		LOG_ERR("key %x legacy mode disabled", key_id);
 		return -EINVAL;
 	}
 
-	SYS_LOG_DBG("Chip config: %x", ataes132a_state[key_id].chip_config);
-	SYS_LOG_DBG("Key ID: %d", key_id);
-	SYS_LOG_DBG("Key config: %x", ataes132a_state[key_id].key_config);
+	LOG_DBG("Chip config: %x", ataes132a_state[key_id].chip_config);
+	LOG_DBG("Key ID: %d", key_id);
+	LOG_DBG("Key config: %x", ataes132a_state[key_id].key_config);
 
 	/* If KeyConfig[key_id].AuthKey is set, then prior authentication
 	 * is required
 	 */
 	if (!(ataes132a_state[key_id].key_config & ATAES_KEYCONFIG_AUTHKEY)) {
-		SYS_LOG_DBG("keep in mind key %x will require"
+		LOG_DBG("keep in mind key %x will require"
 			    " previous authentication", key_id);
 	}
 
@@ -639,19 +640,19 @@ int ataes132a_aes_ecb_block(struct device *dev,
 					     param_buffer, &out_len);
 
 	if (return_code != 0) {
-		SYS_LOG_ERR("legacy command ended with code %d", return_code);
+		LOG_ERR("legacy command ended with code %d", return_code);
 		k_sem_give(&data->device_sem);
 		return -EINVAL;
 	}
 
 	if (out_len != 17) {
-		SYS_LOG_ERR("legacy command response has invalid"
+		LOG_ERR("legacy command response has invalid"
 			    " size %d", out_len);
 		k_sem_give(&data->device_sem);
 		return -EINVAL;
 	}
 	if (param_buffer[0] != 0) {
-		SYS_LOG_ERR("legacy command failed with error"
+		LOG_ERR("legacy command failed with error"
 			    " code %d", param_buffer[0]);
 		k_sem_give(&data->device_sem);
 		return -EIO;
@@ -686,13 +687,13 @@ static int do_ccm_encrypt_mac(struct cipher_ctx *ctx,
 
 	if (aead_op->pkt->in_len <= 16 &&
 	    aead_op->pkt->out_buf_max < 16) {
-		SYS_LOG_ERR("Not enough space available in out buffer.");
+		LOG_ERR("Not enough space available in out buffer.");
 		return -EINVAL;
 	}
 
 	if (aead_op->pkt->in_len > 16 &&
 	    aead_op->pkt->out_buf_max < 32) {
-		SYS_LOG_ERR("Not enough space available in out buffer.");
+		LOG_ERR("Not enough space available in out buffer.");
 		return -EINVAL;
 	}
 
@@ -703,7 +704,7 @@ static int do_ccm_encrypt_mac(struct cipher_ctx *ctx,
 	}
 
 	if (aead_op->ad != NULL || aead_op->ad_len != 0) {
-		SYS_LOG_ERR("Associated data is not supported.");
+		LOG_ERR("Associated data is not supported.");
 		return -EINVAL;
 	}
 
@@ -735,20 +736,20 @@ static int do_ccm_decrypt_auth(struct cipher_ctx *ctx,
 
 	if (aead_op->pkt->in_len <= 16 &&
 	    aead_op->pkt->out_buf_max < 16) {
-		SYS_LOG_ERR("Not enough space available in out buffer.");
+		LOG_ERR("Not enough space available in out buffer.");
 		return -EINVAL;
 	}
 
 	if (aead_op->pkt->in_len > 16 &&
 	    aead_op->pkt->out_buf_max < 32) {
-		SYS_LOG_ERR("Not enough space available in out buffer.");
+		LOG_ERR("Not enough space available in out buffer.");
 		return -EINVAL;
 	}
 
 	aead_op->pkt->ctx = ctx;
 
 	if (aead_op->ad != NULL || aead_op->ad_len != 0) {
-		SYS_LOG_ERR("Associated data is not supported.");
+		LOG_ERR("Associated data is not supported.");
 		return -EINVAL;
 	}
 
@@ -770,7 +771,7 @@ static int do_block(struct cipher_ctx *ctx, struct cipher_pkt *pkt)
 	assert(*(u8_t *)ctx->key.handle == key_id);
 
 	if (pkt->out_buf_max < 16) {
-		SYS_LOG_ERR("Not enough space available in out buffer.");
+		LOG_ERR("Not enough space available in out buffer.");
 		return -EINVAL;
 	}
 
@@ -801,17 +802,17 @@ static int ataes132a_session_setup(struct device *dev, struct cipher_ctx *ctx,
 	u8_t config;
 
 	if (ataes132a_state[key_id].in_use) {
-		SYS_LOG_ERR("Session in progress");
+		LOG_ERR("Session in progress");
 		return -EINVAL;
 	}
 	if (mode == CRYPTO_CIPHER_MODE_CCM &&
 	    ctx->mode_params.ccm_info.tag_len != 16) {
-		SYS_LOG_ERR("ATAES132A support 16 byte tag only.");
+		LOG_ERR("ATAES132A support 16 byte tag only.");
 		return -EINVAL;
 	}
 	if (mode == CRYPTO_CIPHER_MODE_CCM &&
 	    ctx->mode_params.ccm_info.nonce_len != 12) {
-		SYS_LOG_ERR("ATAES132A support 12 byte nonce only.");
+		LOG_ERR("ATAES132A support 12 byte nonce only.");
 		return -EINVAL;
 	}
 
@@ -829,18 +830,18 @@ static int ataes132a_session_setup(struct device *dev, struct cipher_ctx *ctx,
 	ctx->device = dev;
 
 	if (algo != CRYPTO_CIPHER_ALGO_AES) {
-		SYS_LOG_ERR("ATAES132A unsupported algorithm");
+		LOG_ERR("ATAES132A unsupported algorithm");
 		return -EINVAL;
 	}
 
 	/*ATAES132A support I2C polling only*/
 	if (!(ctx->flags & CAP_SYNC_OPS)) {
-		SYS_LOG_ERR("Async not supported by this driver");
+		LOG_ERR("Async not supported by this driver");
 		return -EINVAL;
 	}
 
 	if (ctx->keylen != ATAES132A_AES_KEY_SIZE) {
-		SYS_LOG_ERR("ATAES132A unsupported key size");
+		LOG_ERR("ATAES132A unsupported key size");
 		return -EINVAL;
 	}
 
@@ -853,7 +854,7 @@ static int ataes132a_session_setup(struct device *dev, struct cipher_ctx *ctx,
 			ctx->ops.ccm_crypt_hndlr = do_ccm_encrypt_mac;
 			break;
 		default:
-			SYS_LOG_ERR("ATAES132A unsupported mode");
+			LOG_ERR("ATAES132A unsupported mode");
 			return -EINVAL;
 		}
 	} else {
@@ -865,7 +866,7 @@ static int ataes132a_session_setup(struct device *dev, struct cipher_ctx *ctx,
 			ctx->ops.ccm_crypt_hndlr = do_ccm_decrypt_auth;
 			break;
 		default:
-			SYS_LOG_ERR("ATAES132A unsupported mode");
+			LOG_ERR("ATAES132A unsupported mode");
 			return -EINVAL;
 		}
 	}
diff --git a/drivers/crypto/crypto_mtls_shim.c b/drivers/crypto/crypto_mtls_shim.c
index 76de0841ec21..dbd8dd3037fd 100644
--- a/drivers/crypto/crypto_mtls_shim.c
+++ b/drivers/crypto/crypto_mtls_shim.c
@@ -8,8 +8,6 @@
  * @file Shim layer for mbedTLS, crypto API compliant.
  */
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_CRYPTO_LEVEL
-#include <logging/sys_log.h>
 
 #include <kernel.h>
 #include <init.h>
@@ -27,6 +25,10 @@
 
 #define MTLS_SUPPORT (CAP_RAW_KEY | CAP_SEPARATE_IO_BUFS | CAP_SYNC_OPS)
 
+#define LOG_LEVEL CONFIG_CRYPTO_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(mbedtls);
+
 struct mtls_shim_session {
 	mbedtls_ccm_context mtls;
 	bool in_use;
@@ -57,7 +59,7 @@ static int mtls_ccm_encrypt_auth(struct cipher_ctx *ctx,
 					  apkt->pkt->out_buf, apkt->tag,
 					  ctx->mode_params.ccm_info.tag_len);
 	if (ret) {
-		SYS_LOG_ERR("Could non encrypt/auth (%d)", ret);
+		LOG_ERR("Could non encrypt/auth (%d)", ret);
 
 		/*ToDo: try to return relevant code depending on ret? */
 		return -EINVAL;
@@ -87,7 +89,7 @@ static int mtls_ccm_decrypt_auth(struct cipher_ctx *ctx,
 				       apkt->pkt->out_buf, apkt->tag,
 				       ctx->mode_params.ccm_info.tag_len);
 	if (ret) {
-		SYS_LOG_ERR("Could non decrypt/auth (%d)", ret);
+		LOG_ERR("Could non decrypt/auth (%d)", ret);
 
 		/*ToDo: try to return relevant code depending on ret? */
 		return -EINVAL;
@@ -122,28 +124,28 @@ static int mtls_session_setup(struct device *dev, struct cipher_ctx *ctx,
 	int ret;
 
 	if (ctx->flags & ~(MTLS_SUPPORT)) {
-		SYS_LOG_ERR("Unsupported flag");
+		LOG_ERR("Unsupported flag");
 		return -EINVAL;
 	}
 
 	if (algo != CRYPTO_CIPHER_ALGO_AES) {
-		SYS_LOG_ERR("Unsupported algo");
+		LOG_ERR("Unsupported algo");
 		return -EINVAL;
 	}
 
 	if (mode != CRYPTO_CIPHER_MODE_CCM) {
-		SYS_LOG_ERR("Unsupported mode");
+		LOG_ERR("Unsupported mode");
 		return -EINVAL;
 	}
 
 	if (ctx->keylen != 16) {
-		SYS_LOG_ERR("%u key size is not supported", ctx->keylen);
+		LOG_ERR("%u key size is not supported", ctx->keylen);
 		return -EINVAL;
 	}
 
 	ctx_idx = mtls_get_unused_session_index();
 	if (ctx_idx < 0) {
-		SYS_LOG_ERR("No free session for now");
+		LOG_ERR("No free session for now");
 		return -ENOSPC;
 	}
 
@@ -154,7 +156,7 @@ static int mtls_session_setup(struct device *dev, struct cipher_ctx *ctx,
 	ret = mbedtls_ccm_setkey(mtls_ctx, MBEDTLS_CIPHER_ID_AES,
 				 ctx->key.bit_stream, ctx->keylen * 8);
 	if (ret) {
-		SYS_LOG_ERR("Could not setup the key (%d)", ret);
+		LOG_ERR("Could not setup the key (%d)", ret);
 		mtls_sessions[ctx_idx].in_use = false;
 
 		return -EINVAL;
diff --git a/drivers/crypto/crypto_tc_shim.c b/drivers/crypto/crypto_tc_shim.c
index b41d753f41cb..743c196aae3e 100644
--- a/drivers/crypto/crypto_tc_shim.c
+++ b/drivers/crypto/crypto_tc_shim.c
@@ -17,9 +17,9 @@
 #include <crypto/cipher.h>
 #include "crypto_tc_shim_priv.h"
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_CRYPTO_LEVEL
-#include <logging/sys_log.h>
-
+#define LOG_LEVEL CONFIG_CRYPTO_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(tinycrypt);
 
 #define CRYPTO_MAX_SESSION CONFIG_CRYPTO_TINYCRYPT_SHIM_MAX_SESSION
 
@@ -35,7 +35,7 @@ static int do_cbc_encrypt(struct cipher_ctx *ctx, struct cipher_pkt *op,
 				op->in_buf, op->in_len,
 				iv,
 				&data->session_key) == TC_CRYPTO_FAIL) {
-		SYS_LOG_ERR("TC internal error during CBC encryption");
+		LOG_ERR("TC internal error during CBC encryption");
 		return -EIO;
 	}
 
@@ -54,7 +54,7 @@ static int do_cbc_decrypt(struct cipher_ctx *ctx, struct cipher_pkt *op,
 	 * buffer for efficieny
 	 */
 	if (iv != op->in_buf) {
-		SYS_LOG_ERR("TC needs contiguous iv and ciphertext");
+		LOG_ERR("TC needs contiguous iv and ciphertext");
 		return -EIO;
 	}
 
@@ -63,7 +63,7 @@ static int do_cbc_decrypt(struct cipher_ctx *ctx, struct cipher_pkt *op,
 			op->in_buf + TC_AES_BLOCK_SIZE,
 			op->in_len - TC_AES_BLOCK_SIZE,
 			op->in_buf, &data->session_key) == TC_CRYPTO_FAIL) {
-		SYS_LOG_ERR("Func TC internal error during CBC decryption");
+		LOG_ERR("Func TC internal error during CBC decryption");
 		return -EIO;
 	}
 
@@ -88,7 +88,7 @@ static int do_ctr_op(struct cipher_ctx *ctx, struct cipher_pkt *op,
 	if (tc_ctr_mode(op->out_buf, op->out_buf_max, op->in_buf,
 			op->in_len, ctr,
 			&data->session_key) == TC_CRYPTO_FAIL) {
-		SYS_LOG_ERR("TC internal error during CTR OP");
+		LOG_ERR("TC internal error during CTR OP");
 		return -EIO;
 	}
 
@@ -109,14 +109,14 @@ static int do_ccm_encrypt_mac(struct cipher_ctx *ctx,
 	if (tc_ccm_config(&ccm, &data->session_key, nonce,
 			ccm_param->nonce_len,
 			ccm_param->tag_len) == TC_CRYPTO_FAIL) {
-		SYS_LOG_ERR("TC internal error during CCM encryption config");
+		LOG_ERR("TC internal error during CCM encryption config");
 		return -EIO;
 	}
 
 	if (tc_ccm_generation_encryption(op->out_buf, op->out_buf_max,
 					 aead_op->ad, aead_op->ad_len, op->in_buf,
 					 op->in_len, &ccm) == TC_CRYPTO_FAIL) {
-		SYS_LOG_ERR("TC internal error during CCM Encryption OP");
+		LOG_ERR("TC internal error during CCM Encryption OP");
 		return -EIO;
 	}
 
@@ -147,7 +147,7 @@ static int do_ccm_decrypt_auth(struct cipher_ctx *ctx,
 	if (tc_ccm_config(&ccm, &data->session_key, nonce,
 			  ccm_param->nonce_len,
 			  ccm_param->tag_len) == TC_CRYPTO_FAIL) {
-		SYS_LOG_ERR("TC internal error during CCM decryption config");
+		LOG_ERR("TC internal error during CCM decryption config");
 		return -EIO;
 	}
 
@@ -156,7 +156,7 @@ static int do_ccm_decrypt_auth(struct cipher_ctx *ctx,
 	 * be moved to a ctx.flag check during session_setup, later.
 	 */
 	if (aead_op->tag != op->in_buf + op->in_len) {
-		SYS_LOG_ERR("TC needs contiguous hash  at the end of inbuf");
+		LOG_ERR("TC needs contiguous hash  at the end of inbuf");
 		return -EIO;
 	}
 
@@ -165,7 +165,7 @@ static int do_ccm_decrypt_auth(struct cipher_ctx *ctx,
 					   op->in_buf,
 					   op->in_len + ccm_param->tag_len,
 					   &ccm) == TC_CRYPTO_FAIL) {
-		SYS_LOG_ERR("TC internal error during CCM decryption OP");
+		LOG_ERR("TC internal error during CCM decryption OP");
 		return -EIO;
 	}
 
@@ -199,7 +199,7 @@ static int tc_session_setup(struct device *dev, struct cipher_ctx *ctx,
 
 	/* The shim currently supports only CBC or CTR mode for AES */
 	if (algo != CRYPTO_CIPHER_ALGO_AES) {
-		SYS_LOG_ERR("TC Shim Unsupported algo");
+		LOG_ERR("TC Shim Unsupported algo");
 		return -EINVAL;
 	}
 
@@ -207,13 +207,13 @@ static int tc_session_setup(struct device *dev, struct cipher_ctx *ctx,
 	 * make sense.
 	 */
 	if (!(ctx->flags & CAP_SYNC_OPS)) {
-		SYS_LOG_ERR("Async not supported by this driver");
+		LOG_ERR("Async not supported by this driver");
 		return -EINVAL;
 	}
 
 	if (ctx->keylen != TC_AES_KEY_SIZE) {
 		/* TinyCrypt supports only 128 bits */
-		SYS_LOG_ERR("TC Shim Unsupported key size");
+		LOG_ERR("TC Shim Unsupported key size");
 		return -EINVAL;
 	}
 
@@ -224,7 +224,7 @@ static int tc_session_setup(struct device *dev, struct cipher_ctx *ctx,
 			break;
 		case CRYPTO_CIPHER_MODE_CTR:
 			if (ctx->mode_params.ctr_info.ctr_len != 32) {
-				SYS_LOG_ERR("Tinycrypt supports only 32 bit "
+				LOG_ERR("Tinycrypt supports only 32 bit "
 					    "counter");
 				return -EINVAL;
 			}
@@ -234,7 +234,7 @@ static int tc_session_setup(struct device *dev, struct cipher_ctx *ctx,
 			ctx->ops.ccm_crypt_hndlr = do_ccm_encrypt_mac;
 			break;
 		default:
-			SYS_LOG_ERR("TC Shim Unsupported mode");
+			LOG_ERR("TC Shim Unsupported mode");
 			return -EINVAL;
 		}
 	} else {
@@ -245,7 +245,7 @@ static int tc_session_setup(struct device *dev, struct cipher_ctx *ctx,
 		case CRYPTO_CIPHER_MODE_CTR:
 			/* Maybe validate CTR length */
 			if (ctx->mode_params.ctr_info.ctr_len != 32) {
-				SYS_LOG_ERR("Tinycrypt supports only 32 bit "
+				LOG_ERR("Tinycrypt supports only 32 bit "
 					    "counter");
 				return -EINVAL;
 			}
@@ -255,7 +255,7 @@ static int tc_session_setup(struct device *dev, struct cipher_ctx *ctx,
 			ctx->ops.ccm_crypt_hndlr = do_ccm_decrypt_auth;
 			break;
 		default:
-			SYS_LOG_ERR("TC Shim Unsupported mode");
+			LOG_ERR("TC Shim Unsupported mode");
 			return -EINVAL;
 		}
 
@@ -265,7 +265,7 @@ static int tc_session_setup(struct device *dev, struct cipher_ctx *ctx,
 
 	idx = get_unused_session();
 	if (idx == CRYPTO_MAX_SESSION) {
-		SYS_LOG_ERR("Max sessions in progress");
+		LOG_ERR("Max sessions in progress");
 		return -ENOSPC;
 	}
 
@@ -273,7 +273,7 @@ static int tc_session_setup(struct device *dev, struct cipher_ctx *ctx,
 
 	if (tc_aes128_set_encrypt_key(&data->session_key, ctx->key.bit_stream)
 			 == TC_CRYPTO_FAIL) {
-		SYS_LOG_ERR("TC internal error in setting key");
+		LOG_ERR("TC internal error in setting key");
 		tc_driver_state[idx].in_use = 0;
 
 		return -EIO;
diff --git a/drivers/display/Kconfig b/drivers/display/Kconfig
index a239bde711e7..4e8e6d809c38 100644
--- a/drivers/display/Kconfig
+++ b/drivers/display/Kconfig
@@ -13,6 +13,10 @@ menuconfig DISPLAY
 
 if DISPLAY
 
+module = DISPLAY
+module-str = display
+source "subsys/logging/Kconfig.template.log_config"
+
 source "drivers/display/Kconfig.microbit"
 
 source "drivers/display/Kconfig.ili9340"
diff --git a/drivers/display/Kconfig.ili9340 b/drivers/display/Kconfig.ili9340
index 2fb272f542c8..cec46104d58f 100644
--- a/drivers/display/Kconfig.ili9340
+++ b/drivers/display/Kconfig.ili9340
@@ -38,20 +38,6 @@ config ILI9340_SPI_FREQ
 	help
 	Frequency to be used to communicate with the ILI9340.
 
-config LOG_ILI9340_LEVEL
-	int "ILI9340 Log level"
-	depends on LOG
-	default 0
-	range 0 4
-	help
-	Sets log level for ILI9340 display driver.
-	Levels are:
-	- 0 OFF: do not write
-	- 1 ERROR: only write LOG_ERR
-	- 2 WARNING: write LOG_WRN in addition to previous level
-	- 3 INFO: write LOG_INF in addition to previous levels
-	- 4 DEBUG: write LOG_DBG in addition to previous levels
-
 config ILI9340_RESET_GPIO_PORT_NAME
 	string "Reset GPIO controller port name"
 	default "GPIO_0"
diff --git a/drivers/display/display_ili9340.c b/drivers/display/display_ili9340.c
index bde1aa2994b6..b2ad7838d338 100644
--- a/drivers/display/display_ili9340.c
+++ b/drivers/display/display_ili9340.c
@@ -7,9 +7,9 @@
 #include "display_ili9340.h"
 #include <display.h>
 
-#define LOG_LEVEL CONFIG_LOG_ILI9340_LEVEL
+#define LOG_LEVEL CONFIG_DISPLAY_LOG_LEVEL
 #include <logging/log.h>
-LOG_MODULE_REGISTER(display);
+LOG_MODULE_REGISTER(display_ili9340);
 
 #include <gpio.h>
 #include <misc/byteorder.h>
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index d1c973c7e2fc..e8948f183bd7 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -49,19 +49,9 @@ config DMA_2_IRQ_PRI
 	help
 	  IRQ Priority for DMA Controller 2.
 
-config SYS_LOG_DMA_LEVEL
-	int "DMA Driver Log level"
-	depends on SYS_LOG
-	default 0
-	range 0 4
-	help
-	  Sets log level for DMA drivers.
-	  Levels are:
-	  0 OFF, do not write
-	  1 ERROR, only write SYS_LOG_ERR
-	  2 WARNING, write SYS_LOG_WRN in addition to previous level
-	  3 INFO, write SYS_LOG_INF in addition to previous levels
-	  4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = DMA
+module-str = dma
+source "subsys/logging/Kconfig.template.log_config"
 
 config DCACHE_WRITEBACK
 	bool "Data Cache Writeback"
diff --git a/drivers/dma/dma_cavs.c b/drivers/dma/dma_cavs.c
index 1de42ae52f48..a516e286afac 100644
--- a/drivers/dma/dma_cavs.c
+++ b/drivers/dma/dma_cavs.c
@@ -16,9 +16,9 @@
 
 #include "dma_cavs.h"
 
-#define SYS_LOG_DOMAIN "dev/dma_cavs"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_DMA_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTEr(dma_cavs)
 
 #define BYTE				(1)
 #define WORD				(2)
@@ -67,7 +67,7 @@ static void dw_dma_isr(void *arg)
 
 	status_intr = dw_read(dev_cfg->base, DW_INTR_STATUS);
 	if (!status_intr) {
-		SYS_LOG_ERR("status_intr = %d", status_intr);
+		LOG_ERR("status_intr = %d", status_intr);
 	}
 
 	/* get the source of our IRQ. */
@@ -77,7 +77,7 @@ static void dw_dma_isr(void *arg)
 	/* TODO: handle errors, just clear them atm */
 	status_err = dw_read(dev_cfg->base, DW_STATUS_ERR);
 	if (status_err) {
-		SYS_LOG_ERR("status_err = %d\n", status_err);
+		LOG_ERR("status_err = %d\n", status_err);
 		dw_write(dev_cfg->base, DW_CLEAR_ERR, status_err);
 	}
 
@@ -135,7 +135,7 @@ static int dw_dma_config(struct device *dev, u32_t channel,
 
 	if (cfg->source_data_size != BYTE && cfg->source_data_size != WORD &&
 	    cfg->source_data_size != DWORD) {
-		SYS_LOG_ERR("Invalid 'source_data_size' value");
+		LOG_ERR("Invalid 'source_data_size' value");
 		return -EINVAL;
 	}
 
@@ -148,11 +148,11 @@ static int dw_dma_config(struct device *dev, u32_t channel,
 
 	/* data_size = (2 ^ tr_width) */
 	tr_width = find_msb_set(cfg->source_data_size) - 1;
-	SYS_LOG_DBG("tr_width=%d", tr_width);
+	LOG_DBG("tr_width=%d", tr_width);
 
 	/* burst_size = (2 ^ msize) */
 	m_size = find_msb_set(cfg->source_burst_length) - 1;
-	SYS_LOG_DBG("m_size=%d", m_size);
+	LOG_DBG("m_size=%d", m_size);
 
 	cfg_blocks = cfg->head_block;
 
@@ -160,7 +160,7 @@ static int dw_dma_config(struct device *dev, u32_t channel,
 	chan_data->lli = (struct dw_lli2 *)k_malloc(sizeof(struct dw_lli2)
 							* (cfg->block_count));
 	if (chan_data->lli == NULL) {
-		SYS_LOG_ERR("not enough memory\n");
+		LOG_ERR("not enough memory\n");
 		return -ENOMEM;
 	}
 
@@ -211,7 +211,7 @@ static int dw_dma_config(struct device *dev, u32_t channel,
 			break;
 
 		default:
-			SYS_LOG_ERR("channel_direction %d is not supported",
+			LOG_ERR("channel_direction %d is not supported",
 				    cfg->channel_direction);
 			return -EINVAL;
 		}
@@ -362,7 +362,7 @@ static void dw_dma_setup(struct device *dev)
 			goto found;
 		}
 	}
-	SYS_LOG_ERR("DW_DMA_CFG is non-zero\n");
+	LOG_ERR("DW_DMA_CFG is non-zero\n");
 	return;
 
 found:
@@ -400,7 +400,7 @@ static int dw_dma0_initialize(struct device *dev)
 	/* Enable module's IRQ */
 	irq_enable(dev_cfg->irq_id);
 
-	SYS_LOG_INF("Device %s initialized", DEV_NAME(dev));
+	LOG_INF("Device %s initialized", DEV_NAME(dev));
 
 	return 0;
 }
diff --git a/drivers/dma/dma_nios2_msgdma.c b/drivers/dma/dma_nios2_msgdma.c
index 455a2749fd42..967e293c094b 100644
--- a/drivers/dma/dma_nios2_msgdma.c
+++ b/drivers/dma/dma_nios2_msgdma.c
@@ -15,8 +15,9 @@
 #include "altera_msgdma_descriptor_regs.h"
 #include "altera_msgdma.h"
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_DMA_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(dma_nios2)
 
 /* Device configuration parameters */
 struct nios2_msgdma_dev_cfg {
@@ -58,7 +59,7 @@ static void nios2_msgdma_callback(void *context)
 		err_code = 0;
 	}
 
-	SYS_LOG_DBG("msgdma csr status Reg: 0x%x", status);
+	LOG_DBG("msgdma csr status Reg: 0x%x", status);
 
 	dev_cfg->dma_callback((struct device *)context, 0, err_code);
 }
@@ -73,29 +74,29 @@ static int nios2_msgdma_config(struct device *dev, u32_t channel,
 
 	/* Nios-II MSGDMA supports only one channel per DMA core */
 	if (channel != 0) {
-		SYS_LOG_ERR("invalid channel number");
+		LOG_ERR("invalid channel number");
 		return -EINVAL;
 	}
 
 #if MSGDMA_0_CSR_PREFETCHER_ENABLE
 	if (cfg->block_count > 1) {
-		SYS_LOG_ERR("driver yet add support multiple descriptors");
+		LOG_ERR("driver yet add support multiple descriptors");
 		return -EINVAL;
 	}
 #else
 	if (cfg->block_count != 1) {
-		SYS_LOG_ERR("invalid block count!!");
+		LOG_ERR("invalid block count!!");
 		return -EINVAL;
 	}
 #endif
 
 	if (cfg->head_block == NULL) {
-		SYS_LOG_ERR("head_block ptr NULL!!");
+		LOG_ERR("head_block ptr NULL!!");
 		return -EINVAL;
 	}
 
 	if (cfg->head_block->block_size > MSGDMA_0_DESCRIPTOR_SLAVE_MAX_BYTE) {
-		SYS_LOG_ERR("DMA error: Data size too big: %d",
+		LOG_ERR("DMA error: Data size too big: %d",
 			    cfg->head_block->block_size);
 		return -EINVAL;
 	}
@@ -127,7 +128,7 @@ static int nios2_msgdma_config(struct device *dev, u32_t channel,
 			dma_block->block_size,
 			control);
 	} else {
-		SYS_LOG_ERR("invalid channel direction");
+		LOG_ERR("invalid channel direction");
 		status = -EINVAL;
 	}
 
@@ -154,7 +155,7 @@ static int nios2_msgdma_transfer_start(struct device *dev, u32_t channel)
 
 	/* Nios-II mSGDMA supports only one channel per DMA core */
 	if (channel != 0) {
-		SYS_LOG_ERR("Invalid channel number");
+		LOG_ERR("Invalid channel number");
 		return -EINVAL;
 	}
 
@@ -164,7 +165,7 @@ static int nios2_msgdma_transfer_start(struct device *dev, u32_t channel)
 	k_sem_give(&cfg->sem_lock);
 
 	if (status < 0) {
-		SYS_LOG_ERR("DMA transfer error (%d)", status);
+		LOG_ERR("DMA transfer error (%d)", status);
 	}
 
 	return status;
@@ -185,11 +186,11 @@ static int nios2_msgdma_transfer_stop(struct device *dev, u32_t channel)
 	k_sem_give(&cfg->sem_lock);
 
 	if (status & ALTERA_MSGDMA_CSR_STOP_STATE_MASK) {
-		SYS_LOG_DBG("DMA Dispatcher stopped");
+		LOG_DBG("DMA Dispatcher stopped");
 		ret = 0;
 	}
 
-	SYS_LOG_DBG("msgdma csr status Reg: 0x%x", status);
+	LOG_DBG("msgdma csr status Reg: 0x%x", status);
 
 	return status;
 }
diff --git a/drivers/dma/dma_sam_xdmac.c b/drivers/dma/dma_sam_xdmac.c
index a7c5c80e0031..39c15495f488 100644
--- a/drivers/dma/dma_sam_xdmac.c
+++ b/drivers/dma/dma_sam_xdmac.c
@@ -17,9 +17,9 @@
 #include <dma.h>
 #include "dma_sam_xdmac.h"
 
-#define SYS_LOG_DOMAIN "dev/dma_sam_xdmac"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_DMA_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(dma_sam_xdmac)
 
 #define XDMAC_INT_ERR (XDMAC_CIE_RBIE | XDMAC_CIE_WBIE | XDMAC_CIE_ROIE)
 #define DMA_CHANNELS_NO  XDMACCHID_NUMBER
@@ -191,20 +191,20 @@ static int sam_xdmac_config(struct device *dev, u32_t channel,
 
 	if (cfg->source_data_size != 1 && cfg->source_data_size != 2 &&
 	    cfg->source_data_size != 4) {
-		SYS_LOG_ERR("Invalid 'source_data_size' value");
+		LOG_ERR("Invalid 'source_data_size' value");
 		return -EINVAL;
 	}
 
 	if (cfg->block_count != 1) {
-		SYS_LOG_ERR("Only single block transfer is currently supported."
+		LOG_ERR("Only single block transfer is currently supported."
 			    " Please submit a patch.");
 		return -EINVAL;
 	}
 
 	burst_size = find_msb_set(cfg->source_burst_length) - 1;
-	SYS_LOG_DBG("burst_size=%d", burst_size);
+	LOG_DBG("burst_size=%d", burst_size);
 	data_size = find_msb_set(cfg->source_data_size) - 1;
-	SYS_LOG_DBG("data_size=%d", data_size);
+	LOG_DBG("data_size=%d", data_size);
 
 	switch (cfg->channel_direction) {
 	case MEMORY_TO_MEMORY:
@@ -231,7 +231,7 @@ static int sam_xdmac_config(struct device *dev, u32_t channel,
 			| XDMAC_CC_DAM_INCREMENTED_AM;
 		break;
 	default:
-		SYS_LOG_ERR("'channel_direction' value %d is not supported",
+		LOG_ERR("'channel_direction' value %d is not supported",
 			    cfg->channel_direction);
 		return -EINVAL;
 	}
@@ -330,7 +330,7 @@ static int sam_xdmac_initialize(struct device *dev)
 	/* Enable module's IRQ */
 	irq_enable(dev_cfg->irq_id);
 
-	SYS_LOG_INF("Device %s initialized", DEV_NAME(dev));
+	LOG_INF("Device %s initialized", DEV_NAME(dev));
 
 	return 0;
 }
diff --git a/drivers/dma/dma_stm32f4x.c b/drivers/dma/dma_stm32f4x.c
index 3964235ee981..50717e73366b 100644
--- a/drivers/dma/dma_stm32f4x.c
+++ b/drivers/dma/dma_stm32f4x.c
@@ -5,17 +5,19 @@
  *
  */
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_DMA_LEVEL
 
 #include <board.h>
 #include <device.h>
 #include <dma.h>
 #include <errno.h>
 #include <init.h>
-#include <logging/sys_log.h>
 #include <stdio.h>
 #include <string.h>
 
+#define LOG_LEVEL CONFIG_DMA_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(dma_stm32f4x)
+
 #include <clock_control/stm32_clock_control.h>
 
 #define DMA_STM32_MAX_STREAMS	8	/* Number of streams per controller */
@@ -166,7 +168,7 @@ struct dma_stm32_config {
 #define   DMA_STM32_SFCR_MASK		(DMA_STM32_SFCR_FEIE \
 					 | DMA_STM32_SFCR_DMDIS)
 
-#define SYS_LOG_U32			__attribute((__unused__)) u32_t
+#define LOG_U32			__attribute((__unused__)) u32_t
 
 static void dma_stm32_1_config(struct dma_stm32_device *ddata);
 static void dma_stm32_2_config(struct dma_stm32_device *ddata);
@@ -184,18 +186,18 @@ static void dma_stm32_write(struct dma_stm32_device *ddata,
 
 static void dma_stm32_dump_reg(struct dma_stm32_device *ddata, u32_t id)
 {
-	SYS_LOG_INF("Using stream: %d\n", id);
-	SYS_LOG_INF("SCR:   0x%x \t(config)\n",
+	LOG_INF("Using stream: %d\n", id);
+	LOG_INF("SCR:   0x%x \t(config)\n",
 		    dma_stm32_read(ddata, DMA_STM32_SCR(id)));
-	SYS_LOG_INF("SNDTR:  0x%x \t(length)\n",
+	LOG_INF("SNDTR:  0x%x \t(length)\n",
 		    dma_stm32_read(ddata, DMA_STM32_SNDTR(id)));
-	SYS_LOG_INF("SPAR:  0x%x \t(source)\n",
+	LOG_INF("SPAR:  0x%x \t(source)\n",
 		    dma_stm32_read(ddata, DMA_STM32_SPAR(id)));
-	SYS_LOG_INF("SM0AR: 0x%x \t(destination)\n",
+	LOG_INF("SM0AR: 0x%x \t(destination)\n",
 		    dma_stm32_read(ddata, DMA_STM32_SM0AR(id)));
-	SYS_LOG_INF("SM1AR: 0x%x \t(destination (double buffer mode))\n",
+	LOG_INF("SM1AR: 0x%x \t(destination (double buffer mode))\n",
 		    dma_stm32_read(ddata, DMA_STM32_SM1AR(id)));
-	SYS_LOG_INF("SFCR:  0x%x \t(fifo control)\n",
+	LOG_INF("SFCR:  0x%x \t(fifo control)\n",
 		    dma_stm32_read(ddata, DMA_STM32_SFCR(id)));
 }
 
@@ -249,7 +251,7 @@ static void dma_stm32_irq_handler(void *arg, u32_t id)
 
 		stream->dma_callback(stream->dev, id, 0);
 	} else {
-		SYS_LOG_ERR("Internal error: IRQ status: 0x%x\n", irqstatus);
+		LOG_ERR("Internal error: IRQ status: 0x%x\n", irqstatus);
 		dma_stm32_irq_clear(ddata, id, irqstatus);
 
 		stream->dma_callback(stream->dev, id, -EIO);
@@ -277,7 +279,7 @@ static int dma_stm32_disable_stream(struct dma_stm32_device *ddata,
 		/* After trying for 5 seconds, give up */
 		k_sleep(K_SECONDS(5));
 		if (count++ > (5 * 1000) / 50) {
-			SYS_LOG_ERR("DMA error: Stream in use\n");
+			LOG_ERR("DMA error: Stream in use\n");
 			return -EBUSY;
 		}
 	}
@@ -319,7 +321,7 @@ static int dma_stm32_config_devcpy(struct device *dev, u32_t id,
 			DMA_STM32_SCR_MINC;
 		break;
 	default:
-		SYS_LOG_ERR("DMA error: Direction not supported: %d",
+		LOG_ERR("DMA error: Direction not supported: %d",
 			    direction);
 		return -EINVAL;
 	}
@@ -373,7 +375,7 @@ static int dma_stm32_config(struct device *dev, u32_t id,
 	}
 
 	if (config->head_block->block_size > DMA_STM32_MAX_DATA_ITEMS) {
-		SYS_LOG_ERR("DMA error: Data size too big: %d\n",
+		LOG_ERR("DMA error: Data size too big: %d\n",
 		       config->head_block->block_size);
 		return -EINVAL;
 	}
diff --git a/drivers/entropy/Kconfig b/drivers/entropy/Kconfig
index 4ea5b387dc03..36aa00b8f1ee 100644
--- a/drivers/entropy/Kconfig
+++ b/drivers/entropy/Kconfig
@@ -31,18 +31,4 @@ config ENTROPY_NAME
 	help
 	  Specify the device name to be used for the ENTROPY driver.
 
-config SYS_LOG_ENTROPY_LEVEL
-	int "Random Log level"
-	depends on SYS_LOG
-	default 0
-	range 0 4
-	help
-	  Sets log level for entropy driver.
-	  Levels are:
-	  - 0 OFF: do not write
-	  - 1 ERROR: only write SYS_LOG_ERR
-	  - 2 WARNING: write SYS_LOG_WRN in addition to previous level
-	  - 3 INFO: write SYS_LOG_INF in addition to previous levels
-	  - 4 DEBUG: write SYS_LOG_DBG in addition to previous levels
-
 endif
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d0e01bc7b4b3..e4fd4e93c364 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -13,24 +13,9 @@ menuconfig GPIO
 
 if GPIO
 
-config SYS_LOG_GPIO_LEVEL
-	int "GPIO drivers log level"
-	default 0
-	depends on SYS_LOG
-	help
-	  Sets log level for GPIO drivers
-
-	  Levels are:
-
-	  - 0 OFF, do not write
-
-	  - 1 ERROR, only write SYS_LOG_ERR
-
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = GPIO
+module-str = gpio
+source "subsys/logging/Kconfig.template.log_config"
 
 source "drivers/gpio/Kconfig.dw"
 
diff --git a/drivers/gpio/Kconfig.pcal9535a b/drivers/gpio/Kconfig.pcal9535a
index e80f3f990bb0..a64695f3ce6f 100644
--- a/drivers/gpio/Kconfig.pcal9535a
+++ b/drivers/gpio/Kconfig.pcal9535a
@@ -14,25 +14,6 @@ menuconfig GPIO_PCAL9535A
 
 if GPIO_PCAL9535A
 
-config SYS_LOG_GPIO_PCAL9535A_LEVEL
-	int "PCAL9535A driver log level"
-	depends on GPIO_PCAL9535A && SYS_LOG
-	default 0
-	help
-	  Sets log level for clock PCAL9535A driver
-
-	  Levels are:
-
-	  - 0 OFF, do not write
-
-	  - 1 ERROR, only write SYS_LOG_ERR
-
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
-
 config GPIO_PCAL9535A_INIT_PRIORITY
 	int "Init priority"
 	default 70
diff --git a/drivers/gpio/gpio_pcal9535a.c b/drivers/gpio/gpio_pcal9535a.c
index 98ba0c8125ce..9e607e73f9f2 100644
--- a/drivers/gpio/gpio_pcal9535a.c
+++ b/drivers/gpio/gpio_pcal9535a.c
@@ -19,8 +19,9 @@
 
 #include "gpio_pcal9535a.h"
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_GPIO_PCAL9535A_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(gpio_pcal9535a);
 
 /* Register definitions */
 #define REG_INPUT_PORT0			0x00
@@ -89,13 +90,13 @@ static int _read_port_regs(struct device *dev, u8_t reg,
 
 	ret = i2c_burst_read(i2c_master, i2c_addr, reg, buf->byte, 2);
 	if (ret) {
-		SYS_LOG_ERR("PCAL9535A[0x%X]: error reading register 0x%X (%d)",
-			    i2c_addr, reg, ret);
+		LOG_ERR("PCAL9535A[0x%X]: error reading register 0x%X (%d)",
+			i2c_addr, reg, ret);
 		goto error;
 	}
 
-	SYS_LOG_DBG("PCAL9535A[0x%X]: Read: REG[0x%X] = 0x%X, REG[0x%X] = 0x%X",
-		    i2c_addr, reg, buf->byte[0], (reg + 1), buf->byte[1]);
+	LOG_DBG("PCAL9535A[0x%X]: Read: REG[0x%X] = 0x%X, REG[0x%X] = 0x%X",
+		i2c_addr, reg, buf->byte[0], (reg + 1), buf->byte[1]);
 
 error:
 	return ret;
@@ -123,14 +124,14 @@ static int _write_port_regs(struct device *dev, u8_t reg,
 	u16_t i2c_addr = config->i2c_slave_addr;
 	int ret;
 
-	SYS_LOG_DBG("PCAL9535A[0x%X]: Write: REG[0x%X] = 0x%X, REG[0x%X] = "
-		    "0x%X", i2c_addr, reg, buf->byte[0], (reg + 1),
-		    buf->byte[1]);
+	LOG_DBG("PCAL9535A[0x%X]: Write: REG[0x%X] = 0x%X, REG[0x%X] = "
+		"0x%X", i2c_addr, reg, buf->byte[0], (reg + 1),
+		buf->byte[1]);
 
 	ret = i2c_burst_write(i2c_master, i2c_addr, reg, buf->byte, 2);
 	if (ret) {
-		SYS_LOG_ERR("PCAL9535A[0x%X]: error writing from register 0x%X "
-			    "(%d)", i2c_addr, reg, ret);
+		LOG_ERR("PCAL9535A[0x%X]: error writing from register 0x%X "
+			"(%d)", i2c_addr, reg, ret);
 	}
 
 	return ret;
@@ -351,7 +352,7 @@ static int gpio_pcal9535a_config(struct device *dev, int access_op,
 {
 	int ret;
 
-#if (CONFIG_SYS_LOG_GPIO_PCAL9535A_LEVEL >= SYS_LOG_LEVEL_DEBUG)
+#if (CONFIG_GPIO_LOG_LEVEL >= LOG_LEVEL_DEBUG)
 	const struct gpio_pcal9535a_config * const config =
 		dev->config->config_info;
 	u16_t i2c_addr = config->i2c_slave_addr;
@@ -363,22 +364,22 @@ static int gpio_pcal9535a_config(struct device *dev, int access_op,
 
 	ret = _setup_pin_dir(dev, access_op, pin, flags);
 	if (ret) {
-		SYS_LOG_ERR("PCAL9535A[0x%X]: error setting pin direction (%d)",
-			    i2c_addr, ret);
+		LOG_ERR("PCAL9535A[0x%X]: error setting pin direction (%d)",
+			i2c_addr, ret);
 		goto done;
 	}
 
 	ret = _setup_pin_polarity(dev, access_op, pin, flags);
 	if (ret) {
-		SYS_LOG_ERR("PCAL9535A[0x%X]: error setting pin polarity (%d)",
-			    i2c_addr, ret);
+		LOG_ERR("PCAL9535A[0x%X]: error setting pin polarity (%d)",
+			i2c_addr, ret);
 		goto done;
 	}
 
 	ret = _setup_pin_pullupdown(dev, access_op, pin, flags);
 	if (ret) {
-		SYS_LOG_ERR("PCAL9535A[0x%X]: error setting pin pull up/down "
-			    "(%d)", i2c_addr, ret);
+		LOG_ERR("PCAL9535A[0x%X]: error setting pin pull up/down "
+			"(%d)", i2c_addr, ret);
 		goto done;
 	}
 
diff --git a/drivers/gpio/gpio_sch.c b/drivers/gpio/gpio_sch.c
index 9543121bdcdb..73b92d65ec4b 100644
--- a/drivers/gpio/gpio_sch.c
+++ b/drivers/gpio/gpio_sch.c
@@ -17,8 +17,9 @@
 #include "gpio_sch.h"
 #include "gpio_utils.h"
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_GPIO_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(gpio_sch)
 
 /* Define GPIO_SCH_LEGACY_IO_PORTS_ACCESS
  * inside soc.h if the GPIO controller
@@ -101,8 +102,8 @@ static void _gpio_pin_config(struct device *dev, u32_t pin, int flags)
 			active_low = 1;
 		}
 
-		SYS_LOG_DBG("Setting up pin %d to active_high %d and "
-			    "active_low %d", active_high, active_low);
+		LOG_DBG("Setting up pin %d to active_high %d and "
+			"active_low %d", pin, active_high, active_low);
 	}
 
 	/* We store the gtpe/gtne settings. These will be used once
@@ -215,7 +216,7 @@ static void _gpio_sch_manage_callback(struct device *dev)
 	/* Start the thread only when relevant */
 	if (!sys_slist_is_empty(&gpio->callbacks) && gpio->cb_enabled) {
 		if (!gpio->poll) {
-			SYS_LOG_DBG("Starting SCH GPIO polling thread");
+			LOG_DBG("Starting SCH GPIO polling thread");
 			gpio->poll = 1;
 			k_thread_create(&gpio->polling_thread,
 					gpio->polling_stack,
@@ -314,7 +315,7 @@ static int gpio_sch_init(struct device *dev)
 
 	k_timer_init(&gpio->poll_timer, NULL, NULL);
 
-	SYS_LOG_DBG("SCH GPIO Intel Driver initialized on device: %p", dev);
+	LOG_DBG("SCH GPIO Intel Driver initialized on device: %p", dev);
 
 	return 0;
 }
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 08cc84a5184a..43a17c7c0c35 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -34,18 +34,10 @@ config I2C_INIT_PRIORITY
 	help
 	  I2C device driver initialization priority.
 
-config SYS_LOG_I2C_LEVEL
-	int "I2C log level"
-	depends on SYS_LOG
-	default 0
-	help
-	  Sets log level for I2C drivers.
-	  Levels are:
-	  - 0 OFF, do not write
-	  - 1 ERROR, only write SYS_LOG_ERR
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+
+module = I2C
+module-str = i2c
+source "subsys/logging/Kconfig.template.log_config"
 
 config I2C_0
 	bool "Enable I2C Port 0"
diff --git a/drivers/i2c/i2c-priv.h b/drivers/i2c/i2c-priv.h
index a05db45212aa..3e0953fc8c49 100644
--- a/drivers/i2c/i2c-priv.h
+++ b/drivers/i2c/i2c-priv.h
@@ -13,11 +13,7 @@ extern "C" {
 
 #include <i2c.h>
 #include <dt-bindings/i2c/i2c.h>
-
-#ifndef SYS_LOG_LEVEL
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#endif
-#include <logging/sys_log.h>
+#include <logging/log.h>
 
 static inline u32_t _i2c_map_dt_bitrate(u32_t bitrate)
 {
@@ -34,7 +30,7 @@ static inline u32_t _i2c_map_dt_bitrate(u32_t bitrate)
 		return I2C_SPEED_ULTRA << I2C_SPEED_SHIFT;
 	}
 
-	SYS_LOG_ERR("Invalid I2C bit rate value");
+	LOG_ERR("Invalid I2C bit rate value");
 
 	return 0;
 }
diff --git a/drivers/i2c/i2c_atmel_sam3.c b/drivers/i2c/i2c_atmel_sam3.c
index 312bed8b111a..3b6565d42d12 100644
--- a/drivers/i2c/i2c_atmel_sam3.c
+++ b/drivers/i2c/i2c_atmel_sam3.c
@@ -35,8 +35,9 @@
 
 #include <misc/util.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_atmel_sam3)
 
 #define TWI_IRQ_PDC \
 	(TWI_SR_ENDRX | TWI_SR_ENDTX | TWI_SR_RXBUFF | TWI_SR_TXBUFE)
@@ -587,7 +588,7 @@ static int __deprecated i2c_sam3_init(struct device *dev)
 
 	if (i2c_sam3_runtime_configure(dev, dev_data->dev_config)
 	    != 0) {
-		SYS_LOG_DBG("I2C: Cannot set default configuration 0x%x",
+		LOG_DBG("I2C: Cannot set default configuration 0x%x",
 		    dev_data->dev_config);
 		return -EINVAL;
 	}
diff --git a/drivers/i2c/i2c_cc32xx.c b/drivers/i2c/i2c_cc32xx.c
index 89b4af6e3b03..02f0bb75b79a 100644
--- a/drivers/i2c/i2c_cc32xx.c
+++ b/drivers/i2c/i2c_cc32xx.c
@@ -10,7 +10,6 @@
 #include <errno.h>
 #include <i2c.h>
 #include <soc.h>
-#include "i2c-priv.h"
 
 /* Driverlib includes */
 #include <inc/hw_memmap.h>
@@ -19,6 +18,12 @@
 #include <driverlib/rom_map.h>
 #include <driverlib/i2c.h>
 
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_cc32xx)
+
+#include "i2c-priv.h"
+
 #define I2C_MASTER_CMD_BURST_RECEIVE_START_NACK	 I2C_MASTER_CMD_BURST_SEND_START
 #define I2C_MASTER_CMD_BURST_RECEIVE_STOP \
 	I2C_MASTER_CMD_BURST_RECEIVE_ERROR_STOP
@@ -269,7 +274,7 @@ static void i2c_cc32xx_isr(void *arg)
 	/* Clear interrupt source to avoid additional interrupts */
 	MAP_I2CMasterIntClearEx(base, int_status);
 
-	SYS_LOG_DBG("primed state: %d; err_status: 0x%x; int_status: 0x%x",
+	LOG_DBG("primed state: %d; err_status: 0x%x; int_status: 0x%x",
 		    data->state, err_status, int_status);
 
 	/* Handle errors: */
diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c
index d21f3b22c574..e4f698bf6b53 100644
--- a/drivers/i2c/i2c_dw.c
+++ b/drivers/i2c/i2c_dw.c
@@ -32,12 +32,12 @@
 
 #include "i2c_dw.h"
 #include "i2c_dw_registers.h"
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_dw);
 
 #include "i2c-priv.h"
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
-
 static inline void _i2c_dw_data_ask(struct device *dev)
 {
 	struct i2c_dw_dev_config * const dw = dev->driver_data;
@@ -221,7 +221,7 @@ static void i2c_dw_isr(void *arg)
 	 *   - Receive data is available (rx_avail)
 	 */
 
-	SYS_LOG_DBG("I2C: interrupt received");
+	LOG_DBG("I2C: interrupt received");
 
 	/* Check if we are configured as a master device */
 	if (regs->ic_con.bits.master_mode) {
@@ -299,7 +299,7 @@ static int _i2c_dw_setup(struct device *dev, u16_t slave_address)
 		 * Make sure to set both the master_mode and slave_disable_bit
 		 * to both 0 or both 1
 		 */
-		SYS_LOG_DBG("I2C: host configured as Master Device");
+		LOG_DBG("I2C: host configured as Master Device");
 		ic_con.bits.master_mode = 1;
 		ic_con.bits.slave_disable = 1;
 	} else {
@@ -310,7 +310,7 @@ static int _i2c_dw_setup(struct device *dev, u16_t slave_address)
 
 	/* Set addressing mode - (initialization = 7 bit) */
 	if (I2C_ADDR_10_BITS & dw->app_config) {
-		SYS_LOG_DBG("I2C: using 10-bit address");
+		LOG_DBG("I2C: using 10-bit address");
 		ic_con.bits.addr_master_10bit = 1;
 		ic_con.bits.addr_slave_10bit = 1;
 	}
@@ -318,7 +318,7 @@ static int _i2c_dw_setup(struct device *dev, u16_t slave_address)
 	/* Setup the clock frequency and speed mode */
 	switch (I2C_SPEED_GET(dw->app_config)) {
 	case I2C_SPEED_STANDARD:
-		SYS_LOG_DBG("I2C: speed set to STANDARD");
+		LOG_DBG("I2C: speed set to STANDARD");
 		regs->ic_ss_scl_lcnt = dw->lcnt;
 		regs->ic_ss_scl_hcnt = dw->hcnt;
 		ic_con.bits.speed = I2C_DW_SPEED_STANDARD;
@@ -327,7 +327,7 @@ static int _i2c_dw_setup(struct device *dev, u16_t slave_address)
 	case I2C_SPEED_FAST:
 		/* fall through */
 	case I2C_SPEED_FAST_PLUS:
-		SYS_LOG_DBG("I2C: speed set to FAST or FAST_PLUS");
+		LOG_DBG("I2C: speed set to FAST or FAST_PLUS");
 		regs->ic_fs_scl_lcnt = dw->lcnt;
 		regs->ic_fs_scl_hcnt = dw->hcnt;
 		ic_con.bits.speed = I2C_DW_SPEED_FAST;
@@ -338,19 +338,19 @@ static int _i2c_dw_setup(struct device *dev, u16_t slave_address)
 			return -EINVAL;
 		}
 
-		SYS_LOG_DBG("I2C: speed set to HIGH");
+		LOG_DBG("I2C: speed set to HIGH");
 		regs->ic_hs_scl_lcnt = dw->lcnt;
 		regs->ic_hs_scl_hcnt = dw->hcnt;
 		ic_con.bits.speed = I2C_DW_SPEED_HIGH;
 
 		break;
 	default:
-		SYS_LOG_DBG("I2C: invalid speed requested");
+		LOG_DBG("I2C: invalid speed requested");
 		return -EINVAL;
 	}
 
-	SYS_LOG_DBG("I2C: lcnt = %d", dw->lcnt);
-	SYS_LOG_DBG("I2C: hcnt = %d", dw->hcnt);
+	LOG_DBG("I2C: lcnt = %d", dw->lcnt);
+	LOG_DBG("I2C: hcnt = %d", dw->hcnt);
 
 	/* Set the IC_CON register */
 	regs->ic_con = ic_con;
@@ -629,7 +629,7 @@ static inline int i2c_dw_pci_setup(struct device *dev)
 	pci_bus_scan_init();
 
 	if (!pci_bus_scan(&dw->pci_dev)) {
-		SYS_LOG_DBG("Could not find device");
+		LOG_DBG("Could not find device");
 		return 0;
 	}
 
@@ -664,7 +664,7 @@ static int i2c_dw_initialize(struct device *dev)
 	/* verify that we have a valid DesignWare register first */
 	if (regs->ic_comp_type != I2C_DW_MAGIC_KEY) {
 		dev->driver_api = NULL;
-		SYS_LOG_DBG("I2C: DesignWare magic key not found, check base "
+		LOG_DBG("I2C: DesignWare magic key not found, check base "
 			    "address. Stopping initialization");
 		return -EIO;
 	}
@@ -675,10 +675,10 @@ static int i2c_dw_initialize(struct device *dev)
 	 * can move provide support for it
 	 */
 	if (regs->ic_con.bits.speed == I2C_DW_SPEED_HIGH) {
-		SYS_LOG_DBG("I2C: high speed supported");
+		LOG_DBG("I2C: high speed supported");
 		dw->support_hs_mode = true;
 	} else {
-		SYS_LOG_DBG("I2C: high speed NOT supported");
+		LOG_DBG("I2C: high speed NOT supported");
 		dw->support_hs_mode = false;
 	}
 
@@ -687,7 +687,7 @@ static int i2c_dw_initialize(struct device *dev)
 	dw->app_config = I2C_MODE_MASTER | _i2c_map_dt_bitrate(rom->bitrate);
 
 	if (i2c_dw_runtime_configure(dev, dw->app_config) != 0) {
-		SYS_LOG_DBG("I2C: Cannot set default configuration");
+		LOG_DBG("I2C: Cannot set default configuration");
 		return -EIO;
 	}
 
diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c
index 48195747a84e..4be728aba103 100644
--- a/drivers/i2c/i2c_ll_stm32.c
+++ b/drivers/i2c/i2c_ll_stm32.c
@@ -12,11 +12,13 @@
 #include <board.h>
 #include <errno.h>
 #include <i2c.h>
-#include "i2c-priv.h"
 #include "i2c_ll_stm32.h"
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_ll_stm32);
+
+#include "i2c-priv.h"
 
 int i2c_stm32_runtime_configure(struct device *dev, u32_t config)
 {
@@ -202,7 +204,7 @@ static int i2c_stm32_init(struct device *dev)
 
 	ret = i2c_stm32_runtime_configure(dev, I2C_MODE_MASTER | bitrate_cfg);
 	if (ret < 0) {
-		SYS_LOG_ERR("i2c: failure initializing");
+		LOG_ERR("i2c: failure initializing");
 		return ret;
 	}
 
diff --git a/drivers/i2c/i2c_ll_stm32_v1.c b/drivers/i2c/i2c_ll_stm32_v1.c
index c62c7e704ba1..74764558b770 100644
--- a/drivers/i2c/i2c_ll_stm32_v1.c
+++ b/drivers/i2c/i2c_ll_stm32_v1.c
@@ -17,8 +17,9 @@
 #include <i2c.h>
 #include "i2c_ll_stm32.h"
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_ll_stm32_v1);
 
 #define I2C_REQUEST_WRITE	0x00
 #define I2C_REQUEST_READ	0x01
@@ -242,10 +243,10 @@ s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
 	if (data->current.is_nack || data->current.is_err) {
 
 		if (data->current.is_nack)
-			SYS_LOG_DBG("%s: NACK", __func__);
+			LOG_DBG("%s: NACK", __func__);
 
 		if (data->current.is_err)
-			SYS_LOG_DBG("%s: ERR %d", __func__,
+			LOG_DBG("%s: ERR %d", __func__,
 				    data->current.is_err);
 
 		data->current.is_nack = 0;
@@ -287,7 +288,7 @@ s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
 
 	LL_I2C_DisableIT_BUF(i2c);
 	if (data->current.is_err) {
-		SYS_LOG_DBG("%s: ERR %d", __func__, data->current.is_err);
+		LOG_DBG("%s: ERR %d", __func__, data->current.is_err);
 		data->current.is_err = 0;
 		ret = -EIO;
 	}
@@ -338,7 +339,7 @@ s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
 			if (LL_I2C_IsActiveFlag_AF(i2c)) {
 				LL_I2C_ClearFlag_AF(i2c);
 				LL_I2C_GenerateStopCondition(i2c);
-				SYS_LOG_DBG("%s: NACK", __func__);
+				LOG_DBG("%s: NACK", __func__);
 
 				return -EIO;
 			}
@@ -354,7 +355,7 @@ s32_t stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
 			if (LL_I2C_IsActiveFlag_AF(i2c)) {
 				LL_I2C_ClearFlag_AF(i2c);
 				LL_I2C_GenerateStopCondition(i2c);
-				SYS_LOG_DBG("%s: NACK", __func__);
+				LOG_DBG("%s: NACK", __func__);
 
 				return -EIO;
 			}
@@ -424,7 +425,7 @@ s32_t stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
 			if (LL_I2C_IsActiveFlag_AF(i2c)) {
 				LL_I2C_ClearFlag_AF(i2c);
 				LL_I2C_GenerateStopCondition(i2c);
-				SYS_LOG_DBG("%s: NACK", __func__);
+				LOG_DBG("%s: NACK", __func__);
 
 				return -EIO;
 			}
diff --git a/drivers/i2c/i2c_ll_stm32_v2.c b/drivers/i2c/i2c_ll_stm32_v2.c
index 43a8a9113340..501538f7c8a2 100644
--- a/drivers/i2c/i2c_ll_stm32_v2.c
+++ b/drivers/i2c/i2c_ll_stm32_v2.c
@@ -15,11 +15,13 @@
 #include <board.h>
 #include <errno.h>
 #include <i2c.h>
-#include "i2c-priv.h"
 #include "i2c_ll_stm32.h"
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_ll_stm32_v2);
+
+#include "i2c-priv.h"
 
 static inline void msg_init(struct device *dev, struct i2c_msg *msg,
 			    u8_t *next_msg_flags, u16_t slave,
@@ -197,7 +199,7 @@ int i2c_stm32_slave_register(struct device *dev,
 
 	ret = i2c_stm32_runtime_configure(dev, bitrate_cfg);
 	if (ret < 0) {
-		SYS_LOG_ERR("i2c: failure initializing");
+		LOG_ERR("i2c: failure initializing");
 		return ret;
 	}
 
@@ -211,7 +213,7 @@ int i2c_stm32_slave_register(struct device *dev,
 
 	data->slave_attached = true;
 
-	SYS_LOG_DBG("i2c: slave registered");
+	LOG_DBG("i2c: slave registered");
 
 	LL_I2C_EnableIT_ADDR(i2c);
 
@@ -244,7 +246,7 @@ int i2c_stm32_slave_unregister(struct device *dev,
 
 	LL_I2C_Disable(i2c);
 
-	SYS_LOG_DBG("i2c: slave unregistered");
+	LOG_DBG("i2c: slave unregistered");
 
 	return 0;
 }
@@ -396,18 +398,18 @@ int stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
 	return 0;
 error:
 	if (data->current.is_arlo) {
-		SYS_LOG_DBG("%s: ARLO %d", __func__,
+		LOG_DBG("%s: ARLO %d", __func__,
 				    data->current.is_arlo);
 		data->current.is_arlo = 0;
 	}
 
 	if (data->current.is_nack) {
-		SYS_LOG_DBG("%s: NACK", __func__);
+		LOG_DBG("%s: NACK", __func__);
 		data->current.is_nack = 0;
 	}
 
 	if (data->current.is_err) {
-		SYS_LOG_DBG("%s: ERR %d", __func__,
+		LOG_DBG("%s: ERR %d", __func__,
 				    data->current.is_err);
 		data->current.is_err = 0;
 	}
@@ -445,18 +447,18 @@ int stm32_i2c_msg_read(struct device *dev, struct i2c_msg *msg,
 	return 0;
 error:
 	if (data->current.is_arlo) {
-		SYS_LOG_DBG("%s: ARLO %d", __func__,
+		LOG_DBG("%s: ARLO %d", __func__,
 				    data->current.is_arlo);
 		data->current.is_arlo = 0;
 	}
 
 	if (data->current.is_nack) {
-		SYS_LOG_DBG("%s: NACK", __func__);
+		LOG_DBG("%s: NACK", __func__);
 		data->current.is_nack = 0;
 	}
 
 	if (data->current.is_err) {
-		SYS_LOG_DBG("%s: ERR %d", __func__,
+		LOG_DBG("%s: ERR %d", __func__,
 				    data->current.is_err);
 		data->current.is_err = 0;
 	}
@@ -517,7 +519,7 @@ int stm32_i2c_msg_write(struct device *dev, struct i2c_msg *msg,
 	return 0;
 error:
 	LL_I2C_ClearFlag_NACK(i2c);
-	SYS_LOG_DBG("%s: NACK", __func__);
+	LOG_DBG("%s: NACK", __func__);
 
 	return -EIO;
 }
@@ -601,7 +603,7 @@ int stm32_i2c_configure_timing(struct device *dev, u32_t clock)
 	} while (presc < 16);
 
 	if (presc >= 16) {
-		SYS_LOG_DBG("I2C:failed to find prescaler value");
+		LOG_DBG("I2C:failed to find prescaler value");
 		return -EINVAL;
 	}
 
diff --git a/drivers/i2c/i2c_nios2.c b/drivers/i2c/i2c_nios2.c
index 87fa97458627..4db331da3979 100644
--- a/drivers/i2c/i2c_nios2.c
+++ b/drivers/i2c/i2c_nios2.c
@@ -11,8 +11,9 @@
 #include <altera_common.h>
 #include "altera_avalon_i2c.h"
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_nios2);
 
 #define NIOS2_I2C_TIMEOUT_USEC		1000
 
@@ -32,19 +33,19 @@ static int i2c_nios2_configure(struct device *dev, u32_t dev_config)
 
 	k_sem_take(&config->sem_lock, K_FOREVER);
 	if (!(I2C_MODE_MASTER & dev_config)) {
-		SYS_LOG_ERR("i2c config mode error\n");
+		LOG_ERR("i2c config mode error\n");
 		rc = -EINVAL;
 		goto i2c_cfg_err;
 	}
 
 	if (I2C_ADDR_10_BITS & dev_config) {
-		SYS_LOG_ERR("i2c config addresing error\n");
+		LOG_ERR("i2c config addresing error\n");
 		rc = -EINVAL;
 		goto i2c_cfg_err;
 	}
 
 	if (I2C_SPEED_GET(dev_config) != I2C_SPEED_STANDARD) {
-		SYS_LOG_ERR("i2c config speed error\n");
+		LOG_ERR("i2c config speed error\n");
 		rc = -EINVAL;
 		goto i2c_cfg_err;
 	}
@@ -106,7 +107,7 @@ static int i2c_nios2_transfer(struct device *dev, struct i2c_msg *msgs,
 		 * start successfully e.g., if the bus was busy
 		 */
 		if (status != ALT_AVALON_I2C_SUCCESS) {
-			SYS_LOG_ERR("i2c transfer error %lu\n", status);
+			LOG_ERR("i2c transfer error %lu\n", status);
 			rc = -EIO;
 			goto i2c_transfer_err;
 		}
@@ -123,7 +124,7 @@ static int i2c_nios2_transfer(struct device *dev, struct i2c_msg *msgs,
 		}
 
 		if (timeout <= 0) {
-			SYS_LOG_ERR("i2c busy or timeout error %lu\n", status);
+			LOG_ERR("i2c busy or timeout error %lu\n", status);
 			rc = -EIO;
 			goto i2c_transfer_err;
 		}
@@ -180,7 +181,7 @@ static int i2c_nios2_init(struct device *dev)
 			I2C_MODE_MASTER |
 			I2C_SPEED_SET(I2C_SPEED_STANDARD));
 	if (rc) {
-		SYS_LOG_ERR("i2c configure failed %d\n", rc);
+		LOG_ERR("i2c configure failed %d\n", rc);
 		return rc;
 	}
 
diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c
index 69f61d534c5d..7e9320c7c8c4 100644
--- a/drivers/i2c/i2c_nrfx_twi.c
+++ b/drivers/i2c/i2c_nrfx_twi.c
@@ -8,9 +8,9 @@
 #include <i2c.h>
 #include <nrfx_twi.h>
 
-#define SYS_LOG_DOMAIN "i2c_nrfx_twi"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_nrfx_twi);
 
 struct i2c_nrfx_twi_data {
 	struct k_sem sync;
@@ -59,7 +59,7 @@ static int i2c_nrfx_twi_transfer(struct device *dev, struct i2c_msg *msgs,
 		k_sem_take(&(get_dev_data(dev)->sync), K_FOREVER);
 		res = get_dev_data(dev)->res;
 		if (res != NRFX_SUCCESS) {
-			SYS_LOG_ERR("Error %d occurred for message %d", res, i);
+			LOG_ERR("Error %d occurred for message %d", res, i);
 			return -EIO;
 		}
 	}
@@ -106,7 +106,7 @@ static int i2c_nrfx_twi_configure(struct device *dev, u32_t dev_config)
 		nrf_twi_frequency_set(inst->p_twi, NRF_TWI_FREQ_400K);
 		break;
 	default:
-		SYS_LOG_ERR("unsupported speed");
+		LOG_ERR("unsupported speed");
 		return -EINVAL;
 	}
 
@@ -123,7 +123,7 @@ static int init_twi(struct device *dev, const nrfx_twi_config_t *config)
 	nrfx_err_t result = nrfx_twi_init(&get_dev_config(dev)->twi, config,
 					  event_handler, dev);
 	if (result != NRFX_SUCCESS) {
-		SYS_LOG_ERR("Failed to initialize device: %s",
+		LOG_ERR("Failed to initialize device: %s",
 			    dev->config->name);
 		return -EBUSY;
 	}
diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c
index 9f74ecbdb6bd..ddecb6d55c79 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -8,9 +8,10 @@
 #include <i2c.h>
 #include <nrfx_twim.h>
 
-#define SYS_LOG_DOMAIN "i2c_nrfx_twim"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
+#define LOG_DOMAIN "i2c_nrfx_twim"
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_nrfx_twim);
 
 struct i2c_nrfx_twim_data {
 	struct k_sem sync;
@@ -59,7 +60,7 @@ static int i2c_nrfx_twim_transfer(struct device *dev, struct i2c_msg *msgs,
 		k_sem_take(&(get_dev_data(dev)->sync), K_FOREVER);
 		res = get_dev_data(dev)->res;
 		if (res != NRFX_SUCCESS) {
-			SYS_LOG_ERR("Error %d occurred for message %d", res, i);
+			LOG_ERR("Error %d occurred for message %d", res, i);
 			return -EIO;
 		}
 	}
@@ -106,7 +107,7 @@ static int i2c_nrfx_twim_configure(struct device *dev, u32_t dev_config)
 		nrf_twim_frequency_set(inst->p_twim, NRF_TWIM_FREQ_400K);
 		break;
 	default:
-		SYS_LOG_ERR("unsupported speed");
+		LOG_ERR("unsupported speed");
 		return -EINVAL;
 	}
 
@@ -123,7 +124,7 @@ static int init_twim(struct device *dev, const nrfx_twim_config_t *config)
 	nrfx_err_t result = nrfx_twim_init(&get_dev_config(dev)->twim, config,
 					  event_handler, dev);
 	if (result != NRFX_SUCCESS) {
-		SYS_LOG_ERR("Failed to initialize device: %s",
+		LOG_ERR("Failed to initialize device: %s",
 			    dev->config->name);
 		return -EBUSY;
 	}
diff --git a/drivers/i2c/i2c_sam_twi.c b/drivers/i2c/i2c_sam_twi.c
index c47ece02c4a8..9a5278c9c55b 100644
--- a/drivers/i2c/i2c_sam_twi.c
+++ b/drivers/i2c/i2c_sam_twi.c
@@ -20,11 +20,12 @@
 #include <init.h>
 #include <soc.h>
 #include <i2c.h>
-#include "i2c-priv.h"
 
-#define SYS_LOG_DOMAIN "dev/i2c_sam_twi"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_sam_twi)
+
+#include "i2c-priv.h"
 
 /** I2C bus speed [Hz] in Standard Mode */
 #define BUS_SPEED_STANDARD_HZ         100000U
@@ -90,7 +91,7 @@ static int i2c_clk_set(Twi *const twi, u32_t speed)
 	}
 
 	if (ck_div > CKDIV_MAX) {
-		SYS_LOG_ERR("Failed to configure I2C clock");
+		LOG_ERR("Failed to configure I2C clock");
 		return -EIO;
 	}
 
@@ -109,13 +110,13 @@ static int i2c_sam_twi_configure(struct device *dev, u32_t config)
 	int ret;
 
 	if (!(config & I2C_MODE_MASTER)) {
-		SYS_LOG_ERR("Master Mode is not enabled");
+		LOG_ERR("Master Mode is not enabled");
 		return -EIO;
 	}
 
 	if (config & I2C_ADDR_10_BITS) {
-		SYS_LOG_ERR("I2C 10-bit addressing is currently not supported");
-		SYS_LOG_ERR("Please submit a patch");
+		LOG_ERR("I2C 10-bit addressing is currently not supported");
+		LOG_ERR("Please submit a patch");
 		return -EIO;
 	}
 
@@ -128,7 +129,7 @@ static int i2c_sam_twi_configure(struct device *dev, u32_t config)
 		bitrate = BUS_SPEED_FAST_HZ;
 		break;
 	default:
-		SYS_LOG_ERR("Unsupported I2C speed value");
+		LOG_ERR("Unsupported I2C speed value");
 		return -EIO;
 	}
 
@@ -318,14 +319,14 @@ static int i2c_sam_twi_initialize(struct device *dev)
 
 	ret = i2c_sam_twi_configure(dev, I2C_MODE_MASTER | bitrate_cfg);
 	if (ret < 0) {
-		SYS_LOG_ERR("Failed to initialize %s device", DEV_NAME(dev));
+		LOG_ERR("Failed to initialize %s device", DEV_NAME(dev));
 		return ret;
 	}
 
 	/* Enable module's IRQ */
 	irq_enable(dev_cfg->irq_id);
 
-	SYS_LOG_INF("Device %s initialized", DEV_NAME(dev));
+	LOG_INF("Device %s initialized", DEV_NAME(dev));
 
 	return 0;
 }
diff --git a/drivers/i2c/i2c_sam_twihs.c b/drivers/i2c/i2c_sam_twihs.c
index 49d0a2624ef9..33f943355790 100644
--- a/drivers/i2c/i2c_sam_twihs.c
+++ b/drivers/i2c/i2c_sam_twihs.c
@@ -10,9 +10,6 @@
  * Only I2C Master Mode with 7 bit addressing is currently supported.
  */
 
-#define SYS_LOG_DOMAIN "dev/i2c_sam_twihs"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
 
 #include <errno.h>
 #include <misc/__assert.h>
@@ -21,6 +18,11 @@
 #include <init.h>
 #include <soc.h>
 #include <i2c.h>
+
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_sam_twihs)
+
 #include "i2c-priv.h"
 
 /** I2C bus speed [Hz] in Standard Mode */
@@ -89,7 +91,7 @@ static int i2c_clk_set(Twihs *const twihs, u32_t speed)
 	}
 
 	if (ck_div > CKDIV_MAX) {
-		SYS_LOG_ERR("Failed to configure I2C clock");
+		LOG_ERR("Failed to configure I2C clock");
 		return -EIO;
 	}
 
@@ -108,13 +110,13 @@ static int i2c_sam_twihs_configure(struct device *dev, u32_t config)
 	int ret;
 
 	if (!(config & I2C_MODE_MASTER)) {
-		SYS_LOG_ERR("Master Mode is not enabled");
+		LOG_ERR("Master Mode is not enabled");
 		return -EIO;
 	}
 
 	if (config & I2C_ADDR_10_BITS) {
-		SYS_LOG_ERR("I2C 10-bit addressing is currently not supported");
-		SYS_LOG_ERR("Please submit a patch");
+		LOG_ERR("I2C 10-bit addressing is currently not supported");
+		LOG_ERR("Please submit a patch");
 		return -EIO;
 	}
 
@@ -127,7 +129,7 @@ static int i2c_sam_twihs_configure(struct device *dev, u32_t config)
 		bitrate = BUS_SPEED_FAST_HZ;
 		break;
 	default:
-		SYS_LOG_ERR("Unsupported I2C speed value");
+		LOG_ERR("Unsupported I2C speed value");
 		return -EIO;
 	}
 
@@ -304,14 +306,14 @@ static int i2c_sam_twihs_initialize(struct device *dev)
 
 	ret = i2c_sam_twihs_configure(dev, I2C_MODE_MASTER | bitrate_cfg);
 	if (ret < 0) {
-		SYS_LOG_ERR("Failed to initialize %s device", DEV_NAME(dev));
+		LOG_ERR("Failed to initialize %s device", DEV_NAME(dev));
 		return ret;
 	}
 
 	/* Enable module's IRQ */
 	irq_enable(dev_cfg->irq_id);
 
-	SYS_LOG_INF("Device %s initialized", DEV_NAME(dev));
+	LOG_INF("Device %s initialized", DEV_NAME(dev));
 
 	return 0;
 }
diff --git a/drivers/i2c/slave/Kconfig b/drivers/i2c/slave/Kconfig
index 2558bf134556..9e7da43da3a3 100644
--- a/drivers/i2c/slave/Kconfig
+++ b/drivers/i2c/slave/Kconfig
@@ -22,18 +22,18 @@ config I2C_SLAVE_INIT_PRIORITY
 	help
 	  I2C Slave device driver initialization priority.
 
-config SYS_LOG_I2C_SLAVE_LEVEL
+config LOG_I2C_SLAVE_LEVEL
 	int "I2C Slave log level"
-	depends on SYS_LOG
+	depends on LOG
 	default 0
 	help
 	  Sets log level for I2C drivers.
 	  Levels are:
 	  - 0 OFF, do not write
-	  - 1 ERROR, only write SYS_LOG_ERR
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+	  - 1 ERROR, only write LOG_ERR
+	  - 2 WARNING, write LOG_WRN in addition to previous level
+	  - 3 INFO, write LOG_INF in addition to previous levels
+	  - 4 DEBUG, write LOG_DBG in addition to previous levels
 
 source "drivers/i2c/slave/Kconfig.eeprom"
 
diff --git a/drivers/i2c/slave/eeprom_slave.c b/drivers/i2c/slave/eeprom_slave.c
index 32ae210ac196..ee16614ba08e 100644
--- a/drivers/i2c/slave/eeprom_slave.c
+++ b/drivers/i2c/slave/eeprom_slave.c
@@ -11,8 +11,9 @@
 #include <string.h>
 #include <drivers/i2c/slave/eeprom.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_SLAVE_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(i2c_slave)
 
 struct i2c_eeprom_slave_data {
 	struct device *i2c_controller;
@@ -71,7 +72,7 @@ static int eeprom_slave_write_requested(struct i2c_slave_config *config)
 						struct i2c_eeprom_slave_data,
 						config);
 
-	SYS_LOG_DBG("eeprom: write req");
+	LOG_DBG("eeprom: write req");
 
 	data->first_write = true;
 
@@ -87,7 +88,7 @@ static int eeprom_slave_read_requested(struct i2c_slave_config *config,
 
 	*val = data->buffer[data->buffer_idx];
 
-	SYS_LOG_DBG("eeprom: read req, val=0x%x", *val);
+	LOG_DBG("eeprom: read req, val=0x%x", *val);
 
 	/* Increment will be done in the read_processed callback */
 
@@ -101,7 +102,7 @@ static int eeprom_slave_write_received(struct i2c_slave_config *config,
 						struct i2c_eeprom_slave_data,
 						config);
 
-	SYS_LOG_DBG("eeprom: write done, val=0x%x", val);
+	LOG_DBG("eeprom: write done, val=0x%x", val);
 
 	/* In case EEPROM wants to be R/O, return !0 here could trigger
 	 * a NACK to the I2C controller, support depends on the
@@ -132,7 +133,7 @@ static int eeprom_slave_read_processed(struct i2c_slave_config *config,
 
 	*val = data->buffer[data->buffer_idx];
 
-	SYS_LOG_DBG("eeprom: read done, val=0x%x", *val);
+	LOG_DBG("eeprom: read done, val=0x%x", *val);
 
 	/* Increment will be done in the next read_processed callback
 	 * In case of STOP, the byte won't be taken in account
@@ -147,7 +148,7 @@ static int eeprom_slave_stop(struct i2c_slave_config *config)
 						struct i2c_eeprom_slave_data,
 						config);
 
-	SYS_LOG_DBG("eeprom: stop");
+	LOG_DBG("eeprom: stop");
 
 	data->first_write = true;
 
@@ -189,7 +190,7 @@ static int i2c_eeprom_slave_init(struct device *dev)
 	data->i2c_controller =
 		device_get_binding(cfg->controller_dev_name);
 	if (!data->i2c_controller) {
-		SYS_LOG_ERR("i2c controller not found: %s",
+		LOG_ERR("i2c controller not found: %s",
 			    cfg->controller_dev_name);
 		return -EINVAL;
 	}
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 6e539a5e9d58..4e7b334d9774 100644
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -13,19 +13,9 @@ menuconfig PWM
 
 if PWM
 
-config SYS_LOG_PWM_LEVEL
-	int "PWM Driver Log level"
-	depends on SYS_LOG
-	default 0
-	range 0 4
-	help
-	  Sets log level for PWM drivers.
-	  Levels are:
-	  0 OFF, do not write
-	  1 ERROR, only write SYS_LOG_ERR
-	  2 WARNING, write SYS_LOG_WRN in addition to previous level
-	  3 INFO, write SYS_LOG_INF in addition to previous levels
-	  4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = PWM
+module-str = pwm
+source "subsys/logging/Kconfig.template.log_config"
 
 config PWM_0
 	bool "Enable PWM port 0"
diff --git a/drivers/pwm/pwm_imx.c b/drivers/pwm/pwm_imx.c
index bc029c0ca051..4de819f25190 100644
--- a/drivers/pwm/pwm_imx.c
+++ b/drivers/pwm/pwm_imx.c
@@ -9,8 +9,9 @@
 #include <soc.h>
 #include <device_imx.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_PWM_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(pwm_imx);
 
 #define PWM_PWMSR_FIFOAV_4WORDS	0x4
 
@@ -63,12 +64,12 @@ static int imx_pwm_pin_set(struct device *dev, u32_t pwm,
 
 
 	if ((period_cycles == 0) || (pulse_cycles > period_cycles)) {
-		SYS_LOG_ERR("Invalid combination: period_cycles=%d, "
+		LOG_ERR("Invalid combination: period_cycles=%d, "
 			    "pulse_cycles=%d", period_cycles, pulse_cycles);
 		return -EINVAL;
 	}
 
-	SYS_LOG_DBG("enabled=%d, pulse_cycles=%d, period_cycles=%d,"
+	LOG_DBG("enabled=%d, pulse_cycles=%d, period_cycles=%d,"
 		    " duty_cycle=%d\n", enabled, pulse_cycles, period_cycles,
 		    (100 * pulse_cycles / period_cycles));
 
@@ -89,7 +90,7 @@ static int imx_pwm_pin_set(struct device *dev, u32_t pwm,
 
 			sr = PWM_PWMSR_REG(base);
 			if (fifoav == PWM_PWMSR_FIFOAV(sr)) {
-				SYS_LOG_WRN("there is no free FIFO slot\n");
+				LOG_WRN("there is no free FIFO slot\n");
 			}
 		}
 	} else {
@@ -101,7 +102,7 @@ static int imx_pwm_pin_set(struct device *dev, u32_t pwm,
 			 (++wait_count < CONFIG_PWM_PWMSWR_LOOP));
 
 		if (PWM_PWMCR_SWR(cr)) {
-			SYS_LOG_WRN("software reset timeout\n");
+			LOG_WRN("software reset timeout\n");
 		}
 
 	}
@@ -119,7 +120,7 @@ static int imx_pwm_pin_set(struct device *dev, u32_t pwm,
 	PWM_PWMSAR_REG(base) = pulse_cycles;
 
 	if (data->period_cycles != period_cycles) {
-		SYS_LOG_WRN("Changing period cycles from %d to %d in %s",
+		LOG_WRN("Changing period cycles from %d to %d in %s",
 			    data->period_cycles, period_cycles,
 			    dev->config->name);
 
diff --git a/drivers/pwm/pwm_mcux_ftm.c b/drivers/pwm/pwm_mcux_ftm.c
index 9679e757026b..bfc06ff522eb 100644
--- a/drivers/pwm/pwm_mcux_ftm.c
+++ b/drivers/pwm/pwm_mcux_ftm.c
@@ -10,8 +10,9 @@
 #include <fsl_ftm.h>
 #include <fsl_clock.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_PWM_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(pwm_mcux_ftm);
 
 #define MAX_CHANNELS ARRAY_SIZE(FTM0->CONTROLS)
 
@@ -37,20 +38,20 @@ static int mcux_ftm_pin_set(struct device *dev, u32_t pwm,
 	u8_t duty_cycle;
 
 	if ((period_cycles == 0) || (pulse_cycles > period_cycles)) {
-		SYS_LOG_ERR("Invalid combination: period_cycles=%d, "
+		LOG_ERR("Invalid combination: period_cycles=%d, "
 			    "pulse_cycles=%d", period_cycles, pulse_cycles);
 		return -EINVAL;
 	}
 
 	if (pwm >= config->channel_count) {
-		SYS_LOG_ERR("Invalid channel");
+		LOG_ERR("Invalid channel");
 		return -ENOTSUP;
 	}
 
 	duty_cycle = 100 * pulse_cycles / period_cycles;
 	data->channel[pwm].dutyCyclePercent = duty_cycle;
 
-	SYS_LOG_DBG("pulse_cycles=%d, period_cycles=%d, duty_cycle=%d",
+	LOG_DBG("pulse_cycles=%d, period_cycles=%d, duty_cycle=%d",
 		    pulse_cycles, period_cycles, duty_cycle);
 
 	if (period_cycles != data->period_cycles) {
@@ -58,7 +59,7 @@ static int mcux_ftm_pin_set(struct device *dev, u32_t pwm,
 		u32_t pwm_freq;
 		status_t status;
 
-		SYS_LOG_WRN("Changing period cycles from %d to %d"
+		LOG_WRN("Changing period cycles from %d to %d"
 			    " affects all %d channels in %s",
 			    data->period_cycles, period_cycles,
 			    config->channel_count, dev->config->name);
@@ -68,10 +69,10 @@ static int mcux_ftm_pin_set(struct device *dev, u32_t pwm,
 		clock_freq = CLOCK_GetFreq(config->clock_source);
 		pwm_freq = (clock_freq >> config->prescale) / period_cycles;
 
-		SYS_LOG_DBG("pwm_freq=%d, clock_freq=%d", pwm_freq, clock_freq);
+		LOG_DBG("pwm_freq=%d, clock_freq=%d", pwm_freq, clock_freq);
 
 		if (pwm_freq == 0) {
-			SYS_LOG_ERR("Could not set up pwm_freq=%d", pwm_freq);
+			LOG_ERR("Could not set up pwm_freq=%d", pwm_freq);
 			return -EINVAL;
 		}
 
@@ -82,7 +83,7 @@ static int mcux_ftm_pin_set(struct device *dev, u32_t pwm,
 				      pwm_freq, clock_freq);
 
 		if (status != kStatus_Success) {
-			SYS_LOG_ERR("Could not set up pwm");
+			LOG_ERR("Could not set up pwm");
 			return -ENOTSUP;
 		}
 		FTM_SetSoftwareTrigger(config->base, true);
@@ -116,7 +117,7 @@ static int mcux_ftm_init(struct device *dev)
 	int i;
 
 	if (config->channel_count > ARRAY_SIZE(data->channel)) {
-		SYS_LOG_ERR("Invalid channel count");
+		LOG_ERR("Invalid channel count");
 		return -EINVAL;
 	}
 
diff --git a/drivers/pwm/pwm_nrf5_sw.c b/drivers/pwm/pwm_nrf5_sw.c
index 6b3fd9be063c..17e0bb5e4e2d 100644
--- a/drivers/pwm/pwm_nrf5_sw.c
+++ b/drivers/pwm/pwm_nrf5_sw.c
@@ -8,9 +8,9 @@
 
 #include "pwm.h"
 
-#define SYS_LOG_DOMAIN "pwm/nrf5_sw"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_PWM_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(pwm_nrf5_sw);
 
 struct pwm_config {
 	NRF_TIMER_Type *timer;
@@ -97,18 +97,18 @@ static int pwm_nrf5_sw_pin_set(struct device *dev, u32_t pwm,
 	ret = pwm_period_check(data, config->map_size, pwm, period_cycles,
 			       pulse_cycles);
 	if (ret) {
-		SYS_LOG_ERR("Incompatible period");
+		LOG_ERR("Incompatible period");
 		return ret;
 	}
 
 	/* map pwm pin to GPIOTE config/channel */
 	channel = pwm_channel_map(data, config->map_size, pwm);
 	if (channel >= config->map_size) {
-		SYS_LOG_ERR("No more channels available");
+		LOG_ERR("No more channels available");
 		return -ENOMEM;
 	}
 
-	SYS_LOG_DBG("PWM %d, period %u, pulse %u", pwm,
+	LOG_DBG("PWM %d, period %u, pulse %u", pwm,
 			period_cycles, pulse_cycles);
 
 	/* clear GPIOTE config */
diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c
index 8c222d96d197..926c61c8cbfe 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -6,9 +6,9 @@
 #include <nrfx_pwm.h>
 #include <pwm.h>
 
-#define SYS_LOG_DOMAIN "pwm_nrfx"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_PWM_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_PWM_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(pwm_nrfx);
 
 #define PWM_NRFX_CH_VALUE_NORMAL        (1UL << 15)
 #define PWM_NRFX_CH_VALUE_INVERTED      (0)
@@ -108,7 +108,7 @@ static int pwm_nrfx_init(struct device *dev)
 					  NULL);
 
 	if (result != NRFX_SUCCESS) {
-		SYS_LOG_ERR("Failed to initialize device: %s",
+		LOG_ERR("Failed to initialize device: %s",
 			    dev->config->name);
 		return -EBUSY;
 	}
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 179a65e7a1ca..bcfe5a75e5c6 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -34,25 +34,10 @@ config SPI_INIT_PRIORITY
 	help
 	  Device driver initialization priority.
 
-config SYS_LOG_SPI_LEVEL
-	int "SPI Driver Log level"
-	depends on SYS_LOG
-	default 0
-	range 0 4
-	help
-	  Sets log level for SPI drivers.
-
-	  Levels are:
-
-	    - 0 OFF, do not write
-
-	    - 1 ERROR, only write SYS_LOG_ERR
-
-	    - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	    - 3 INFO, write SYS_LOG_INF in addition to previous levels
+module = SPI
+module-str = spi
+source "subsys/logging/Kconfig.template.log_config"
 
-	    - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
 
 config	SPI_0
 	bool "SPI port 0"
diff --git a/drivers/spi/spi_context.h b/drivers/spi/spi_context.h
index dc36d4f35b6b..353ad7257bca 100644
--- a/drivers/spi/spi_context.h
+++ b/drivers/spi/spi_context.h
@@ -181,7 +181,7 @@ static inline void spi_context_cs_configure(struct spi_context *ctx)
 			       ctx->config->cs->gpio_pin,
 			       spi_context_cs_inactive_value(ctx));
 	} else {
-		SYS_LOG_INF("CS control inhibited (no GPIO device)");
+		LOG_INF("CS control inhibited (no GPIO device)");
 	}
 }
 
@@ -212,7 +212,7 @@ void spi_context_buffers_setup(struct spi_context *ctx,
 			       const struct spi_buf_set *rx_bufs,
 			       u8_t dfs)
 {
-	SYS_LOG_DBG("tx_bufs %p - rx_bufs %p - %u", tx_bufs, rx_bufs, dfs);
+	LOG_DBG("tx_bufs %p - rx_bufs %p - %u", tx_bufs, rx_bufs, dfs);
 
 	if (tx_bufs) {
 		ctx->current_tx = tx_bufs->buffers;
@@ -244,7 +244,7 @@ void spi_context_buffers_setup(struct spi_context *ctx,
 	ctx->recv_frames = 0;
 #endif /* CONFIG_SPI_SLAVE */
 
-	SYS_LOG_DBG("current_tx %p (%zu), current_rx %p (%zu),"
+	LOG_DBG("current_tx %p (%zu), current_rx %p (%zu),"
 		    " tx buf/len %p/%zu, rx buf/len %p/%zu",
 		    ctx->current_tx, ctx->tx_count,
 		    ctx->current_rx, ctx->rx_count,
@@ -259,7 +259,7 @@ void spi_context_update_tx(struct spi_context *ctx, u8_t dfs, u32_t len)
 	}
 
 	if (len > ctx->tx_len) {
-		SYS_LOG_ERR("Update exceeds current buffer");
+		LOG_ERR("Update exceeds current buffer");
 		return;
 	}
 
@@ -277,7 +277,7 @@ void spi_context_update_tx(struct spi_context *ctx, u8_t dfs, u32_t len)
 		ctx->tx_buf += dfs * len;
 	}
 
-	SYS_LOG_DBG("tx buf/len %p/%zu", ctx->tx_buf, ctx->tx_len);
+	LOG_DBG("tx buf/len %p/%zu", ctx->tx_buf, ctx->tx_len);
 }
 
 static ALWAYS_INLINE
@@ -307,7 +307,7 @@ void spi_context_update_rx(struct spi_context *ctx, u8_t dfs, u32_t len)
 	}
 
 	if (len > ctx->rx_len) {
-		SYS_LOG_ERR("Update exceeds current buffer");
+		LOG_ERR("Update exceeds current buffer");
 		return;
 	}
 
@@ -325,7 +325,7 @@ void spi_context_update_rx(struct spi_context *ctx, u8_t dfs, u32_t len)
 		ctx->rx_buf += dfs * len;
 	}
 
-	SYS_LOG_DBG("rx buf/len %p/%zu", ctx->rx_buf, ctx->rx_len);
+	LOG_DBG("rx buf/len %p/%zu", ctx->rx_buf, ctx->rx_len);
 }
 
 static ALWAYS_INLINE
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
index ca7d0305108f..4470b6babd83 100644
--- a/drivers/spi/spi_dw.c
+++ b/drivers/spi/spi_dw.c
@@ -5,11 +5,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#define SYS_LOG_DOMAIN "SPI DW"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SPI_LEVEL
-#include <logging/sys_log.h>
+#define LOG_DOMAIN "SPI DW"
+#define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(spi_dw);
 
-#if (CONFIG_SYS_LOG_SPI_LEVEL == 4)
+#if (CONFIG_SPI_LOG_LEVEL == 4)
 #define DBG_COUNTER_INIT()	\
 	u32_t __cnt = 0
 #define DBG_COUNTER_INC()	\
@@ -76,7 +77,7 @@ static void completed(struct device *dev, int error)
 
 	spi_context_cs_control(&spi->ctx, false);
 
-	SYS_LOG_DBG("SPI transaction completed %s error",
+	LOG_DBG("SPI transaction completed %s error",
 		    error ? "with" : "without");
 
 	spi_context_complete(&spi->ctx, error);
@@ -148,7 +149,7 @@ static void push_data(struct device *dev)
 		write_txftlr(0, info->regs);
 	}
 
-	SYS_LOG_DBG("Pushed: %d", DBG_COUNTER_RESULT());
+	LOG_DBG("Pushed: %d", DBG_COUNTER_RESULT());
 }
 
 static void pull_data(struct device *dev)
@@ -189,7 +190,7 @@ static void pull_data(struct device *dev)
 		write_rxftlr(spi->ctx.rx_len - 1, info->regs);
 	}
 
-	SYS_LOG_DBG("Pulled: %d", DBG_COUNTER_RESULT());
+	LOG_DBG("Pulled: %d", DBG_COUNTER_RESULT());
 }
 
 static int spi_dw_configure(const struct spi_dw_config *info,
@@ -198,7 +199,7 @@ static int spi_dw_configure(const struct spi_dw_config *info,
 {
 	u32_t ctrlr0 = 0;
 
-	SYS_LOG_DBG("%p (prev %p)", config, spi->ctx.config);
+	LOG_DBG("%p (prev %p)", config, spi->ctx.config);
 
 	if (spi_context_configured(&spi->ctx, config)) {
 		/* Nothing to do */
@@ -208,19 +209,19 @@ static int spi_dw_configure(const struct spi_dw_config *info,
 	/* Verify if requested op mode is relevant to this controller */
 	if (config->operation & SPI_OP_MODE_SLAVE) {
 		if (!(info->op_modes & SPI_CTX_RUNTIME_OP_MODE_SLAVE)) {
-			SYS_LOG_ERR("Slave mode not supported");
+			LOG_ERR("Slave mode not supported");
 			return -ENOTSUP;
 		}
 	} else {
 		if (!(info->op_modes & SPI_CTX_RUNTIME_OP_MODE_MASTER)) {
-			SYS_LOG_ERR("Master mode not supported");
+			LOG_ERR("Master mode not supported");
 			return -ENOTSUP;
 		}
 	}
 
 	if (config->operation & (SPI_TRANSFER_LSB |
 				 SPI_LINES_DUAL | SPI_LINES_QUAD)) {
-		SYS_LOG_ERR("Unsupported configuration");
+		LOG_ERR("Unsupported configuration");
 		return -EINVAL;
 	}
 
@@ -258,7 +259,7 @@ static int spi_dw_configure(const struct spi_dw_config *info,
 	spi_context_cs_configure(&spi->ctx);
 
 	if (spi_dw_is_slave(spi)) {
-		SYS_LOG_DBG("Installed slave config %p:"
+		LOG_DBG("Installed slave config %p:"
 			    " ws/dfs %u/%u, mode %u/%u/%u",
 			    config,
 			    SPI_WORD_SIZE_GET(config->operation), spi->dfs,
@@ -269,7 +270,7 @@ static int spi_dw_configure(const struct spi_dw_config *info,
 			    (SPI_MODE_GET(config->operation) &
 			     SPI_MODE_LOOP) ? 1 : 0);
 	} else {
-		SYS_LOG_DBG("Installed master config %p: freq %uHz (div = %u),"
+		LOG_DBG("Installed master config %p: freq %uHz (div = %u),"
 			    " ws/dfs %u/%u, mode %u/%u/%u, slave %u",
 			    config, config->frequency,
 			    SPI_DW_CLK_DIVIDER(config->frequency),
@@ -319,7 +320,7 @@ static void spi_dw_update_txftlr(const struct spi_dw_config *info,
 		}
 	}
 
-	SYS_LOG_DBG("TxFTLR: %u", reg_data);
+	LOG_DBG("TxFTLR: %u", reg_data);
 
 	write_txftlr(reg_data, info->regs);
 }
@@ -415,15 +416,9 @@ static int transceive(struct device *dev,
 		DW_SPI_IMR_UNMASK;
 	write_imr(reg_data, info->regs);
 
-	SYS_LOG_DBG("Ctrlr0 0x%08x Ctrlr1 0x%04x Txftlr 0x%08x"
-		    " Rxftlr 0x%08x Imr 0x%02x",
-		    read_ctrlr0(info->regs), read_ctrlr1(info->regs),
-		    read_txftlr(info->regs), read_rxftlr(info->regs),
-		    read_imr(info->regs));
-
 	spi_context_cs_control(&spi->ctx, true);
 
-	SYS_LOG_DBG("Enabling controller");
+	LOG_DBG("Enabling controller");
 	set_bit_ssienr(info->regs);
 
 	ret = spi_context_wait_for_completion(&spi->ctx);
@@ -438,7 +433,7 @@ static int spi_dw_transceive(struct device *dev,
 			     const struct spi_buf_set *tx_bufs,
 			     const struct spi_buf_set *rx_bufs)
 {
-	SYS_LOG_DBG("%p, %p, %p", dev, tx_bufs, rx_bufs);
+	LOG_DBG("%p, %p, %p", dev, tx_bufs, rx_bufs);
 
 	return transceive(dev, config, tx_bufs, rx_bufs, false, NULL);
 }
@@ -450,7 +445,7 @@ static int spi_dw_transceive_async(struct device *dev,
 				   const struct spi_buf_set *rx_bufs,
 				   struct k_poll_signal *async)
 {
-	SYS_LOG_DBG("%p, %p, %p, %p", dev, tx_bufs, rx_bufs, async);
+	LOG_DBG("%p, %p, %p, %p", dev, tx_bufs, rx_bufs, async);
 
 	return transceive(dev, config, tx_bufs, rx_bufs, true, async);
 }
@@ -477,7 +472,7 @@ void spi_dw_isr(struct device *dev)
 
 	int_status = read_isr(info->regs);
 
-	SYS_LOG_DBG("SPI %p int_status 0x%x - (tx: %d, rx: %d)", dev,
+	LOG_DBG("SPI %p int_status 0x%x - (tx: %d, rx: %d)", dev,
 		    int_status, read_txflr(info->regs), read_rxflr(info->regs));
 
 	if (int_status & DW_SPI_ISR_ERRORS_MASK) {
@@ -522,7 +517,7 @@ int spi_dw_init(struct device *dev)
 	write_imr(DW_SPI_IMR_MASK, info->regs);
 	clear_bit_ssienr(info->regs);
 
-	SYS_LOG_DBG("Designware SPI driver initialized on device: %p", dev);
+	LOG_DBG("Designware SPI driver initialized on device: %p", dev);
 
 	spi_context_unlock_unconditionally(&spi->ctx);
 
diff --git a/drivers/spi/spi_intel.c b/drivers/spi/spi_intel.c
index eb868c087fff..57b6d1ee3a43 100644
--- a/drivers/spi/spi_intel.c
+++ b/drivers/spi/spi_intel.c
@@ -6,9 +6,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define SYS_LOG_DOMAIN "SPI Intel"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SPI_LEVEL
-#include <logging/sys_log.h>
+#define LOG_DOMAIN "SPI Intel"
+#define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(spi_intel);
 
 #include <errno.h>
 
@@ -47,7 +48,7 @@ static void completed(struct device *dev, u32_t error)
 
 	spi_context_cs_control(&spi->ctx, false);
 
-	SYS_LOG_DBG("SPI transaction completed %s error",
+	LOG_DBG("SPI transaction completed %s error",
 		    error ? "with" : "without");
 
 	spi_context_complete(&spi->ctx, error ? -EIO : 0);
@@ -120,7 +121,7 @@ static int spi_intel_configure(struct device *dev,
 {
 	struct spi_intel_data *spi = dev->driver_data;
 
-	SYS_LOG_DBG("%p (0x%x), %p", dev, spi->regs, config);
+	LOG_DBG("%p (0x%x), %p", dev, spi->regs, config);
 
 	if (spi_context_configured(&spi->ctx, config)) {
 		/* Nothing to do */
@@ -185,7 +186,7 @@ static int transceive(struct device *dev,
 
 	/* Check status */
 	if (test_bit_sscr0_sse(spi->regs) && test_bit_sssr_bsy(spi->regs)) {
-		SYS_LOG_DBG("Controller is busy");
+		LOG_DBG("Controller is busy");
 		return -EBUSY;
 	}
 
@@ -218,7 +219,7 @@ static int spi_intel_transceive(struct device *dev,
 				const struct spi_buf_set *tx_bufs,
 				const struct spi_buf_set *rx_bufs)
 {
-	SYS_LOG_DBG("%p, %p, %p", dev, tx_bufs, rx_bufs);
+	LOG_DBG("%p, %p, %p", dev, tx_bufs, rx_bufs);
 
 	return transceive(dev, config, tx_bufs, rx_bufs, false, NULL);
 }
@@ -230,7 +231,7 @@ static int spi_intel_transceive_async(struct device *dev,
 				      const struct spi_buf_set *rx_bufs,
 				      struct k_poll_signal *async)
 {
-	SYS_LOG_DBG("%p, %p, %p, %p", dev, tx_bufs, rx_bufs, async);
+	LOG_DBG("%p, %p, %p, %p", dev, tx_bufs, rx_bufs, async);
 
 	return transceive(dev, config, tx_bufs, rx_bufs, true, async);
 }
@@ -242,7 +243,7 @@ static int spi_intel_release(struct device *dev,
 	struct spi_intel_data *spi = dev->driver_data;
 
 	if (test_bit_sscr0_sse(spi->regs) && test_bit_sssr_bsy(spi->regs)) {
-		SYS_LOG_DBG("Controller is busy");
+		LOG_DBG("Controller is busy");
 		return -EBUSY;
 	}
 
@@ -257,7 +258,7 @@ void spi_intel_isr(struct device *dev)
 	u32_t error = 0;
 	u32_t status;
 
-	SYS_LOG_DBG("%p", dev);
+	LOG_DBG("%p", dev);
 
 	status = read_sssr(spi->regs);
 	if (status & INTEL_SPI_SSSR_ROR) {
@@ -296,7 +297,7 @@ static inline int spi_intel_setup(struct device *dev)
 	pci_bus_scan_init();
 
 	if (!pci_bus_scan(&spi->pci_dev)) {
-		SYS_LOG_DBG("Could not find device");
+		LOG_DBG("Could not find device");
 		return 0;
 	}
 
@@ -339,7 +340,7 @@ int spi_intel_init(struct device *dev)
 
 	irq_enable(info->irq);
 
-	SYS_LOG_DBG("SPI Intel Driver initialized on device: %p", dev);
+	LOG_DBG("SPI Intel Driver initialized on device: %p", dev);
 
 	return 0;
 }
@@ -358,7 +359,7 @@ static int spi_intel_suspend(struct device *dev)
 	const struct spi_intel_config *info = dev->config->config_info;
 	struct spi_intel_data *spi = dev->driver_data;
 
-	SYS_LOG_DBG("%p", dev);
+	LOG_DBG("%p", dev);
 
 	clear_bit_sscr0_sse(spi->regs);
 	irq_disable(info->irq);
@@ -373,7 +374,7 @@ static int spi_intel_resume_from_suspend(struct device *dev)
 	const struct spi_intel_config *info = dev->config->config_info;
 	struct spi_intel_data *spi = dev->driver_data;
 
-	SYS_LOG_DBG("%p", dev);
+	LOG_DBG("%p", dev);
 
 	set_bit_sscr0_sse(spi->regs);
 	irq_enable(info->irq);
diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c
index 009158e500d3..ed7fda9f5f74 100644
--- a/drivers/spi/spi_ll_stm32.c
+++ b/drivers/spi/spi_ll_stm32.c
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SPI_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(spi_ll_stm32);
 
 #include <misc/util.h>
 #include <kernel.h>
@@ -53,7 +54,7 @@ static int spi_stm32_get_err(SPI_TypeDef *spi)
 	u32_t sr = LL_SPI_ReadReg(spi, SR);
 
 	if (sr & SPI_STM32_ERR_MSK) {
-		SYS_LOG_ERR("%s: err=%d", __func__,
+		LOG_ERR("%s: err=%d", __func__,
 			    sr & (u32_t)SPI_STM32_ERR_MSK);
 
 		/* OVR error must be explicitly cleared */
@@ -269,7 +270,7 @@ static int spi_stm32_configure(struct device *dev,
 	}
 
 	if (br > ARRAY_SIZE(scaler)) {
-		SYS_LOG_ERR("Unsupported frequency %uHz, max %uHz, min %uHz",
+		LOG_ERR("Unsupported frequency %uHz, max %uHz, min %uHz",
 			    config->frequency,
 			    clock >> 1,
 			    clock >> ARRAY_SIZE(scaler));
@@ -336,7 +337,7 @@ static int spi_stm32_configure(struct device *dev,
 
 	spi_context_cs_configure(&data->ctx);
 
-	SYS_LOG_DBG("Installed config %p: freq %uHz (div = %u),"
+	LOG_DBG("Installed config %p: freq %uHz (div = %u),"
 		    " mode %u/%u/%u, slave %u",
 		    config, clock >> br, 1 << br,
 		    (SPI_MODE_GET(config->operation) & SPI_MODE_CPOL) ? 1 : 0,
diff --git a/drivers/spi/spi_mcux_dspi.c b/drivers/spi/spi_mcux_dspi.c
index 85489e82c7bc..aa716a5fd87c 100644
--- a/drivers/spi/spi_mcux_dspi.c
+++ b/drivers/spi/spi_mcux_dspi.c
@@ -10,8 +10,9 @@
 #include <clock_control.h>
 #include <fsl_dspi.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SPI_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(spi_mcux_dspi);
 
 #include "spi_context.h"
 
@@ -90,7 +91,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 
 	status = DSPI_MasterTransferNonBlocking(base, &data->handle, &transfer);
 	if (status != kStatus_Success) {
-		SYS_LOG_ERR("Transfer could not start");
+		LOG_ERR("Transfer could not start");
 	}
 }
 
@@ -130,14 +131,14 @@ static int spi_mcux_configure(struct device *dev,
 	DSPI_MasterGetDefaultConfig(&master_config);
 
 	if (spi_cfg->slave > FSL_FEATURE_DSPI_CHIP_SELECT_COUNT) {
-		SYS_LOG_ERR("Slave %d is greater than %d",
+		LOG_ERR("Slave %d is greater than %d",
 			    spi_cfg->slave, FSL_FEATURE_DSPI_CHIP_SELECT_COUNT);
 		return -EINVAL;
 	}
 
 	word_size = SPI_WORD_SIZE_GET(spi_cfg->operation);
 	if (word_size > FSL_FEATURE_DSPI_MAX_DATA_WIDTH) {
-		SYS_LOG_ERR("Word size %d is greater than %d",
+		LOG_ERR("Word size %d is greater than %d",
 			    word_size, FSL_FEATURE_DSPI_MAX_DATA_WIDTH);
 		return -EINVAL;
 	}
diff --git a/drivers/spi/spi_mcux_lpspi.c b/drivers/spi/spi_mcux_lpspi.c
index 11246d5199f7..2881ca178f12 100644
--- a/drivers/spi/spi_mcux_lpspi.c
+++ b/drivers/spi/spi_mcux_lpspi.c
@@ -9,8 +9,9 @@
 #include <clock_control.h>
 #include <fsl_lpspi.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SPI_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(spi_mcux_lpspi);
 
 #include "spi_context.h"
 
@@ -93,7 +94,7 @@ static void spi_mcux_transfer_next_packet(struct device *dev)
 	status = LPSPI_MasterTransferNonBlocking(base, &data->handle,
 						 &transfer);
 	if (status != kStatus_Success) {
-		SYS_LOG_ERR("Transfer could not start");
+		LOG_ERR("Transfer could not start");
 	}
 }
 
@@ -133,7 +134,7 @@ static int spi_mcux_configure(struct device *dev,
 	LPSPI_MasterGetDefaultConfig(&master_config);
 
 	if (spi_cfg->slave > CHIP_SELECT_COUNT) {
-		SYS_LOG_ERR("Slave %d is greater than %d",
+		LOG_ERR("Slave %d is greater than %d",
 			    spi_cfg->slave,
 			    CHIP_SELECT_COUNT);
 		return -EINVAL;
@@ -141,7 +142,7 @@ static int spi_mcux_configure(struct device *dev,
 
 	word_size = SPI_WORD_SIZE_GET(spi_cfg->operation);
 	if (word_size > MAX_DATA_WIDTH) {
-		SYS_LOG_ERR("Word size %d is greater than %d",
+		LOG_ERR("Word size %d is greater than %d",
 			    word_size, MAX_DATA_WIDTH);
 		return -EINVAL;
 	}
diff --git a/drivers/spi/spi_nrfx_spi.c b/drivers/spi/spi_nrfx_spi.c
index 6ec344c2af03..192aad50885f 100644
--- a/drivers/spi/spi_nrfx_spi.c
+++ b/drivers/spi/spi_nrfx_spi.c
@@ -7,9 +7,10 @@
 #include <spi.h>
 #include <nrfx_spi.h>
 
-#define SYS_LOG_DOMAIN "spi_nrfx_spi"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SPI_LEVEL
-#include <logging/sys_log.h>
+#define LOG_DOMAIN "spi_nrfx_spi"
+#define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(spi_nrfx_spi);
 
 #include "spi_context.h"
 
@@ -92,29 +93,29 @@ static int configure(struct device *dev,
 	}
 
 	if (SPI_OP_MODE_GET(spi_cfg->operation) != SPI_OP_MODE_MASTER) {
-		SYS_LOG_ERR("Slave mode is not supported on %s",
+		LOG_ERR("Slave mode is not supported on %s",
 			    dev->config->name);
 		return -EINVAL;
 	}
 
 	if (spi_cfg->operation & SPI_MODE_LOOP) {
-		SYS_LOG_ERR("Loopback mode is not supported");
+		LOG_ERR("Loopback mode is not supported");
 		return -EINVAL;
 	}
 
 	if ((spi_cfg->operation & SPI_LINES_MASK) != SPI_LINES_SINGLE) {
-		SYS_LOG_ERR("Only single line mode is supported");
+		LOG_ERR("Only single line mode is supported");
 		return -EINVAL;
 	}
 
 	if (SPI_WORD_SIZE_GET(spi_cfg->operation) != 8) {
-		SYS_LOG_ERR("Word sizes other than 8 bits"
+		LOG_ERR("Word sizes other than 8 bits"
 			    " are not supported");
 		return -EINVAL;
 	}
 
 	if (spi_cfg->frequency < 125000) {
-		SYS_LOG_ERR("Frequencies lower than 125 kHz are not supported");
+		LOG_ERR("Frequencies lower than 125 kHz are not supported");
 		return -EINVAL;
 	}
 
@@ -158,7 +159,7 @@ static void transfer_next_chunk(struct device *dev)
 
 	spi_context_cs_control(ctx, false);
 
-	SYS_LOG_DBG("Transaction finished with status %d", error);
+	LOG_DBG("Transaction finished with status %d", error);
 
 	spi_context_complete(ctx, error);
 	dev_data->busy = false;
@@ -260,7 +261,7 @@ static int init_spi(struct device *dev, const nrfx_spi_config_t *config)
 					  event_handler,
 					  dev);
 	if (result != NRFX_SUCCESS) {
-		SYS_LOG_ERR("Failed to initialize device: %s",
+		LOG_ERR("Failed to initialize device: %s",
 			    dev->config->name);
 		return -EBUSY;
 	}
diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c
index dad5940dff0d..fb55e58b7f96 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -8,9 +8,10 @@
 #include <nrfx_spim.h>
 #include <string.h>
 
-#define SYS_LOG_DOMAIN "spi_nrfx_spim"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SPI_LEVEL
-#include <logging/sys_log.h>
+#define LOG_DOMAIN "spi_nrfx_spim"
+#define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(spi_nrfx_spim);
 
 #include "spi_context.h"
 
@@ -106,29 +107,29 @@ static int configure(struct device *dev,
 	}
 
 	if (SPI_OP_MODE_GET(spi_cfg->operation) != SPI_OP_MODE_MASTER) {
-		SYS_LOG_ERR("Slave mode is not supported on %s",
+		LOG_ERR("Slave mode is not supported on %s",
 			    dev->config->name);
 		return -EINVAL;
 	}
 
 	if (spi_cfg->operation & SPI_MODE_LOOP) {
-		SYS_LOG_ERR("Loopback mode is not supported");
+		LOG_ERR("Loopback mode is not supported");
 		return -EINVAL;
 	}
 
 	if ((spi_cfg->operation & SPI_LINES_MASK) != SPI_LINES_SINGLE) {
-		SYS_LOG_ERR("Only single line mode is supported");
+		LOG_ERR("Only single line mode is supported");
 		return -EINVAL;
 	}
 
 	if (SPI_WORD_SIZE_GET(spi_cfg->operation) != 8) {
-		SYS_LOG_ERR("Word sizes other than 8 bits"
+		LOG_ERR("Word sizes other than 8 bits"
 			    " are not supported");
 		return -EINVAL;
 	}
 
 	if (spi_cfg->frequency < 125000) {
-		SYS_LOG_ERR("Frequencies lower than 125 kHz are not supported");
+		LOG_ERR("Frequencies lower than 125 kHz are not supported");
 		return -EINVAL;
 	}
 
@@ -187,7 +188,7 @@ static void transfer_next_chunk(struct device *dev)
 
 	spi_context_cs_control(ctx, false);
 
-	SYS_LOG_DBG("Transaction finished with status %d", error);
+	LOG_DBG("Transaction finished with status %d", error);
 
 	spi_context_complete(ctx, error);
 	dev_data->busy = false;
@@ -289,7 +290,7 @@ static int init_spim(struct device *dev, const nrfx_spim_config_t *config)
 					   event_handler,
 					   dev);
 	if (result != NRFX_SUCCESS) {
-		SYS_LOG_ERR("Failed to initialize device: %s",
+		LOG_ERR("Failed to initialize device: %s",
 			    dev->config->name);
 		return -EBUSY;
 	}
diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c
index 3caf60f9ac6c..a44b7feeb8ba 100644
--- a/drivers/spi/spi_nrfx_spis.c
+++ b/drivers/spi/spi_nrfx_spis.c
@@ -7,9 +7,10 @@
 #include <spi.h>
 #include <nrfx_spis.h>
 
-#define SYS_LOG_DOMAIN "spi_nrfx_spis"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SPI_LEVEL
-#include <logging/sys_log.h>
+#define LOG_DOMAIN "spi_nrfx_spis"
+#define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(spi_nrfx_spis);
 
 #include "spi_context.h"
 
@@ -69,29 +70,29 @@ static int configure(struct device *dev,
 	}
 
 	if (SPI_OP_MODE_GET(spi_cfg->operation) == SPI_OP_MODE_MASTER) {
-		SYS_LOG_ERR("Master mode is not supported on %s",
+		LOG_ERR("Master mode is not supported on %s",
 			    dev->config->name);
 		return -EINVAL;
 	}
 
 	if (spi_cfg->operation & SPI_MODE_LOOP) {
-		SYS_LOG_ERR("Loopback mode is not supported");
+		LOG_ERR("Loopback mode is not supported");
 		return -EINVAL;
 	}
 
 	if ((spi_cfg->operation & SPI_LINES_MASK) != SPI_LINES_SINGLE) {
-		SYS_LOG_ERR("Only single line mode is supported");
+		LOG_ERR("Only single line mode is supported");
 		return -EINVAL;
 	}
 
 	if (SPI_WORD_SIZE_GET(spi_cfg->operation) != 8) {
-		SYS_LOG_ERR("Word sizes other than 8 bits"
+		LOG_ERR("Word sizes other than 8 bits"
 			    " are not supported");
 		return -EINVAL;
 	}
 
 	if (spi_cfg->cs) {
-		SYS_LOG_ERR("CS control via GPIO is not supported");
+		LOG_ERR("CS control via GPIO is not supported");
 		return -EINVAL;
 	}
 
@@ -153,11 +154,11 @@ static int transceive(struct device *dev,
 		/* Invalid configuration. */
 	} else if ((tx_bufs && tx_bufs->count > 1) ||
 		   (rx_bufs && rx_bufs->count > 1)) {
-		SYS_LOG_ERR("Scattered buffers are not supported");
+		LOG_ERR("Scattered buffers are not supported");
 		error = -ENOTSUP;
 	} else if (tx_bufs && tx_bufs->buffers[0].len &&
 		   !nrfx_is_in_ram(tx_bufs->buffers[0].buf)) {
-		SYS_LOG_ERR("Only buffers located in RAM are supported");
+		LOG_ERR("Only buffers located in RAM are supported");
 		error = -ENOTSUP;
 	} else {
 		spi_context_buffers_setup(&dev_data->ctx, tx_bufs, rx_bufs, 1);
@@ -236,7 +237,7 @@ static int init_spis(struct device *dev, const nrfx_spis_config_t *config)
 					   event_handler,
 					   dev);
 	if (result != NRFX_SUCCESS) {
-		SYS_LOG_ERR("Failed to initialize device: %s",
+		LOG_ERR("Failed to initialize device: %s",
 			    dev->config->name);
 		return -EBUSY;
 	}
diff --git a/drivers/spi/spi_sam0.c b/drivers/spi/spi_sam0.c
index 6e0634b096a8..6986f4fe78b0 100644
--- a/drivers/spi/spi_sam0.c
+++ b/drivers/spi/spi_sam0.c
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_SPI_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(spi_sam0);
 
 #include "spi_context.h"
 #include <errno.h>
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 0f02259d9d2f..e2c171a6327a 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -28,19 +28,9 @@ config WDT_DISABLE_AT_BOOT
 	help
 	  Disable watchdog at Zephyr system startup.
 
-config SYS_LOG_WDT_LEVEL
-	int "Watchdog Driver Log level"
-	depends on SYS_LOG
-	default 0
-	range 0 4
-	help
-	  Sets log level for Watchdog drivers.
-	  Levels are:
-	  0 OFF, do not write
-	  1 ERROR, only write SYS_LOG_ERR
-	  2 WARNING, write SYS_LOG_WRN in addition to previous level
-	  3 INFO, write SYS_LOG_INF in addition to previous levels
-	  4 DEBUG, write SYS_LOG_DBG in addition to previous levels
+module = WDT
+module-str = watchdog
+source "subsys/logging/Kconfig.template.log_config"
 
 config HAS_WDT_MULTISTAGE
 	bool
diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c
index bb53b1e6f6c0..9f79149b713e 100644
--- a/drivers/watchdog/wdt_mcux_wdog.c
+++ b/drivers/watchdog/wdt_mcux_wdog.c
@@ -9,8 +9,9 @@
 #include <clock_control.h>
 #include <fsl_wdog.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_WDT_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(wdt_mcux_wdog)
 
 #define MIN_TIMEOUT 4
 
@@ -34,7 +35,7 @@ static int mcux_wdog_setup(struct device *dev, u8_t options)
 	WDOG_Type *base = config->base;
 
 	if (!data->timeout_valid) {
-		SYS_LOG_ERR("No valid timeouts installed");
+		LOG_ERR("No valid timeouts installed");
 		return -EINVAL;
 	}
 
@@ -45,7 +46,7 @@ static int mcux_wdog_setup(struct device *dev, u8_t options)
 		(options & WDT_OPT_PAUSE_HALTED_BY_DBG) == 0;
 
 	WDOG_Init(base, &data->wdog_config);
-	SYS_LOG_DBG("Setup the watchdog");
+	LOG_DBG("Setup the watchdog");
 
 	return 0;
 }
@@ -58,7 +59,7 @@ static int mcux_wdog_disable(struct device *dev)
 
 	WDOG_Deinit(base);
 	data->timeout_valid = false;
-	SYS_LOG_DBG("Disabled the watchdog");
+	LOG_DBG("Disabled the watchdog");
 
 	return 0;
 }
@@ -72,7 +73,7 @@ static int mcux_wdog_install_timeout(struct device *dev,
 	u32_t clock_freq;
 
 	if (data->timeout_valid) {
-		SYS_LOG_ERR("No more timeouts can be installed");
+		LOG_ERR("No more timeouts can be installed");
 		return -ENOMEM;
 	}
 
@@ -101,7 +102,7 @@ static int mcux_wdog_install_timeout(struct device *dev,
 
 	if ((data->wdog_config.timeoutValue < MIN_TIMEOUT) ||
 	    (data->wdog_config.timeoutValue < data->wdog_config.windowValue)) {
-		SYS_LOG_ERR("Invalid timeout");
+		LOG_ERR("Invalid timeout");
 		return -EINVAL;
 	}
 
@@ -119,12 +120,12 @@ static int mcux_wdog_feed(struct device *dev, int channel_id)
 	WDOG_Type *base = config->base;
 
 	if (channel_id != 0) {
-		SYS_LOG_ERR("Invalid channel id");
+		LOG_ERR("Invalid channel id");
 		return -EINVAL;
 	}
 
 	WDOG_Refresh(base);
-	SYS_LOG_DBG("Fed the watchdog");
+	LOG_DBG("Fed the watchdog");
 
 	return 0;
 }
diff --git a/drivers/watchdog/wdt_nrfx.c b/drivers/watchdog/wdt_nrfx.c
index da5de1c57eb3..4297789c6a3a 100644
--- a/drivers/watchdog/wdt_nrfx.c
+++ b/drivers/watchdog/wdt_nrfx.c
@@ -7,9 +7,9 @@
 #include <nrfx_wdt.h>
 #include <watchdog.h>
 
-#define SYS_LOG_DOMAIN "wdt_nrfx"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_WDT_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(wdt_nrfx);
 
 DEVICE_DECLARE(wdt_nrfx);
 
@@ -130,7 +130,7 @@ static void wdt_nrf_enable(struct device *dev)
 {
 	ARG_UNUSED(dev);
 	/* Deprecated function. No implementation needed. */
-	SYS_LOG_ERR("Function not implemented!");
+	LOG_ERR("Function not implemented!");
 }
 
 static int wdt_nrf_set_config(struct device *dev, struct wdt_config *config)
@@ -138,7 +138,7 @@ static int wdt_nrf_set_config(struct device *dev, struct wdt_config *config)
 	ARG_UNUSED(dev);
 	ARG_UNUSED(config);
 	/* Deprecated function. No implementation needed. */
-	SYS_LOG_ERR("Function not implemented!");
+	LOG_ERR("Function not implemented!");
 	return 0;
 }
 
@@ -147,14 +147,14 @@ static void wdt_nrf_get_config(struct device *dev, struct wdt_config *config)
 	ARG_UNUSED(dev);
 	ARG_UNUSED(config);
 	/* Deprecated function. No implementation needed. */
-	SYS_LOG_ERR("Function not implemented!");
+	LOG_ERR("Function not implemented!");
 }
 
 static void wdt_nrf_reload(struct device *dev)
 {
 	ARG_UNUSED(dev);
 	/* Deprecated function. No implementation needed. */
-	SYS_LOG_ERR("Function not implemented!");
+	LOG_ERR("Function not implemented!");
 }
 
 static const struct wdt_driver_api wdt_nrf_api = {
diff --git a/drivers/watchdog/wdt_sam.c b/drivers/watchdog/wdt_sam.c
index fbd95c1a50ae..652da0972823 100644
--- a/drivers/watchdog/wdt_sam.c
+++ b/drivers/watchdog/wdt_sam.c
@@ -18,8 +18,9 @@
 #include <watchdog.h>
 #include <soc.h>
 
-#define SYS_LOG_DOMAIN "dev/wdt_sam"
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(wdt_sam);
 
 /* Device constant configuration parameters */
 struct wdt_sam_dev_cfg {
@@ -33,7 +34,7 @@ static void wdt_sam_enable(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
-	SYS_LOG_ERR("Function not implemented!");
+	LOG_ERR("Function not implemented!");
 }
 
 static int wdt_sam_disable(struct device *dev)
@@ -50,7 +51,7 @@ static int wdt_sam_set_config(struct device *dev, struct wdt_config *config)
 	ARG_UNUSED(dev);
 	ARG_UNUSED(config);
 
-	SYS_LOG_ERR("Function not implemented!");
+	LOG_ERR("Function not implemented!");
 
 	return -ENOTSUP;
 }
@@ -60,14 +61,14 @@ static void wdt_sam_get_config(struct device *dev, struct wdt_config *config)
 	ARG_UNUSED(dev);
 	ARG_UNUSED(config);
 
-	SYS_LOG_ERR("Function not implemented!");
+	LOG_ERR("Function not implemented!");
 }
 
 static void wdt_sam_reload(struct device *dev)
 {
 	ARG_UNUSED(dev);
 
-	SYS_LOG_ERR("Function not implemented!");
+	LOG_ERR("Function not implemented!");
 }
 
 static const struct wdt_driver_api wdt_sam_api = {
diff --git a/kernel/Kconfig b/kernel/Kconfig
index 64a890b347b9..302806a6b382 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -9,6 +9,10 @@
 
 menu "General Kernel Options"
 
+module = KERNEL
+module-str = kernel
+source "subsys/logging/Kconfig.template.log_config"
+
 config MULTITHREADING
 	bool "Multi-threading"
 	default y
diff --git a/kernel/init.c b/kernel/init.c
index e9cdcfa87ce5..8a0531d39488 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -35,6 +35,9 @@
 #include <stdbool.h>
 
 #define IDLE_THREAD_NAME	"idle"
+#define LOG_LEVEL CONFIG_KERNEL_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(kernel);
 
 /* boot banner items */
 #if defined(CONFIG_BOOT_DELAY) && CONFIG_BOOT_DELAY > 0
diff --git a/kernel/userspace.c b/kernel/userspace.c
index 54003e27f050..df2c2ab53c4f 100644
--- a/kernel/userspace.c
+++ b/kernel/userspace.c
@@ -16,7 +16,11 @@
 #include <syscall_handler.h>
 #include <device.h>
 #include <init.h>
-#include <logging/sys_log.h>
+
+#define LOG_LEVEL CONFIG_KERNEL_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_DECLARE(kernel);
+
 #if defined(CONFIG_NETWORKING) && defined (CONFIG_DYNAMIC_OBJECTS)
 /* Used by auto-generated obj_size_get() switch body, as we need to
  * know the size of struct net_context
@@ -221,7 +225,7 @@ void *_impl_k_object_alloc(enum k_objects otype)
 
 	dyn_obj = z_thread_malloc(sizeof(*dyn_obj) + obj_size_get(otype));
 	if (dyn_obj == NULL) {
-		SYS_LOG_WRN("could not allocate kernel object");
+		LOG_WRN("could not allocate kernel object");
 		return NULL;
 	}
 
diff --git a/lib/libc/minimal/source/stdlib/malloc.c b/lib/libc/minimal/source/stdlib/malloc.c
index a8d63b71980f..da7412b83a54 100644
--- a/lib/libc/minimal/source/stdlib/malloc.c
+++ b/lib/libc/minimal/source/stdlib/malloc.c
@@ -10,7 +10,10 @@
 #include <errno.h>
 #include <misc/mempool.h>
 #include <string.h>
-#include <logging/sys_log.h>
+
+#define LOG_LEVEL CONFIG_KERNEL_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_DECLARE(os);
 
 #if (CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE > 0)
 K_MUTEX_DEFINE(malloc_mutex);
@@ -47,7 +50,7 @@ void *malloc(size_t size)
 {
 	ARG_UNUSED(size);
 
-	SYS_LOG_DBG("CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE is 0\n");
+	LOG_DBG("CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE is 0");
 	errno = ENOMEM;
 
 	return NULL;
diff --git a/samples/basic/blink_led/prj.conf b/samples/basic/blink_led/prj.conf
index d1c3797d9148..cb214aed3e89 100644
--- a/samples/basic/blink_led/prj.conf
+++ b/samples/basic/blink_led/prj.conf
@@ -1,5 +1,5 @@
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_PRINTK=y
 CONFIG_PWM=y
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_PWM_LEVEL=4
+CONFIG_LOG=y
+CONFIG_PWM_LOG_LEVEL_DBG=y
diff --git a/samples/basic/blink_led/prj_nrf52840_pca10056.conf b/samples/basic/blink_led/prj_nrf52840_pca10056.conf
index 06ef306b9a14..6d3651f76881 100644
--- a/samples/basic/blink_led/prj_nrf52840_pca10056.conf
+++ b/samples/basic/blink_led/prj_nrf52840_pca10056.conf
@@ -1,7 +1,6 @@
-CONFIG_STDOUT_CONSOLE=y
 CONFIG_PRINTK=y
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_PWM_LEVEL=4
+CONFIG_LOG=y
+CONFIG_PWM_LOG_LEVEL_DBG=y
 
 CONFIG_PWM=y
 CONFIG_PWM_NRF5_SW_0_CLOCK_PRESCALER=9
diff --git a/samples/basic/fade_led/prj.conf b/samples/basic/fade_led/prj.conf
index d1c3797d9148..c9c45065fe24 100644
--- a/samples/basic/fade_led/prj.conf
+++ b/samples/basic/fade_led/prj.conf
@@ -1,5 +1,4 @@
-CONFIG_STDOUT_CONSOLE=y
 CONFIG_PRINTK=y
 CONFIG_PWM=y
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_PWM_LEVEL=4
+CONFIG_LOG=y
+CONFIG_PWM_LOG_LEVEL_DBG=y
diff --git a/samples/basic/rgb_led/prj.conf b/samples/basic/rgb_led/prj.conf
index 36ddff395bd9..459064393e7b 100644
--- a/samples/basic/rgb_led/prj.conf
+++ b/samples/basic/rgb_led/prj.conf
@@ -1,6 +1,5 @@
-CONFIG_STDOUT_CONSOLE=y
 CONFIG_PRINTK=y
 CONFIG_PWM=y
 CONFIG_PWM_QMSI_NUM_PORTS=3
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_PWM_LEVEL=4
+CONFIG_LOG=y
+CONFIG_PWM_LOG_LEVEL_DBG=y
diff --git a/samples/display/ili9340/prj.conf b/samples/display/ili9340/prj.conf
index c1e05fc59e91..623306596d22 100644
--- a/samples/display/ili9340/prj.conf
+++ b/samples/display/ili9340/prj.conf
@@ -8,7 +8,7 @@ CONFIG_SPI_1=y
 
 CONFIG_DISPLAY=y
 CONFIG_ILI9340=y
-CONFIG_LOG_ILI9340_LEVEL=4
+CONFIG_DISPLAY_LOG_LEVEL_DBG=y
 CONFIG_ILI9340_SPI_DEV_NAME="SPI_1"
 CONFIG_ILI9340_RESET_GPIO_PORT_NAME="GPIOA"
 CONFIG_ILI9340_RESET_PIN=9
diff --git a/samples/display/ili9340/src/main.c b/samples/display/ili9340/src/main.c
index 8101708b167e..0a764e76de32 100644
--- a/samples/display/ili9340/src/main.c
+++ b/samples/display/ili9340/src/main.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <zephyr.h>
 
-#define LOG_LEVEL LOG_LEVEL_DEBUG
+#define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 #include <logging/log.h>
 LOG_MODULE_REGISTER(main);
 
diff --git a/samples/drivers/crypto/prj.conf b/samples/drivers/crypto/prj.conf
index bb71b17a17fa..d8e263cb53b1 100644
--- a/samples/drivers/crypto/prj.conf
+++ b/samples/drivers/crypto/prj.conf
@@ -5,5 +5,5 @@ CONFIG_TINYCRYPT_AES_CTR=y
 CONFIG_TINYCRYPT_AES_CCM=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_TINYCRYPT_SHIM=y
-CONFIG_SYS_LOG_CRYPTO_LEVEL=4
-CONFIG_SYS_LOG=y
+CONFIG_CRYPTO_LOG_LEVEL_DBG=y
+CONFIG_LOG=y
diff --git a/samples/drivers/crypto/prj_mtls_shim.conf b/samples/drivers/crypto/prj_mtls_shim.conf
index 755ce68335b7..c7c96d26d5d3 100644
--- a/samples/drivers/crypto/prj_mtls_shim.conf
+++ b/samples/drivers/crypto/prj_mtls_shim.conf
@@ -1,4 +1,4 @@
-CONFIG_SYS_LOG=y
+CONFIG_LOG=y
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_BUILTIN=y
 CONFIG_MBEDTLS_CFG_FILE="config-tls-generic.h"
@@ -8,4 +8,4 @@ CONFIG_MAIN_STACK_SIZE=4096
 
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_MBEDTLS_SHIM=y
-CONFIG_SYS_LOG_CRYPTO_LEVEL=4
+CONFIG_CRYPTO_LOG_LEVEL_DBG=y
diff --git a/samples/drivers/crypto/sample.yaml b/samples/drivers/crypto/sample.yaml
index e10930c63966..77038f25875a 100644
--- a/samples/drivers/crypto/sample.yaml
+++ b/samples/drivers/crypto/sample.yaml
@@ -6,6 +6,7 @@ common:
   tags: crypto
   harness: console
   min_ram: 20
+  arch_exclude: xtensa
 tests:
   test-mbedtls:
     min_flash: 34
@@ -15,11 +16,8 @@ tests:
       regex:
         - ".*: Cipher Sample"
         - ".*main: CBC Mode"
-        - ".*mtls_session_setup: Unsupported mode"
         - ".*main: CTR Mode"
         - ".*main: CCM Mode"
-        - ".*ccm_mode: CCM mode ENCRYPT - Match"
-        - ".*ccm_mode: CCM mode DECRYPT - Match"
   test-micro:
     tags: micro
     harness_config:
@@ -27,11 +25,5 @@ tests:
       regex:
         - ".*: Cipher Sample"
         - ".*main: CBC Mode"
-        - ".*cbc_mode: CBC mode ENCRYPT - Match"
-        - ".*cbc_mode: CBC mode DECRYPT - Match"
         - ".*main: CTR Mode"
-        - ".*ctr_mode: CTR mode ENCRYPT - Match"
-        - ".*ctr_mode: CTR mode DECRYPT - Match"
         - ".*main: CCM Mode"
-        - ".*ccm_mode: CCM mode ENCRYPT - Match"
-        - ".*ccm_mode: CCM mode DECRYPT - Match"
diff --git a/samples/drivers/crypto/src/main.c b/samples/drivers/crypto/src/main.c
index 0fb5648e0754..ac476cf94d34 100644
--- a/samples/drivers/crypto/src/main.c
+++ b/samples/drivers/crypto/src/main.c
@@ -13,8 +13,9 @@
 #include <string.h>
 #include <crypto/cipher.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_CRYPTO_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_CRYPTO_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(main);
 
 #ifdef CONFIG_CRYPTO_TINYCRYPT_SHIM
 #define CRYPTO_DRV_NAME CONFIG_CRYPTO_TINYCRYPT_SHIM_DRV_NAME
@@ -88,19 +89,19 @@ int validate_hw_compatibility(struct device *dev)
 
 	flags = cipher_query_hwcaps(dev);
 	if ((flags & CAP_RAW_KEY) == 0) {
-		SYS_LOG_INF(" Please provision the key separately "
+		LOG_INF("Please provision the key separately "
 			"as the module doesnt support a raw key");
 		return -1;
 	}
 
 	if ((flags & CAP_SYNC_OPS) == 0) {
-		SYS_LOG_ERR("The app assumes sync semantics. "
+		LOG_ERR("The app assumes sync semantics. "
 		  "Please rewrite the app accordingly before proceeding");
 		return -1;
 	}
 
 	if ((flags & CAP_SEPARATE_IO_BUFS) == 0) {
-		SYS_LOG_ERR("The app assumes distinct IO buffers. "
+		LOG_ERR("The app assumes distinct IO buffers. "
 		"Please rewrite the app accordingly before proceeding");
 		return -1;
 	}
@@ -140,21 +141,21 @@ void cbc_mode(struct device *dev)
 	}
 
 	if (cipher_cbc_op(&ini, &encrypt, iv)) {
-		SYS_LOG_ERR("CBC mode ENCRYPT - Failed");
+		LOG_ERR("CBC mode ENCRYPT - Failed");
 		goto out;
 	}
 
-	SYS_LOG_INF("Output length (encryption): %d", encrypt.out_len);
+	LOG_INF("Output length (encryption): %d", encrypt.out_len);
 
 	if (memcmp(encrypt.out_buf, ciphertext, sizeof(ciphertext))) {
-		SYS_LOG_ERR("CBC mode ENCRYPT - Mismatch between expected and "
+		LOG_ERR("CBC mode ENCRYPT - Mismatch between expected and "
 			    "returned cipher text");
 		print_buffer_comparison(ciphertext,
 					encrypt.out_buf, sizeof(ciphertext));
 		goto out;
 	}
 
-	SYS_LOG_INF("CBC mode ENCRYPT - Match");
+	LOG_INF("CBC mode ENCRYPT - Match");
 	cipher_free_session(dev, &ini);
 
 	if (cipher_begin_session(dev, &ini, CRYPTO_CIPHER_ALGO_AES,
@@ -165,21 +166,21 @@ void cbc_mode(struct device *dev)
 
 	/* TinyCrypt keeps IV at the start of encrypted buffer */
 	if (cipher_cbc_op(&ini, &decrypt, encrypted)) {
-		SYS_LOG_ERR("CBC mode DECRYPT - Failed");
+		LOG_ERR("CBC mode DECRYPT - Failed");
 		goto out;
 	}
 
-	SYS_LOG_INF("Output length (decryption): %d", decrypt.out_len);
+	LOG_INF("Output length (decryption): %d", decrypt.out_len);
 
 	if (memcmp(decrypt.out_buf, plaintext, sizeof(plaintext))) {
-		SYS_LOG_ERR("CBC mode DECRYPT - Mismatch between plaintext and "
+		LOG_ERR("CBC mode DECRYPT - Mismatch between plaintext and "
 			    "decrypted cipher text");
 		print_buffer_comparison(plaintext,
 					decrypt.out_buf, sizeof(plaintext));
 		goto out;
 	}
 
-	SYS_LOG_INF("CBC mode DECRYPT - Match");
+	LOG_INF("CBC mode DECRYPT - Match");
 out:
 	cipher_free_session(dev, &ini);
 }
@@ -230,21 +231,21 @@ void ctr_mode(struct device *dev)
 	}
 
 	if (cipher_ctr_op(&ini, &encrypt, iv)) {
-		SYS_LOG_ERR("CTR mode ENCRYPT - Failed");
+		LOG_ERR("CTR mode ENCRYPT - Failed");
 		goto out;
 	}
 
-	SYS_LOG_INF("Output length (encryption): %d", encrypt.out_len);
+	LOG_INF("Output length (encryption): %d", encrypt.out_len);
 
 	if (memcmp(encrypt.out_buf, ctr_ciphertext, sizeof(ctr_ciphertext))) {
-		SYS_LOG_ERR("CTR mode ENCRYPT - Mismatch between expected "
+		LOG_ERR("CTR mode ENCRYPT - Mismatch between expected "
 			    "and returned cipher text");
 		print_buffer_comparison(ctr_ciphertext, encrypt.out_buf,
 					sizeof(ctr_ciphertext));
 		goto out;
 	}
 
-	SYS_LOG_INF("CTR mode ENCRYPT - Match");
+	LOG_INF("CTR mode ENCRYPT - Match");
 	cipher_free_session(dev, &ini);
 
 	if (cipher_begin_session(dev, &ini, CRYPTO_CIPHER_ALGO_AES,
@@ -254,21 +255,21 @@ void ctr_mode(struct device *dev)
 	}
 
 	if (cipher_ctr_op(&ini, &decrypt, iv)) {
-		SYS_LOG_ERR("CTR mode DECRYPT - Failed");
+		LOG_ERR("CTR mode DECRYPT - Failed");
 		goto out;
 	}
 
-	SYS_LOG_INF("Output length (decryption): %d", decrypt.out_len);
+	LOG_INF("Output length (decryption): %d", decrypt.out_len);
 
 	if (memcmp(decrypt.out_buf, plaintext, sizeof(plaintext))) {
-		SYS_LOG_ERR("CTR mode DECRYPT - Mismatch between plaintext "
+		LOG_ERR("CTR mode DECRYPT - Mismatch between plaintext "
 			    "and decypted cipher text");
 		print_buffer_comparison(plaintext,
 					decrypt.out_buf, sizeof(plaintext));
 		goto out;
 	}
 
-	SYS_LOG_INF("CTR mode DECRYPT - Match");
+	LOG_INF("CTR mode DECRYPT - Match");
 out:
 	cipher_free_session(dev, &ini);
 }
@@ -341,21 +342,21 @@ void ccm_mode(struct device *dev)
 
 	ccm_op.pkt = &encrypt;
 	if (cipher_ccm_op(&ini, &ccm_op, ccm_nonce)) {
-		SYS_LOG_ERR("CCM mode ENCRYPT - Failed");
+		LOG_ERR("CCM mode ENCRYPT - Failed");
 		goto out;
 	}
 
-	SYS_LOG_INF("Output length (encryption): %d", encrypt.out_len);
+	LOG_INF("Output length (encryption): %d", encrypt.out_len);
 
 	if (memcmp(encrypt.out_buf, ccm_expected, sizeof(ccm_expected))) {
-		SYS_LOG_ERR("CCM mode ENCRYPT - Mismatch between expected "
+		LOG_ERR("CCM mode ENCRYPT - Mismatch between expected "
 			    "and returned cipher text");
 		print_buffer_comparison(ccm_expected,
 					encrypt.out_buf, sizeof(ccm_expected));
 		goto out;
 	}
 
-	SYS_LOG_INF("CCM mode ENCRYPT - Match");
+	LOG_INF("CCM mode ENCRYPT - Match");
 	cipher_free_session(dev, &ini);
 
 	if (cipher_begin_session(dev, &ini, CRYPTO_CIPHER_ALGO_AES,
@@ -366,21 +367,21 @@ void ccm_mode(struct device *dev)
 
 	ccm_op.pkt = &decrypt;
 	if (cipher_ccm_op(&ini, &ccm_op, ccm_nonce)) {
-		SYS_LOG_ERR("CCM mode DECRYPT - Failed");
+		LOG_ERR("CCM mode DECRYPT - Failed");
 		goto out;
 	}
 
-	SYS_LOG_INF("Output length (decryption): %d", decrypt.out_len);
+	LOG_INF("Output length (decryption): %d", decrypt.out_len);
 
 	if (memcmp(decrypt.out_buf, ccm_data, sizeof(ccm_data))) {
-		SYS_LOG_ERR("CCM mode DECRYPT - Mismatch between plaintext "
+		LOG_ERR("CCM mode DECRYPT - Mismatch between plaintext "
 			"and decrypted cipher text");
 		print_buffer_comparison(ccm_data,
 					decrypt.out_buf, sizeof(ccm_data));
 		goto out;
 	}
 
-	SYS_LOG_INF("CCM mode DECRYPT - Match");
+	LOG_INF("CCM mode DECRYPT - Match");
 out:
 	cipher_free_session(dev, &ini);
 }
@@ -402,19 +403,19 @@ void main(void)
 	int i;
 
 	if (!dev) {
-		SYS_LOG_ERR("%s pseudo device not found", CRYPTO_DRV_NAME);
+		LOG_ERR("%s pseudo device not found", CRYPTO_DRV_NAME);
 		return;
 	}
 
 	if (validate_hw_compatibility(dev)) {
-		SYS_LOG_ERR("Incompatible h/w");
+		LOG_ERR("Incompatible h/w");
 		return;
 	}
 
-	SYS_LOG_INF("Cipher Sample");
+	LOG_INF("Cipher Sample");
 
 	for (i = 0; modes[i].mode; i++) {
-		SYS_LOG_INF("%s", modes[i].mode);
+		LOG_INF("%s", modes[i].mode);
 		modes[i].mode_func(dev);
 	}
 }
diff --git a/samples/drivers/flash_shell/prj.conf b/samples/drivers/flash_shell/prj.conf
index be3cfa1c47a8..7b470f4bfac4 100644
--- a/samples/drivers/flash_shell/prj.conf
+++ b/samples/drivers/flash_shell/prj.conf
@@ -1,7 +1,6 @@
 CONFIG_PRINTK=y
 CONFIG_CONSOLE_SHELL=y
 CONFIG_KERNEL_SHELL=y
-CONFIG_STDOUT_CONSOLE=y
 CONFIG_FLASH=y
 # Your flash driver may not enable this, even if it's supported.
 # If that's the case and you're interested in the flash layout, enable
@@ -9,5 +8,4 @@ CONFIG_FLASH=y
 # CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_DEFAULT_LEVEL=4
+CONFIG_LOG=y
diff --git a/samples/drivers/led_lp3943/prj.conf b/samples/drivers/led_lp3943/prj.conf
index 452c989283a6..6f7d4aa2515f 100644
--- a/samples/drivers/led_lp3943/prj.conf
+++ b/samples/drivers/led_lp3943/prj.conf
@@ -1,6 +1,4 @@
-CONFIG_SYS_LOG=y
-
+CONFIG_LOG=y
 CONFIG_I2C=y
-
 CONFIG_LED=y
 CONFIG_LP3943=y
diff --git a/samples/drivers/led_lp3943/src/main.c b/samples/drivers/led_lp3943/src/main.c
index 30e89f6c401c..70380db234e7 100644
--- a/samples/drivers/led_lp3943/src/main.c
+++ b/samples/drivers/led_lp3943/src/main.c
@@ -10,8 +10,9 @@
 #include <misc/util.h>
 #include <zephyr.h>
 
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(log)
 
 #define LED_DEV_NAME CONFIG_LP3943_DEV_NAME
 #define NUM_LEDS 16
@@ -25,9 +26,9 @@ void main(void)
 
 	led_dev = device_get_binding(LED_DEV_NAME);
 	if (led_dev) {
-		SYS_LOG_INF("Found LED device %s", LED_DEV_NAME);
+		LOG_INF("Found LED device %s", LED_DEV_NAME);
 	} else {
-		SYS_LOG_ERR("LED device %s not found", LED_DEV_NAME);
+		LOG_ERR("LED device %s not found", LED_DEV_NAME);
 		return;
 	}
 
@@ -36,7 +37,7 @@ void main(void)
 	 * one until it reaches the end and turns off LEDs in reverse order.
 	 */
 
-	SYS_LOG_INF("Displaying the pattern");
+	LOG_INF("Displaying the pattern");
 
 	while (1) {
 		/* Turn on LEDs one by one */
diff --git a/samples/drivers/led_lp5562/prj.conf b/samples/drivers/led_lp5562/prj.conf
index 7fd0d5903cbb..51a70f113a86 100644
--- a/samples/drivers/led_lp5562/prj.conf
+++ b/samples/drivers/led_lp5562/prj.conf
@@ -1,6 +1,4 @@
-CONFIG_SYS_LOG=y
-
+CONFIG_LOG=y
 CONFIG_I2C=y
-
 CONFIG_LED=y
 CONFIG_LP5562=y
diff --git a/samples/drivers/led_lp5562/sample.yaml b/samples/drivers/led_lp5562/sample.yaml
index f3d90bab49ad..f285f4961b55 100644
--- a/samples/drivers/led_lp5562/sample.yaml
+++ b/samples/drivers/led_lp5562/sample.yaml
@@ -1,8 +1,7 @@
 sample:
   description: Demonstration of the LP5562 LED driver
   name: LP5562 sample
-  platforms: all
 tests:
   test:
     platform_whitelist: nrf52840_pca10056
-    tags: samples
+    tags: led
diff --git a/samples/drivers/led_lp5562/src/main.c b/samples/drivers/led_lp5562/src/main.c
index ee3a5e8a3c9b..3af9eb733889 100644
--- a/samples/drivers/led_lp5562/src/main.c
+++ b/samples/drivers/led_lp5562/src/main.c
@@ -10,8 +10,9 @@
 #include <misc/util.h>
 #include <zephyr.h>
 
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
-#include <logging/sys_log.h>
+#define LOG_LEVEL 4
+#include <logging/log.h>
+LOG_MODULE_REGISTER(main);
 
 #define LED_DEV_NAME CONFIG_LP5562_DEV_NAME
 #define NUM_LEDS 4
@@ -75,19 +76,19 @@ static int set_static_color(struct device *dev, u8_t r, u8_t g, u8_t b)
 
 	ret = led_set_brightness(dev, LED_R, r);
 	if (ret) {
-		SYS_LOG_ERR("Failed to set color.");
+		LOG_ERR("Failed to set color.");
 		return ret;
 	}
 
 	ret = led_set_brightness(dev, LED_G, g);
 	if (ret) {
-		SYS_LOG_ERR("Failed to set color.");
+		LOG_ERR("Failed to set color.");
 		return ret;
 	}
 
 	ret = led_set_brightness(dev, LED_B, b);
 	if (ret) {
-		SYS_LOG_ERR("Failed to set color.");
+		LOG_ERR("Failed to set color.");
 		return ret;
 	}
 
@@ -117,7 +118,7 @@ static int blink_color(struct device *dev, bool r, bool g, bool b,
 	if (r) {
 		ret = led_blink(dev, LED_R, delay_on, delay_off);
 		if (ret) {
-			SYS_LOG_ERR("Failed to set color.");
+			LOG_ERR("Failed to set color.");
 			return ret;
 		}
 	}
@@ -125,7 +126,7 @@ static int blink_color(struct device *dev, bool r, bool g, bool b,
 	if (g) {
 		ret = led_blink(dev, LED_G, delay_on, delay_off);
 		if (ret) {
-			SYS_LOG_ERR("Failed to set color.");
+			LOG_ERR("Failed to set color.");
 			return ret;
 		}
 	}
@@ -133,7 +134,7 @@ static int blink_color(struct device *dev, bool r, bool g, bool b,
 	if (b) {
 		ret = led_blink(dev, LED_B, delay_on, delay_off);
 		if (ret) {
-			SYS_LOG_ERR("Failed to set color.");
+			LOG_ERR("Failed to set color.");
 			return ret;
 		}
 	}
@@ -168,13 +169,13 @@ void main(void)
 
 	dev = device_get_binding(LED_DEV_NAME);
 	if (dev) {
-		SYS_LOG_INF("Found LED device %s", LED_DEV_NAME);
+		LOG_INF("Found LED device %s", LED_DEV_NAME);
 	} else {
-		SYS_LOG_ERR("LED device %s not found", LED_DEV_NAME);
+		LOG_ERR("LED device %s not found", LED_DEV_NAME);
 		return;
 	}
 
-	SYS_LOG_INF("Testing leds");
+	LOG_INF("Testing leds");
 
 	while (1) {
 
diff --git a/samples/drivers/led_lpd8806/prj.conf b/samples/drivers/led_lpd8806/prj.conf
index 8a63b87ada33..0e2de86441c0 100644
--- a/samples/drivers/led_lpd8806/prj.conf
+++ b/samples/drivers/led_lpd8806/prj.conf
@@ -1,6 +1,6 @@
 # This file expresses generic requirements ONLY; see README.rst.
 
-CONFIG_SYS_LOG=y
+CONFIG_LOG=y
 CONFIG_BOOT_BANNER=y
 CONFIG_POLL=y
 
diff --git a/samples/drivers/led_lpd8806/src/main.c b/samples/drivers/led_lpd8806/src/main.c
index 5153e4509b0e..1ce770a79645 100644
--- a/samples/drivers/led_lpd8806/src/main.c
+++ b/samples/drivers/led_lpd8806/src/main.c
@@ -7,8 +7,9 @@
 #include <errno.h>
 #include <string.h>
 
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(main);
 
 #include <zephyr.h>
 #include <led_strip.h>
@@ -58,18 +59,18 @@ void main(void)
 	/* Double-check the configuration. */
 	spi = device_get_binding(SPI_DEV_NAME);
 	if (spi) {
-		SYS_LOG_INF("Found SPI device %s", SPI_DEV_NAME);
+		LOG_INF("Found SPI device %s", SPI_DEV_NAME);
 	} else {
-		SYS_LOG_ERR("SPI device not found; you must choose a SPI "
+		LOG_ERR("SPI device not found; you must choose a SPI "
 			    "device and configure its name to %s",
 			    SPI_DEV_NAME);
 		return;
 	}
 	strip = device_get_binding(STRIP_DEV_NAME);
 	if (strip) {
-		SYS_LOG_INF("Found LED strip device %s", STRIP_DEV_NAME);
+		LOG_INF("Found LED strip device %s", STRIP_DEV_NAME);
 	} else {
-		SYS_LOG_ERR("LED strip device %s not found", STRIP_DEV_NAME);
+		LOG_ERR("LED strip device %s not found", STRIP_DEV_NAME);
 		return;
 	}
 
@@ -78,7 +79,7 @@ void main(void)
 	 * down the strip until it reaches the end, then starts at the
 	 * beginning.
 	 */
-	SYS_LOG_INF("Displaying pattern on strip");
+	LOG_INF("Displaying pattern on strip");
 	time = 0;
 	while (1) {
 		for (i = 0; i < STRIP_NUM_LEDS; i++) {
diff --git a/samples/drivers/led_pca9633/prj.conf b/samples/drivers/led_pca9633/prj.conf
index dec2bccbb8df..e3396b01a482 100644
--- a/samples/drivers/led_pca9633/prj.conf
+++ b/samples/drivers/led_pca9633/prj.conf
@@ -1,4 +1,4 @@
-CONFIG_SYS_LOG=y
+CONFIG_LOG=y
 
 CONFIG_I2C=y
 
diff --git a/samples/drivers/led_pca9633/src/main.c b/samples/drivers/led_pca9633/src/main.c
index 64a5b89facdd..16cb5de1d991 100644
--- a/samples/drivers/led_pca9633/src/main.c
+++ b/samples/drivers/led_pca9633/src/main.c
@@ -10,8 +10,9 @@
 #include <misc/util.h>
 #include <zephyr.h>
 
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(main);
 
 #define LED_DEV_NAME CONFIG_PCA9633_DEV_NAME
 #define NUM_LEDS 4
@@ -28,13 +29,13 @@ void main(void)
 
 	led_dev = device_get_binding(LED_DEV_NAME);
 	if (led_dev) {
-		SYS_LOG_INF("Found LED device %s", LED_DEV_NAME);
+		LOG_INF("Found LED device %s", LED_DEV_NAME);
 	} else {
-		SYS_LOG_ERR("LED device %s not found", LED_DEV_NAME);
+		LOG_ERR("LED device %s not found", LED_DEV_NAME);
 		return;
 	}
 
-	SYS_LOG_INF("Testing leds");
+	LOG_INF("Testing leds");
 
 	while (1) {
 		/* Turn on LEDs one by one */
diff --git a/samples/drivers/led_ws2812/prj.conf b/samples/drivers/led_ws2812/prj.conf
index 682df114713f..fe87e26daddb 100644
--- a/samples/drivers/led_ws2812/prj.conf
+++ b/samples/drivers/led_ws2812/prj.conf
@@ -1,6 +1,4 @@
 # This file expresses generic requirements ONLY; see README.rst.
 
-CONFIG_SYS_LOG=y
-CONFIG_BOOT_BANNER=y
-
+CONFIG_LOG=y
 CONFIG_LED_STRIP=y
diff --git a/samples/drivers/led_ws2812/src/main.c b/samples/drivers/led_ws2812/src/main.c
index 67d4c7cc6aae..2c58ad11f926 100644
--- a/samples/drivers/led_ws2812/src/main.c
+++ b/samples/drivers/led_ws2812/src/main.c
@@ -8,8 +8,9 @@
 #include <errno.h>
 #include <string.h>
 
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
-#include <logging/sys_log.h>
+#define LOG_LEVEL 4
+#include <logging/log.h>
+LOG_MODULE_REGISTER(main);
 
 #include <zephyr.h>
 #include <led_strip.h>
@@ -66,9 +67,9 @@ void main(void)
 	/* Double-check the configuration. */
 	spi = device_get_binding(SPI_DEV_NAME);
 	if (spi) {
-		SYS_LOG_INF("Found SPI device %s", SPI_DEV_NAME);
+		LOG_INF("Found SPI device %s", SPI_DEV_NAME);
 	} else {
-		SYS_LOG_ERR("SPI device not found; you must choose a SPI "
+		LOG_ERR("SPI device not found; you must choose a SPI "
 			    "device and configure its name to %s",
 			    SPI_DEV_NAME);
 		return;
@@ -77,9 +78,9 @@ void main(void)
 
 	strip = device_get_binding(STRIP_DEV_NAME);
 	if (strip) {
-		SYS_LOG_INF("Found LED strip device %s", STRIP_DEV_NAME);
+		LOG_INF("Found LED strip device %s", STRIP_DEV_NAME);
 	} else {
-		SYS_LOG_ERR("LED strip device %s not found", STRIP_DEV_NAME);
+		LOG_ERR("LED strip device %s not found", STRIP_DEV_NAME);
 		return;
 	}
 
@@ -89,7 +90,7 @@ void main(void)
 	 * beginning. This has the effect of moving it around in a
 	 * circle in the case of rings of pixels.
 	 */
-	SYS_LOG_INF("Displaying pattern on strip");
+	LOG_INF("Displaying pattern on strip");
 	time = 0;
 	while (1) {
 		for (i = 0; i < STRIP_NUM_LEDS; i++) {
diff --git a/samples/mpu/mem_domain_apis_test/prj.conf b/samples/mpu/mem_domain_apis_test/prj.conf
index ea363c8023ee..95e4771143dd 100644
--- a/samples/mpu/mem_domain_apis_test/prj.conf
+++ b/samples/mpu/mem_domain_apis_test/prj.conf
@@ -1,6 +1,6 @@
 CONFIG_STDOUT_CONSOLE=y
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_DEFAULT_LEVEL=4
+CONFIG_LOG=y
+CONFIG_LOG_DEFAULT_LEVEL=4
 CONFIG_HW_STACK_PROTECTION=y
 CONFIG_USERSPACE=y
 CONFIG_MAX_DOMAIN_PARTITIONS=16
diff --git a/samples/mpu/mpu_stack_guard_test/prj_stack_guard.conf b/samples/mpu/mpu_stack_guard_test/prj_stack_guard.conf
index a22336a027ad..b7eeeffcad00 100644
--- a/samples/mpu/mpu_stack_guard_test/prj_stack_guard.conf
+++ b/samples/mpu/mpu_stack_guard_test/prj_stack_guard.conf
@@ -1,3 +1,3 @@
 CONFIG_STDOUT_CONSOLE=y
 CONFIG_MPU_STACK_GUARD=y
-CONFIG_SYS_LOG=y
+CONFIG_LOG=y
diff --git a/samples/net/echo_client/overlay-frdm_k64f_cc2520.conf b/samples/net/echo_client/overlay-frdm_k64f_cc2520.conf
index dbae0c946a78..0e1f1797ea36 100644
--- a/samples/net/echo_client/overlay-frdm_k64f_cc2520.conf
+++ b/samples/net/echo_client/overlay-frdm_k64f_cc2520.conf
@@ -4,7 +4,7 @@ CONFIG_GPIO=y
 CONFIG_SPI=y
 CONFIG_SPI_0=y
 
-CONFIG_SYS_LOG_SPI_LEVEL=1
+CONFIG_SPI_LOG_LEVEL_INF=y
 
 CONFIG_IEEE802154_CC2520=y
 CONFIG_IEEE802154_CC2520_SPI_DRV_NAME="SPI_0"
diff --git a/samples/net/echo_server/overlay-frdm_k64f_cc2520.conf b/samples/net/echo_server/overlay-frdm_k64f_cc2520.conf
index 1725e88b5aec..43413bf5a9f7 100644
--- a/samples/net/echo_server/overlay-frdm_k64f_cc2520.conf
+++ b/samples/net/echo_server/overlay-frdm_k64f_cc2520.conf
@@ -4,7 +4,7 @@ CONFIG_GPIO=y
 CONFIG_SPI=y
 CONFIG_SPI_0=y
 
-CONFIG_SYS_LOG_SPI_LEVEL=1
+CONFIG_SPI_LOG_LEVEL_INF=y
 
 CONFIG_IEEE802154_CC2520=y
 CONFIG_IEEE802154_CC2520_SPI_DRV_NAME="SPI_0"
diff --git a/samples/sensor/apds9960/prj.conf b/samples/sensor/apds9960/prj.conf
index 80dacf874831..fe5f098c2876 100644
--- a/samples/sensor/apds9960/prj.conf
+++ b/samples/sensor/apds9960/prj.conf
@@ -6,7 +6,7 @@ CONFIG_SENSOR=y
 
 CONFIG_SYS_LOG=y
 CONFIG_SYS_LOG_SENSOR_LEVEL=1
-CONFIG_SYS_LOG_I2C_LEVEL=1
+CONFIG_I2C_LOG_LEVEL_INF=y
 
 CONFIG_APDS9960=y
 CONFIG_APDS9960_TRIGGER_GLOBAL_THREAD=n
diff --git a/samples/subsys/nvs/prj.conf b/samples/subsys/nvs/prj.conf
index f729802ab280..bfb6708f5d67 100644
--- a/samples/subsys/nvs/prj.conf
+++ b/samples/subsys/nvs/prj.conf
@@ -1,7 +1,7 @@
 CONFIG_FLASH=y
 
 CONFIG_NVS=y
-CONFIG_NVS_LOG=y
-CONFIG_NVS_LOG_LEVEL=4
+CONFIG_LOG=y
+CONFIG_NVS_LOG_LEVEL_DBG=y
 CONFIG_REBOOT=y
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/soc/Kconfig b/soc/Kconfig
index cc6a7ee1473e..ab0c3810f746 100644
--- a/soc/Kconfig
+++ b/soc/Kconfig
@@ -10,4 +10,9 @@ menu "Hardware Configuration"
 osource "$(SOC_DIR)/$(ARCH)/Kconfig"
 osource "$(SOC_DIR)/$(ARCH)/*/Kconfig"
 
+
+module = SOC
+module-str = SOC
+source "subsys/logging/Kconfig.template.log_config"
+
 endmenu
diff --git a/soc/arm/nordic_nrf/nrf51/soc.c b/soc/arm/nordic_nrf/nrf51/soc.c
index 36ed1404126e..d37d22cc0501 100644
--- a/soc/arm/nordic_nrf/nrf51/soc.c
+++ b/soc/arm/nordic_nrf/nrf51/soc.c
@@ -24,6 +24,9 @@ extern void _NmiInit(void);
 #endif
 
 #include <system_nrf51.h>
+#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(soc);
 
 static int nordicsemi_nrf51_init(struct device *arg)
 {
diff --git a/soc/arm/nordic_nrf/nrf52/power.c b/soc/arm/nordic_nrf/nrf52/power.c
index aedfde933fd5..d8641c4bf5ef 100644
--- a/soc/arm/nordic_nrf/nrf52/power.c
+++ b/soc/arm/nordic_nrf/nrf52/power.c
@@ -3,14 +3,14 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
-#include <logging/sys_log.h>
-
 #include <zephyr.h>
 #include <soc_power.h>
 #include <nrf_power.h>
 
+#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_DECLARE(soc);
+
 #if defined(CONFIG_SYS_POWER_DEEP_SLEEP)
 /* System_OFF is deepest Power state available, On exiting from this
  * state CPU including all peripherals reset
@@ -48,7 +48,7 @@ static void _low_power_mode(enum power_states state)
 
 	default:
 		/* Unsupported State */
-		SYS_LOG_ERR("Unsupported State\n");
+		LOG_ERR("Unsupported State");
 		break;
 	}
 
@@ -73,7 +73,7 @@ void _sys_soc_set_power_state(enum power_states state)
 #endif
 	default:
 		/* Unsupported State */
-		SYS_LOG_ERR("Unsupported State\n");
+		LOG_ERR("Unsupported State");
 		break;
 	}
 }
@@ -93,7 +93,7 @@ void _sys_soc_power_state_post_ops(enum power_states state)
 #endif
 	default:
 		/* Unsupported State */
-		SYS_LOG_ERR("Unsupported State\n");
+		LOG_ERR("Unsupported State");
 		break;
 	}
 }
@@ -109,7 +109,7 @@ bool _sys_soc_is_valid_power_state(enum power_states state)
 		return true;
 		break;
 	default:
-		SYS_LOG_DBG("Unsupported State\n");
+		LOG_DBG("Unsupported State");
 		break;
 	}
 
diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c
index 369dbaa496b8..ffffd1fc5a60 100644
--- a/soc/arm/nordic_nrf/nrf52/soc.c
+++ b/soc/arm/nordic_nrf/nrf52/soc.c
@@ -36,6 +36,10 @@ extern void _NmiInit(void);
 #include <nrf.h>
 #include <hal/nrf_power.h>
 
+#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(soc);
+
 static int nordicsemi_nrf52_init(struct device *arg)
 {
 	u32_t key;
diff --git a/soc/x86/intel_quark/quark_se/Kconfig b/soc/x86/intel_quark/quark_se/Kconfig
index c5968b3950dd..9ac5a67102f6 100644
--- a/soc/x86/intel_quark/quark_se/Kconfig
+++ b/soc/x86/intel_quark/quark_se/Kconfig
@@ -27,26 +27,6 @@ config ARC_INIT
 	help
 	  Allows x86 processor to kickoff the ARC slave processor.
 
-config SYS_LOG_ARC_INIT_LEVEL
-	int "Quark SE Sensor Subsystem log level"
-	depends on SYS_LOG
-	default 0
-	help
-	  Sets log level for the boot initialization and boot process of the sensor
-	  sub-system.
-
-	  Levels are:
-
-	  - 0 OFF, do not write
-
-	  - 1 ERROR, only write SYS_LOG_ERR
-
-	  - 2 WARNING, write SYS_LOG_WRN in addition to previous level
-
-	  - 3 INFO, write SYS_LOG_INF in addition to previous levels
-
-	  - 4 DEBUG, write SYS_LOG_DBG in addition to previous levels
-
 config ARC_GDB_ENABLE
 	bool "Allows the usage of GDB with the ARC processor."
 	depends on ARC_INIT
diff --git a/soc/x86/intel_quark/quark_se/soc.c b/soc/x86/intel_quark/quark_se/soc.c
index 17783647518f..a6f591819306 100644
--- a/soc/x86/intel_quark/quark_se/soc.c
+++ b/soc/x86/intel_quark/quark_se/soc.c
@@ -23,6 +23,9 @@
 #include "shared_mem.h"
 #include <mmustructs.h>
 
+#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(soc);
 
 #ifdef CONFIG_X86_MMU
 /* loapic */
@@ -50,9 +53,6 @@ MMU_BOOT_REGION(0xB0500000, 256*1024, MMU_ENTRY_WRITE);
 #define SCSS_REG_VAL(offset) \
 	(*((volatile u32_t *)(SCSS_REGISTER_BASE+offset)))
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_ARC_INIT_LEVEL
-#include <logging/sys_log.h>
-
 /**
  *
  * @brief ARC Init
@@ -78,12 +78,12 @@ int _arc_init(struct device *arg)
 	 * we read the value and stick it in shared_mem->arc_start which is
 	 * the beginning of the address space at 0xA8000000 */
 	reset_vector = (u32_t *)RESET_VECTOR;
-	SYS_LOG_DBG("Reset vector address: %x", *reset_vector);
+	LOG_DBG("Reset vector address: %x", *reset_vector);
 	shared_data->arc_start = *reset_vector;
 	shared_data->flags = 0;
 	if (!shared_data->arc_start) {
 		/* Reset vector points to NULL => skip ARC init. */
-		SYS_LOG_DBG("Reset vector is NULL, skipping ARC init.");
+		LOG_DBG("Reset vector is NULL, skipping ARC init.");
 		goto skip_arc_init;
 	}
 
@@ -92,14 +92,14 @@ int _arc_init(struct device *arg)
 	SCSS_REG_VAL(SCSS_SS_CFG) |= ARC_RUN_REQ_A;
 #endif
 
-	SYS_LOG_DBG("Waiting for arc to start...");
+	LOG_DBG("Waiting for arc to start...");
 	/* Block until the ARC core actually starts up */
 	while (SCSS_REG_VAL(SCSS_SS_STS) & 0x4000) {
 	}
 
 	/* Block until ARC's quark_se_init() sets a flag indicating it is ready,
 	 * if we get stuck here ARC has run but has exploded very early */
-	SYS_LOG_DBG("Waiting for arc to init...");
+	LOG_DBG("Waiting for arc to init...");
 	while (!(shared_data->flags & ARC_READY)) {
 	}
 
diff --git a/soc/xtensa/intel_s1000/soc.c b/soc/xtensa/intel_s1000/soc.c
index 8937a2c573cb..cebfa58d74c5 100644
--- a/soc/xtensa/intel_s1000/soc.c
+++ b/soc/xtensa/intel_s1000/soc.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define SYS_LOG_LEVEL	SYS_LOG_LEVEL_INFO
-#define SYS_LOG_DOMAIN	"soc/s1000"
-
 #include <device.h>
 #include <xtensa_api.h>
 #include <xtensa/xtruntime.h>
-#include <logging/sys_log.h>
 #include <board.h>
 #include <irq_nextlevel.h>
 #include <xtensa/hal.h>
 #include <init.h>
 
+#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(soc);
+
 static u32_t ref_clk_freq;
 
 void _soc_irq_enable(u32_t irq)
@@ -42,7 +42,7 @@ void _soc_irq_enable(u32_t irq)
 	}
 
 	if (!dev_cavs) {
-		SYS_LOG_DBG("board: CAVS device binding failed\n");
+		LOG_DBG("board: CAVS device binding failed");
 		return;
 	}
 
@@ -62,7 +62,7 @@ void _soc_irq_enable(u32_t irq)
 	}
 
 	if (!dev_ictl) {
-		SYS_LOG_DBG("board: DW intr_control device binding failed\n");
+		LOG_DBG("board: DW intr_control device binding failed");
 		return;
 	}
 
@@ -101,7 +101,7 @@ void _soc_irq_disable(u32_t irq)
 	}
 
 	if (!dev_cavs) {
-		SYS_LOG_DBG("board: CAVS device binding failed\n");
+		LOG_DBG("board: CAVS device binding failed");
 		return;
 	}
 
@@ -125,7 +125,7 @@ void _soc_irq_disable(u32_t irq)
 	}
 
 	if (!dev_ictl) {
-		SYS_LOG_DBG("board: DW intr_control device binding failed\n");
+		LOG_DBG("board: DW intr_control device binding failed");
 		return;
 	}
 
@@ -221,7 +221,7 @@ static int soc_init(struct device *dev)
 	soc_read_bootstraps();
 
 	ref_clk_freq = soc_get_ref_clk_freq();
-	SYS_LOG_INF("Reference clock frequency: %u Hz", ref_clk_freq);
+	LOG_INF("Reference clock frequency: %u Hz", ref_clk_freq);
 
 	soc_set_resource_ownership();
 	soc_set_power_and_clock();
diff --git a/subsys/dfu/Kconfig b/subsys/dfu/Kconfig
index 4b55e15570ba..cac1855132e3 100644
--- a/subsys/dfu/Kconfig
+++ b/subsys/dfu/Kconfig
@@ -38,22 +38,8 @@ config IMG_BLOCK_BUF_SIZE
 	  Size (in Bytes) of buffer for image writer. Must be a multiple of
 	  the access alignment required by used flash driver.
 
-config SYS_LOG_IMG_MANAGER_LEVEL
-	int "Image manager Log level"
-	depends on SYS_LOG && MCUBOOT_IMG_MANAGER
-	default 0
-	range 0 4
-	help
-	  Sets log level for the image manager.
-	  Levels are:
-
-	  - 0 OFF: do not write
-
-	  - 1 ERROR: only write SYS_LOG_ERR
-
-	  - 2 WARNING: write SYS_LOG_WRN in addition to previous level
-
-	  - 3 INFO: write SYS_LOG_INF in addition to previous levels
+module = IMG_MANAGER
+module-str = image manager
+source "subsys/logging/Kconfig.template.log_config"
 
-	  - 4 DEBUG: write SYS_LOG_DBG in addition to previous levels
 endmenu
diff --git a/subsys/dfu/img_util/flash_img.c b/subsys/dfu/img_util/flash_img.c
index a5cdd6beea7d..b8fafc66e679 100644
--- a/subsys/dfu/img_util/flash_img.c
+++ b/subsys/dfu/img_util/flash_img.c
@@ -5,9 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define SYS_LOG_DOMAIN "fota/flash_block"
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_IMG_MANAGER_LEVEL
-#include <logging/sys_log.h>
+#define LOG_MODULE_NAME fota_flash_block
+#define LOG_LEVEL CONFIG_IMG_MANAGER_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <zephyr/types.h>
 #include <stddef.h>
@@ -34,15 +35,15 @@ static bool flash_verify(struct device *dev, off_t offset,
 		size = (len >= sizeof(temp)) ? sizeof(temp) : len;
 		rc = flash_read(dev, offset, &temp, size);
 		if (rc) {
-			SYS_LOG_ERR("flash_read error %d offset=0x%08"PRIx32,
-				    rc, offset);
+			LOG_ERR("flash_read error %d offset=0x%08"PRIx32,
+				rc, offset);
 			break;
 		}
 
 		if (memcmp(data, &temp, size)) {
-			SYS_LOG_ERR("offset=0x%08"PRIx32" VERIFY FAIL. "
-				    "expected: 0x%08x, actual: 0x%08x",
-				    offset, temp, *(__packed u32_t*)data);
+			LOG_ERR("offset=0x%08"PRIx32" VERIFY FAIL. "
+				"expected: 0x%08x, actual: 0x%08x",
+				offset, temp, *(__packed u32_t*)data);
 			break;
 		}
 		len -= size;
@@ -70,8 +71,8 @@ static int flash_block_write(struct flash_img_context *ctx, off_t offset,
 				 ctx->buf, CONFIG_IMG_BLOCK_BUF_SIZE);
 		flash_write_protection_set(ctx->dev, true);
 		if (rc) {
-			SYS_LOG_ERR("flash_write error %d offset=0x%08"PRIx32,
-				    rc, offset + ctx->bytes_written);
+			LOG_ERR("flash_write error %d offset=0x%08"PRIx32,
+				rc, offset + ctx->bytes_written);
 			return rc;
 		}
 
@@ -102,8 +103,8 @@ static int flash_block_write(struct flash_img_context *ctx, off_t offset,
 				 ctx->buf, CONFIG_IMG_BLOCK_BUF_SIZE);
 		flash_write_protection_set(ctx->dev, true);
 		if (rc) {
-			SYS_LOG_ERR("flash_write error %d offset=0x%08"PRIx32,
-				    rc, offset + ctx->bytes_written);
+			LOG_ERR("flash_write error %d offset=0x%08"PRIx32,
+				rc, offset + ctx->bytes_written);
 			return rc;
 		}
 
diff --git a/subsys/fs/nvs/Kconfig b/subsys/fs/nvs/Kconfig
index b277201593ba..a659979a4064 100644
--- a/subsys/fs/nvs/Kconfig
+++ b/subsys/fs/nvs/Kconfig
@@ -14,6 +14,10 @@ config NVS
 
 if NVS
 
+module = NVS
+module-str = nvs
+source "subsys/logging/Kconfig.template.log_config"
+
 config NVS_PROTECT_FLASH
 	bool "Non-volatile Storage extra flash protection"
 	help
@@ -23,26 +27,4 @@ config NVS_PROTECT_FLASH
 	  data is changed) you can disable this operation.
 
 
-config NVS_LOG
-	bool "Non-volatile Storage logging"
-	select SYS_LOG
-	help
-	  Enable logs and checks for Non-volatile Storage.
-
-if NVS_LOG
-	config NVS_LOG_LEVEL
-		int "Non-volatile Storage Logging level"
-		depends on SYS_LOG
-		default 1
-		range 0 4
-		help
-		  Sets log level for Non-volatile Storage.
-		  Levels are:
-		  0 OFF, do not write
-		  1 ERROR, only write SYS_LOG_ERR
-		  2 WARNING, write SYS_LOG_WRN in addition to previous level
-		  3 INFO, write SYS_LOG_INF in addition to previous levels
-		  4 DEBUG, write SYS_LOG_DBG in addition to previous levels
-
-endif # NVS_LOG
 endif # NVS
diff --git a/subsys/fs/nvs/nvs.c b/subsys/fs/nvs/nvs.c
index 804e823e853b..192a4f6e7935 100644
--- a/subsys/fs/nvs/nvs.c
+++ b/subsys/fs/nvs/nvs.c
@@ -13,6 +13,11 @@
 #include <crc8.h>
 #include "nvs_priv.h"
 
+#define LOG_LEVEL CONFIG_NVS_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(fs_nvs);
+
+
 /* basic routines */
 /* _nvs_al_size returns size aligned to fs->write_block_size */
 static inline size_t _nvs_al_size(struct nvs_fs *fs, size_t len)
@@ -27,7 +32,7 @@ static inline size_t _nvs_al_size(struct nvs_fs *fs, size_t len)
 /* flash routines */
 /* basic aligned flash write to nvs address */
 static int _nvs_flash_al_wrt(struct nvs_fs *fs, u32_t addr, const void *data,
-		      size_t len)
+			     size_t len)
 {
 	const u8_t *data8 = (const u8_t *)data;
 	int rc = 0;
@@ -78,7 +83,7 @@ static int _nvs_flash_al_wrt(struct nvs_fs *fs, u32_t addr, const void *data,
 
 /* basic flash read from nvs address */
 static int _nvs_flash_rd(struct nvs_fs *fs, u32_t addr, void *data,
-		  size_t len)
+			 size_t len)
 {
 	int rc;
 	off_t offset;
@@ -131,7 +136,7 @@ static int _nvs_flash_ate_rd(struct nvs_fs *fs, u32_t addr,
  * returns 0 if equal, 1 if not equal, errcode if error
  */
 static int _nvs_flash_block_cmp(struct nvs_fs *fs, u32_t addr, const void *data,
-			 size_t len)
+				size_t len)
 {
 	const u8_t *data8 = (const u8_t *)data;
 	int rc;
@@ -161,7 +166,7 @@ static int _nvs_flash_block_cmp(struct nvs_fs *fs, u32_t addr, const void *data,
  * errcode if error
  */
 static int _nvs_flash_cmp_const(struct nvs_fs *fs, u32_t addr, u8_t value,
-			       size_t len)
+				size_t len)
 {
 	int rc;
 	size_t bytes_to_cmp, block_size;
@@ -193,7 +198,7 @@ static int _nvs_flash_block_move(struct nvs_fs *fs, u32_t addr, size_t len)
 	block_size = NVS_BLOCK_SIZE & ~(fs->write_block_size - 1);
 
 	while (len) {
-		bytes_to_copy =	min(block_size, len);
+		bytes_to_copy = min(block_size, len);
 		rc = _nvs_flash_rd(fs, addr, buf, bytes_to_copy);
 		if (rc) {
 			return rc;
@@ -231,8 +236,8 @@ static int _nvs_flash_erase_sector(struct nvs_fs *fs, u32_t addr)
 		/* flash protection set error */
 		return rc;
 	}
-	SYS_LOG_DBG("Erasing flash at %"PRIx32", len %d",
-		    offset, fs->sector_size);
+	LOG_DBG("Erasing flash at %" PRIx32 ", len %d",
+		offset, fs->sector_size);
 	rc = flash_erase(fs->flash_device, offset, fs->sector_size);
 	if (rc) {
 		/* flash erase error */
@@ -267,7 +272,7 @@ static int _nvs_ate_crc8_check(const struct nvs_ate *entry)
 
 /* store an entry in flash */
 static int _nvs_flash_wrt_entry(struct nvs_fs *fs, u16_t id, const void *data,
-			size_t len)
+				size_t len)
 {
 	int rc;
 	struct nvs_ate entry;
@@ -316,7 +321,7 @@ static int _nvs_prev_ate(struct nvs_fs *fs, u32_t *addr, struct nvs_ate *ate)
 
 	while (1) {
 		*addr += ate_size;
-		if (((*addr) & ADDR_OFFS_MASK) != fs->sector_size)  {
+		if (((*addr) & ADDR_OFFS_MASK) != fs->sector_size) {
 			break;
 		}
 		/* last ate in sector, do jump to previous sector */
@@ -436,7 +441,7 @@ static int _nvs_gc(struct nvs_fs *fs)
 		 */
 		if ((wlk_prev_addr == gc_addr) && gc_ate.len) {
 			/* copy needed */
-			SYS_LOG_DBG("Moving %d, len %d", gc_ate.id, gc_ate.len);
+			LOG_DBG("Moving %d, len %d", gc_ate.id, gc_ate.len);
 
 			data_addr = (gc_addr & ADDR_SECT_MASK);
 			data_addr += gc_ate.offset;
@@ -581,7 +586,7 @@ int nvs_reinit(struct nvs_fs *fs)
 			goto end;
 		}
 		if (!_nvs_ate_crc8_check(&ate)) {
-		/* crc8 is ok, complete write of ate was performed */
+			/* crc8 is ok, complete write of ate was performed */
 			fs->data_wra += ate.offset;
 			fs->data_wra += _nvs_al_size(fs, ate.len);
 		}
@@ -644,7 +649,7 @@ int nvs_init(struct nvs_fs *fs, const char *dev_name)
 
 	fs->flash_device = device_get_binding(dev_name);
 	if (!fs->flash_device) {
-		SYS_LOG_ERR("No valid flash device found");
+		LOG_ERR("No valid flash device found");
 		return -ENXIO;
 	}
 
@@ -652,7 +657,7 @@ int nvs_init(struct nvs_fs *fs, const char *dev_name)
 
 	/* check the number of sectors, it should be at least 2 */
 	if (fs->sector_count < 2) {
-		SYS_LOG_ERR("Configuration error - sector count");
+		LOG_ERR("Configuration error - sector count");
 		return -EINVAL;
 	}
 
@@ -662,14 +667,14 @@ int nvs_init(struct nvs_fs *fs, const char *dev_name)
 		return rc;
 	}
 
-	SYS_LOG_INF("%d Sectors of %d bytes", fs->sector_count, fs->sector_size);
-	SYS_LOG_INF("alloc wra: %d, %"PRIx32"",
-		    (fs->ate_wra >> ADDR_SECT_SHIFT),
-		    (fs->ate_wra & ADDR_OFFS_MASK));
-	SYS_LOG_INF("data wra: %d, %"PRIx32"",
-		    (fs->data_wra >> ADDR_SECT_SHIFT),
-		    (fs->data_wra & ADDR_OFFS_MASK));
-	SYS_LOG_INF("Free space: %d", fs->free_space);
+	LOG_INF("%d Sectors of %d bytes", fs->sector_count, fs->sector_size);
+	LOG_INF("alloc wra: %d, %" PRIx32 "",
+		(fs->ate_wra >> ADDR_SECT_SHIFT),
+		(fs->ate_wra & ADDR_OFFS_MASK));
+	LOG_INF("data wra: %d, %" PRIx32 "",
+		(fs->data_wra >> ADDR_SECT_SHIFT),
+		(fs->data_wra & ADDR_OFFS_MASK));
+	LOG_INF("Free space: %d", fs->free_space);
 
 	return 0;
 }
@@ -686,7 +691,7 @@ ssize_t nvs_write(struct nvs_fs *fs, u16_t id, const void *data, size_t len)
 	data_size = _nvs_al_size(fs, len);
 
 
-	if ((len > (fs->sector_size - 2*ate_size)) ||
+	if ((len > (fs->sector_size - 2 * ate_size)) ||
 	    ((len > 0) && (data == NULL))) {
 		return -EINVAL;
 	}
@@ -786,7 +791,7 @@ int nvs_delete(struct nvs_fs *fs, u16_t id)
 }
 
 ssize_t nvs_read_hist(struct nvs_fs *fs, u16_t id, void *data, size_t len,
-		  u16_t cnt)
+		      u16_t cnt)
 {
 	int rc;
 	u32_t wlk_addr, rd_addr;
@@ -796,7 +801,7 @@ ssize_t nvs_read_hist(struct nvs_fs *fs, u16_t id, void *data, size_t len,
 
 	ate_size = _nvs_al_size(fs, sizeof(struct nvs_ate));
 
-	if (len > (fs->sector_size - 2*ate_size)) {
+	if (len > (fs->sector_size - 2 * ate_size)) {
 		return -EINVAL;
 	}
 
diff --git a/subsys/fs/nvs/nvs_priv.h b/subsys/fs/nvs/nvs_priv.h
index 187c3fcbf9ea..3c4b39590b6c 100644
--- a/subsys/fs/nvs/nvs_priv.h
+++ b/subsys/fs/nvs/nvs_priv.h
@@ -11,10 +11,6 @@
 extern "C" {
 #endif
 
-#define SYS_LOG_DOMAIN "fs/nvs"
-#define SYS_LOG_LEVEL CONFIG_NVS_LOG_LEVEL
-#include <logging/sys_log.h>
-
 /*
  * MASKS AND SHIFT FOR ADDRESSES
  * an address in nvs is an u32_t where:
diff --git a/tests/crypto/rand32/prj.conf b/tests/crypto/rand32/prj.conf
index 7ae0319ea1e4..420e89ab17f2 100644
--- a/tests/crypto/rand32/prj.conf
+++ b/tests/crypto/rand32/prj.conf
@@ -1,4 +1,4 @@
 CONFIG_ZTEST=y
-CONFIG_SYS_LOG=y
+CONFIG_LOG=y
 CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/crypto/rand32/prj_hw_random_xoroshiro.conf b/tests/crypto/rand32/prj_hw_random_xoroshiro.conf
index ec3430822ff3..4d3d32622536 100644
--- a/tests/crypto/rand32/prj_hw_random_xoroshiro.conf
+++ b/tests/crypto/rand32/prj_hw_random_xoroshiro.conf
@@ -1,4 +1,4 @@
 CONFIG_ZTEST=y
-CONFIG_SYS_LOG=y
+CONFIG_LOG=y
 CONFIG_ENTROPY_GENERATOR=y
 CONFIG_XOROSHIRO_RANDOM_GENERATOR=y
diff --git a/tests/crypto/rand32/prj_sw_random_systimer.conf b/tests/crypto/rand32/prj_sw_random_systimer.conf
index 7a807e157945..6a6c996b86be 100644
--- a/tests/crypto/rand32/prj_sw_random_systimer.conf
+++ b/tests/crypto/rand32/prj_sw_random_systimer.conf
@@ -1,5 +1,5 @@
 CONFIG_ZTEST=y
-CONFIG_SYS_LOG=y
+CONFIG_LOG=y
 CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_TIMER_RANDOM_GENERATOR=y
diff --git a/tests/crypto/rand32/src/main.c b/tests/crypto/rand32/src/main.c
index 5af5dcaac467..d92e789b29cd 100644
--- a/tests/crypto/rand32/src/main.c
+++ b/tests/crypto/rand32/src/main.c
@@ -14,7 +14,6 @@
 
 
 #include <ztest.h>
-#include <logging/sys_log.h>
 #include <kernel_internal.h>
 
 #define N_VALUES 10
@@ -43,7 +42,7 @@ void test_rand32(void)
 	 * Test subsequently calls sys_rand32_get(), checking
 	 * that two values are not equal.
 	 */
-	SYS_LOG_DBG("Generating random numbers");
+	printk("Generating random numbers\n");
 	last_gen = sys_rand32_get();
 	/*
 	 * Get several subsequent numbers as fast as possible.
diff --git a/tests/drivers/adc/adc_api/prj_base.conf b/tests/drivers/adc/adc_api/prj_base.conf
index 17f655ec2edd..5ec8bec1945b 100644
--- a/tests/drivers/adc/adc_api/prj_base.conf
+++ b/tests/drivers/adc/adc_api/prj_base.conf
@@ -4,5 +4,5 @@ CONFIG_ADC=y
 CONFIG_ADC_ASYNC=y
 CONFIG_ADC_0=y
 
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_ADC_LEVEL=1
+CONFIG_LOG=y
+CONFIG_ADC_LOG_LEVEL_INF=y
diff --git a/tests/drivers/dma/chan_blen_transfer/prj.conf b/tests/drivers/dma/chan_blen_transfer/prj.conf
index b0d1e3393129..605d90989ede 100644
--- a/tests/drivers/dma/chan_blen_transfer/prj.conf
+++ b/tests/drivers/dma/chan_blen_transfer/prj.conf
@@ -1,4 +1,4 @@
 CONFIG_DMA=y
 CONFIG_ZTEST=y
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_DMA_LEVEL=1
+CONFIG_LOG=y
+CONFIG_DMA_LOG_LEVEL_INF=y
diff --git a/tests/drivers/dma/loop_transfer/prj.conf b/tests/drivers/dma/loop_transfer/prj.conf
index 92fe359a76df..56e773c2f326 100644
--- a/tests/drivers/dma/loop_transfer/prj.conf
+++ b/tests/drivers/dma/loop_transfer/prj.conf
@@ -1,4 +1,4 @@
 CONFIG_TEST=y
 CONFIG_DMA=y
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_DMA_LEVEL=1
+CONFIG_LOG=y
+CONFIG_DMA_LOG_LEVEL_INF=y
diff --git a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
index 524120edb47a..0e4fdf354ba7 100644
--- a/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
+++ b/tests/drivers/i2c/i2c_slave_api/common/i2c_virtual.c
@@ -12,8 +12,9 @@
 #include <errno.h>
 #include <i2c.h>
 
-#define SYS_LOG_LEVEL CONFIG_SYS_LOG_I2C_LEVEL
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
+#include <logging/log.h>
+LOG_MODULE_DECLARE(main);
 
 #define DEV_DATA(dev) ((struct i2c_virtual_data * const)(dev)->driver_data)
 
@@ -113,7 +114,7 @@ static int i2c_virtual_msg_write(struct device *dev, struct i2c_msg *msg,
 
 	return 0;
 error:
-	SYS_LOG_DBG("%s: NACK", __func__);
+	LOG_DBG("%s: NACK", __func__);
 
 	return -EIO;
 }
diff --git a/tests/drivers/i2c/i2c_slave_api/prj_base.conf b/tests/drivers/i2c/i2c_slave_api/prj_base.conf
index 7a4b726945f9..00de471cb257 100644
--- a/tests/drivers/i2c/i2c_slave_api/prj_base.conf
+++ b/tests/drivers/i2c/i2c_slave_api/prj_base.conf
@@ -1,5 +1,5 @@
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_I2C_LEVEL=4
+CONFIG_LOG=y
+CONFIG_I2C_LOG_LEVEL_DBG=y
 CONFIG_BOOT_BANNER=y
 CONFIG_ZTEST=y
 CONFIG_I2C=y
diff --git a/tests/drivers/i2c/i2c_slave_api/prj_virtual.conf b/tests/drivers/i2c/i2c_slave_api/prj_virtual.conf
index c9d7355d1fd7..77bf5c132ecd 100644
--- a/tests/drivers/i2c/i2c_slave_api/prj_virtual.conf
+++ b/tests/drivers/i2c/i2c_slave_api/prj_virtual.conf
@@ -1,5 +1,5 @@
-CONFIG_SYS_LOG=y
-CONFIG_SYS_LOG_I2C_LEVEL=4
+CONFIG_LOG=y
+CONFIG_I2C_LOG_LEVEL_DBG=y
 CONFIG_BOOT_BANNER=y
 CONFIG_ZTEST=y
 CONFIG_I2C=y
diff --git a/tests/drivers/i2c/i2c_slave_api/src/main.c b/tests/drivers/i2c/i2c_slave_api/src/main.c
index ca886e29a0a9..6fe00fc10ec3 100644
--- a/tests/drivers/i2c/i2c_slave_api/src/main.c
+++ b/tests/drivers/i2c/i2c_slave_api/src/main.c
@@ -7,8 +7,9 @@
 #include <errno.h>
 #include <string.h>
 
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(main);
 
 #include <zephyr.h>
 #include <device.h>
@@ -46,7 +47,7 @@ static void run_full_read(struct device *i2c, u8_t addr, u8_t *comp_buffer)
 {
 	int ret;
 
-	SYS_LOG_INF("Start full read. Master: %s, address: 0x%x",
+	LOG_INF("Start full read. Master: %s, address: 0x%x",
 		    i2c->config->name, addr);
 
 	/* Read EEPROM from I2C Master requests, then compare */
@@ -59,9 +60,9 @@ static void run_full_read(struct device *i2c, u8_t addr, u8_t *comp_buffer)
 				  buffer_print_i2c);
 		to_display_format(comp_buffer, TEST_DATA_SIZE,
 				  buffer_print_eeprom);
-		SYS_LOG_ERR("Buffer contents are different: %s",
+		LOG_ERR("Buffer contents are different: %s",
 			    buffer_print_i2c);
-		SYS_LOG_ERR("                           vs: %s",
+		LOG_ERR("                           vs: %s",
 			    buffer_print_eeprom);
 
 		ztest_test_fail();
@@ -73,7 +74,7 @@ static void run_partial_read(struct device *i2c, u8_t addr, u8_t *comp_buffer,
 {
 	int ret;
 
-	SYS_LOG_INF("Start partial read. Master: %s, address: 0x%x, off=%d",
+	LOG_INF("Start partial read. Master: %s, address: 0x%x, off=%d",
 		    i2c->config->name, addr, offset);
 
 	ret = i2c_burst_read(i2c, addr,
@@ -85,9 +86,9 @@ static void run_partial_read(struct device *i2c, u8_t addr, u8_t *comp_buffer,
 				  buffer_print_i2c);
 		to_display_format(&comp_buffer[offset], TEST_DATA_SIZE-offset,
 				  buffer_print_eeprom);
-		SYS_LOG_ERR("Buffer contents are different: %s",
+		LOG_ERR("Buffer contents are different: %s",
 			    buffer_print_i2c);
-		SYS_LOG_ERR("                           vs: %s",
+		LOG_ERR("                           vs: %s",
 			    buffer_print_eeprom);
 
 		ztest_test_fail();
@@ -98,7 +99,7 @@ static void run_program_read(struct device *i2c, u8_t addr, unsigned int offset)
 {
 	int ret, i;
 
-	SYS_LOG_INF("Start program. Master: %s, address: 0x%x, off=%d",
+	LOG_INF("Start program. Master: %s, address: 0x%x, off=%d",
 		    i2c->config->name, addr, offset);
 
 	for (i = 0 ; i < TEST_DATA_SIZE-offset ; ++i) {
@@ -120,7 +121,7 @@ static void run_program_read(struct device *i2c, u8_t addr, unsigned int offset)
 		if (i2c_buffer[i] != i) {
 			to_display_format(i2c_buffer, TEST_DATA_SIZE-offset,
 					  buffer_print_i2c);
-			SYS_LOG_ERR("Invalid Buffer content: %s",
+			LOG_ERR("Invalid Buffer content: %s",
 				    buffer_print_i2c);
 
 			ztest_test_fail();
@@ -141,7 +142,7 @@ void test_eeprom_slave(void)
 	zassert_not_null(i2c_0, "I2C device %s not found",
 			 EEPROM_SLAVE_0_BUS_NAME);
 
-	SYS_LOG_INF("Found I2C Master device %s",
+	LOG_INF("Found I2C Master device %s",
 		    EEPROM_SLAVE_0_BUS_NAME);
 
 	i2c_1 = device_get_binding(
@@ -149,20 +150,20 @@ void test_eeprom_slave(void)
 	zassert_not_null(i2c_1, "I2C device %s not found",
 			 EEPROM_SLAVE_1_BUS_NAME);
 
-	SYS_LOG_INF("Found I2C Master device %s",
+	LOG_INF("Found I2C Master device %s",
 		    EEPROM_SLAVE_1_BUS_NAME);
 
 	eeprom_0 = device_get_binding(EEPROM_SLAVE_0_LABEL);
 	zassert_not_null(eeprom_0, "EEPROM device %s not found",
 			 EEPROM_SLAVE_0_LABEL);
 
-	SYS_LOG_INF("Found EEPROM device %s", EEPROM_SLAVE_0_LABEL);
+	LOG_INF("Found EEPROM device %s", EEPROM_SLAVE_0_LABEL);
 
 	eeprom_1 = device_get_binding(EEPROM_SLAVE_1_LABEL);
 	zassert_not_null(eeprom_1, "EEPROM device %s not found",
 			 EEPROM_SLAVE_1_LABEL);
 
-	SYS_LOG_INF("Found EEPROM device %s", EEPROM_SLAVE_1_LABEL);
+	LOG_INF("Found EEPROM device %s", EEPROM_SLAVE_1_LABEL);
 
 	/* Program dummy bytes */
 	ret = eeprom_slave_program(eeprom_0, eeprom_0_data, TEST_DATA_SIZE);
@@ -178,13 +179,13 @@ void test_eeprom_slave(void)
 	zassert_equal(ret, 0, "Failed to register EEPROM %s",
 		      EEPROM_SLAVE_0_LABEL);
 
-	SYS_LOG_INF("EEPROM %s Attached !", EEPROM_SLAVE_0_LABEL);
+	LOG_INF("EEPROM %s Attached !", EEPROM_SLAVE_0_LABEL);
 
 	ret = i2c_slave_driver_register(eeprom_1);
 	zassert_equal(ret, 0, "Failed to register EEPROM %s",
 		      EEPROM_SLAVE_1_LABEL);
 
-	SYS_LOG_INF("EEPROM %s Attached !", EEPROM_SLAVE_1_LABEL);
+	LOG_INF("EEPROM %s Attached !", EEPROM_SLAVE_1_LABEL);
 
 	/* Run Tests without bus access conflicts */
 	run_full_read(i2c_0, EEPROM_SLAVE_1_BASE_ADDRESS, eeprom_1_data);
@@ -210,21 +211,21 @@ void test_eeprom_slave(void)
 				 offset);
 	}
 
-	SYS_LOG_INF("Success !");
+	LOG_INF("Success !");
 
 	/* Detach EEPROM */
 	ret = i2c_slave_driver_unregister(eeprom_0);
 	zassert_equal(ret, 0, "Failed to unregister EEPROM %s",
 		      EEPROM_SLAVE_0_LABEL);
 
-	SYS_LOG_INF("EEPROM %s Detached !",
+	LOG_INF("EEPROM %s Detached !",
 		    EEPROM_SLAVE_0_LABEL);
 
 	ret = i2c_slave_driver_unregister(eeprom_1);
 	zassert_equal(ret, 0, "Failed to unregister EEPROM %s",
 		      EEPROM_SLAVE_1_LABEL);
 
-	SYS_LOG_INF("EEPROM %s Detached !",
+	LOG_INF("EEPROM %s Detached !",
 		    EEPROM_SLAVE_1_LABEL);
 }
 
diff --git a/tests/drivers/spi/spi_loopback/prj_base.conf b/tests/drivers/spi/spi_loopback/prj_base.conf
index 0cc29fc94492..30be35b5f7cb 100644
--- a/tests/drivers/spi/spi_loopback/prj_base.conf
+++ b/tests/drivers/spi/spi_loopback/prj_base.conf
@@ -1,7 +1,7 @@
 CONFIG_TEST=y
 CONFIG_BOOT_BANNER=y
-CONFIG_SYS_LOG=y
+CONFIG_LOG=y
 CONFIG_SPI=y
 CONFIG_SPI_ASYNC=y
-CONFIG_SYS_LOG_SPI_LEVEL=1
+CONFIG_SPI_LOG_LEVEL_INF=y
 CONFIG_ZTEST=y
diff --git a/tests/drivers/spi/spi_loopback/src/spi.c b/tests/drivers/spi/spi_loopback/src/spi.c
index 4767e2d2b95c..08eccf7ae93a 100644
--- a/tests/drivers/spi/spi_loopback/src/spi.c
+++ b/tests/drivers/spi/spi_loopback/src/spi.c
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#define SYS_LOG_LEVEL SYS_LOG_LEVEL_DEBUG
-#include <logging/sys_log.h>
+#define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
+#include <logging/log.h>
+LOG_MODULE_REGISTER(main);
 
 #include <zephyr.h>
 #include <misc/printk.h>
@@ -74,7 +75,7 @@ static int cs_ctrl_gpio_config(void)
 {
 	spi_cs.gpio_dev = device_get_binding(CS_CTRL_GPIO_DRV_NAME);
 	if (!spi_cs.gpio_dev) {
-		SYS_LOG_ERR("Cannot find %s!", CS_CTRL_GPIO_DRV_NAME);
+		LOG_ERR("Cannot find %s!", CS_CTRL_GPIO_DRV_NAME);
 		zassert_not_null(spi_cs.gpio_dev, "Invalid gpio device");
 		return -1;
 	}
@@ -108,11 +109,11 @@ static int spi_complete_loop(struct device *dev, struct spi_config *spi_conf)
 
 	int ret;
 
-	SYS_LOG_INF("Start");
+	LOG_INF("Start");
 
 	ret = spi_transceive(dev, spi_conf, &tx, &rx);
 	if (ret) {
-		SYS_LOG_ERR("Code %d", ret);
+		LOG_ERR("Code %d", ret);
 		zassert_false(ret, "SPI transceive failed");
 		return ret;
 	}
@@ -120,15 +121,15 @@ static int spi_complete_loop(struct device *dev, struct spi_config *spi_conf)
 	if (memcmp(buffer_tx, buffer_rx, BUF_SIZE)) {
 		to_display_format(buffer_tx, BUF_SIZE, buffer_print_tx);
 		to_display_format(buffer_rx, BUF_SIZE, buffer_print_rx);
-		SYS_LOG_ERR("Buffer contents are different: %s",
+		LOG_ERR("Buffer contents are different: %s",
 			    buffer_print_tx);
-		SYS_LOG_ERR("                           vs: %s",
+		LOG_ERR("                           vs: %s",
 			    buffer_print_rx);
 		zassert_false(1, "Buffer contents are different");
 		return -1;
 	}
 
-	SYS_LOG_INF("Passed");
+	LOG_INF("Passed");
 
 	return 0;
 }
@@ -157,13 +158,13 @@ static int spi_rx_half_start(struct device *dev, struct spi_config *spi_conf)
 	};
 	int ret;
 
-	SYS_LOG_INF("Start");
+	LOG_INF("Start");
 
 	(void)memset(buffer_rx, 0, BUF_SIZE);
 
 	ret = spi_transceive(dev, spi_conf, &tx, &rx);
 	if (ret) {
-		SYS_LOG_ERR("Code %d", ret);
+		LOG_ERR("Code %d", ret);
 		zassert_false(ret, "SPI transceive failed");
 		return -1;
 	}
@@ -171,15 +172,15 @@ static int spi_rx_half_start(struct device *dev, struct spi_config *spi_conf)
 	if (memcmp(buffer_tx, buffer_rx, 8)) {
 		to_display_format(buffer_tx, 8, buffer_print_tx);
 		to_display_format(buffer_rx, 8, buffer_print_rx);
-		SYS_LOG_ERR("Buffer contents are different: %s",
+		LOG_ERR("Buffer contents are different: %s",
 			    buffer_print_tx);
-		SYS_LOG_ERR("                           vs: %s",
+		LOG_ERR("                           vs: %s",
 			    buffer_print_rx);
 		zassert_false(1, "Buffer contents are different");
 		return -1;
 	}
 
-	SYS_LOG_INF("Passed");
+	LOG_INF("Passed");
 
 	return 0;
 }
@@ -212,13 +213,13 @@ static int spi_rx_half_end(struct device *dev, struct spi_config *spi_conf)
 	};
 	int ret;
 
-	SYS_LOG_INF("Start");
+	LOG_INF("Start");
 
 	(void)memset(buffer_rx, 0, BUF_SIZE);
 
 	ret = spi_transceive(dev, spi_conf, &tx, &rx);
 	if (ret) {
-		SYS_LOG_ERR("Code %d", ret);
+		LOG_ERR("Code %d", ret);
 		zassert_false(ret, "SPI transceive failed");
 		return -1;
 	}
@@ -226,15 +227,15 @@ static int spi_rx_half_end(struct device *dev, struct spi_config *spi_conf)
 	if (memcmp(buffer_tx+8, buffer_rx, 8)) {
 		to_display_format(buffer_tx + 8, 8, buffer_print_tx);
 		to_display_format(buffer_rx, 8, buffer_print_rx);
-		SYS_LOG_ERR("Buffer contents are different: %s",
+		LOG_ERR("Buffer contents are different: %s",
 			    buffer_print_tx);
-		SYS_LOG_ERR("                           vs: %s",
+		LOG_ERR("                           vs: %s",
 			    buffer_print_rx);
 		zassert_false(1, "Buffer contents are different");
 		return -1;
 	}
 
-	SYS_LOG_INF("Passed");
+	LOG_INF("Passed");
 
 	return 0;
 }
@@ -275,13 +276,13 @@ static int spi_rx_every_4(struct device *dev, struct spi_config *spi_conf)
 	};
 	int ret;
 
-	SYS_LOG_INF("Start");
+	LOG_INF("Start");
 
 	(void)memset(buffer_rx, 0, BUF_SIZE);
 
 	ret = spi_transceive(dev, spi_conf, &tx, &rx);
 	if (ret) {
-		SYS_LOG_ERR("Code %d", ret);
+		LOG_ERR("Code %d", ret);
 		zassert_false(ret, "SPI transceive failed");
 		return -1;
 	}
@@ -289,24 +290,24 @@ static int spi_rx_every_4(struct device *dev, struct spi_config *spi_conf)
 	if (memcmp(buffer_tx + 4, buffer_rx, 4)) {
 		to_display_format(buffer_tx + 4, 4, buffer_print_tx);
 		to_display_format(buffer_rx, 4, buffer_print_rx);
-		SYS_LOG_ERR("Buffer contents are different: %s",
+		LOG_ERR("Buffer contents are different: %s",
 			    buffer_print_tx);
-		SYS_LOG_ERR("                           vs: %s",
+		LOG_ERR("                           vs: %s",
 			    buffer_print_rx);
 		zassert_false(1, "Buffer contents are different");
 		return -1;
 	} else if (memcmp(buffer_tx + 12, buffer_rx + 4, 4)) {
 		to_display_format(buffer_tx + 12, 4, buffer_print_tx);
 		to_display_format(buffer_rx + 4, 4, buffer_print_rx);
-		SYS_LOG_ERR("Buffer contents are different: %s",
+		LOG_ERR("Buffer contents are different: %s",
 			    buffer_print_tx);
-		SYS_LOG_ERR("                           vs: %s",
+		LOG_ERR("                           vs: %s",
 			    buffer_print_rx);
 		zassert_false(1, "Buffer contents are different");
 		return -1;
 	}
 
-	SYS_LOG_INF("Passed");
+	LOG_INF("Passed");
 
 	return 0;
 }
@@ -326,7 +327,7 @@ static void spi_async_call_cb(struct k_poll_event *async_evt,
 {
 	int ret;
 
-	SYS_LOG_DBG("Polling...");
+	LOG_DBG("Polling...");
 
 	while (1) {
 		ret = k_poll(async_evt, 1, K_MSEC(200));
@@ -365,16 +366,16 @@ static int spi_async_call(struct device *dev, struct spi_config *spi_conf)
 	};
 	int ret;
 
-	SYS_LOG_INF("Start");
+	LOG_INF("Start");
 
 	ret = spi_transceive_async(dev, spi_conf, &tx, &rx, &async_sig);
 	if (ret == -ENOTSUP) {
-		SYS_LOG_DBG("Not supported");
+		LOG_DBG("Not supported");
 		return 0;
 	}
 
 	if (ret) {
-		SYS_LOG_ERR("Code %d", ret);
+		LOG_ERR("Code %d", ret);
 		zassert_false(ret, "SPI transceive failed");
 		return -1;
 	}
@@ -382,12 +383,12 @@ static int spi_async_call(struct device *dev, struct spi_config *spi_conf)
 	k_sem_take(&caller, K_FOREVER);
 
 	if (result)  {
-		SYS_LOG_ERR("Call code %d", ret);
+		LOG_ERR("Call code %d", ret);
 		zassert_false(result, "SPI transceive failed");
 		return -1;
 	}
 
-	SYS_LOG_INF("Passed");
+	LOG_INF("Passed");
 
 	return 0;
 }
@@ -404,7 +405,7 @@ static int spi_resource_lock_test(struct device *lock_dev,
 	}
 
 	if (spi_release(lock_dev, spi_conf_lock)) {
-		SYS_LOG_ERR("Deadlock now?");
+		LOG_ERR("Deadlock now?");
 		zassert_false(1, "SPI release failed");
 		return -1;
 	}
@@ -423,7 +424,7 @@ void testing_spi(void)
 	struct device *spi_slow;
 	struct device *spi_fast;
 
-	SYS_LOG_INF("SPI test on buffers TX/RX %p/%p", buffer_tx, buffer_rx);
+	LOG_INF("SPI test on buffers TX/RX %p/%p", buffer_tx, buffer_rx);
 
 #if defined(CONFIG_SPI_LOOPBACK_CS_GPIO)
 	if (cs_ctrl_gpio_config()) {
@@ -433,7 +434,7 @@ void testing_spi(void)
 
 	spi_slow = device_get_binding(SPI_DRV_NAME);
 	if (!spi_slow) {
-		SYS_LOG_ERR("Cannot find %s!\n", SPI_DRV_NAME);
+		LOG_ERR("Cannot find %s!\n", SPI_DRV_NAME);
 		zassert_not_null(spi_slow, "Invalid SPI device");
 		return;
 	}
@@ -467,7 +468,7 @@ void testing_spi(void)
 		goto end;
 	}
 
-	SYS_LOG_INF("All tx/rx passed");
+	LOG_INF("All tx/rx passed");
 end:
 	k_thread_abort(async_thread_id);
 }
diff --git a/tests/kernel/common/prj.conf b/tests/kernel/common/prj.conf
index be9b038251ea..f978f03e3eb6 100644
--- a/tests/kernel/common/prj.conf
+++ b/tests/kernel/common/prj.conf
@@ -1,4 +1,4 @@
 CONFIG_ZTEST=y
 CONFIG_PRINTK=y
-CONFIG_SYS_LOG=y
+CONFIG_LOG=y
 CONFIG_POLL=y
diff --git a/tests/subsys/logging/log_core/prj.conf b/tests/subsys/logging/log_core/prj.conf
index c2a61a609af8..9422bcac5e45 100644
--- a/tests/subsys/logging/log_core/prj.conf
+++ b/tests/subsys/logging/log_core/prj.conf
@@ -8,4 +8,7 @@ CONFIG_LOG_BUFFER_SIZE=512
 CONFIG_LOG_INPLACE_PROCESS=n
 CONFIG_LOG_PROCESS_THREAD=y
 CONFIG_LOG_STRDUP_BUF_COUNT=1
-CONFIG_LOG_STRDUP_MAX_STRING=8
\ No newline at end of file
+CONFIG_LOG_STRDUP_MAX_STRING=8
+CONFIG_KERNEL_LOG_LEVEL_OFF=y
+CONFIG_SOC_LOG_LEVEL_OFF=y
+CONFIG_ARCH_LOG_LEVEL_OFF=y
diff --git a/tests/ztest/include/ztest.h b/tests/ztest/include/ztest.h
index 24254e112249..e5593e8f27a3 100644
--- a/tests/ztest/include/ztest.h
+++ b/tests/ztest/include/ztest.h
@@ -58,7 +58,6 @@ extern "C" {
 #include <ztest_mock.h>
 #include <ztest_test.h>
 #include <tc_util.h>
-#include <logging/sys_log.h>
 
 void test_main(void);