diff --git a/boards/nxp/fmuk66-v3/nuttx-config/Kconfig b/boards/nxp/fmuk66-v3/nuttx-config/Kconfig
index 0fe046b107..df8b0f628d 100644
--- a/boards/nxp/fmuk66-v3/nuttx-config/Kconfig
+++ b/boards/nxp/fmuk66-v3/nuttx-config/Kconfig
@@ -45,6 +45,3 @@ config BOARD_USE_PROBES
 
 	---help---
 		Select to use GPIO FMU-CH1-6 to provide timing signals from selected drivers.
-
-endif
-
diff --git a/boards/nxp/fmuk66-v3/src/board_config.h b/boards/nxp/fmuk66-v3/src/board_config.h
index 14195c4759..22db8a1324 100644
--- a/boards/nxp/fmuk66-v3/src/board_config.h
+++ b/boards/nxp/fmuk66-v3/src/board_config.h
@@ -50,7 +50,7 @@ __BEGIN_DECLS
 
 /* these headers are not C++ safe */
 #include <kinetis.h>
-#include <chip/kinetis_pinmux.h>
+#include <hardware/kinetis_pinmux.h>
 #include <arch/board/board.h>
 
 /* FMUK66 GPIOs ***********************************************************************************/
diff --git a/boards/nxp/fmuk66-v3/src/init.c b/boards/nxp/fmuk66-v3/src/init.c
index 4c9e53c50f..cc52665d8c 100644
--- a/boards/nxp/fmuk66-v3/src/init.c
+++ b/boards/nxp/fmuk66-v3/src/init.c
@@ -63,7 +63,7 @@
 
 #include <kinetis.h>
 #include <kinetis_uart.h>
-#include <chip/kinetis_uart.h>
+#include <hardware/kinetis_uart.h>
 #include "board_config.h"
 
 #include "up_arch.h"
diff --git a/boards/nxp/fmuk66-v3/src/timer_config.c b/boards/nxp/fmuk66-v3/src/timer_config.c
index 67eac5cd51..f56a0956da 100644
--- a/boards/nxp/fmuk66-v3/src/timer_config.c
+++ b/boards/nxp/fmuk66-v3/src/timer_config.c
@@ -43,8 +43,8 @@
 #include <stdint.h>
 
 #include <kinetis.h>
-#include "chip/kinetis_sim.h"
-#include "chip/kinetis_ftm.h"
+#include "hardware/kinetis_sim.h"
+#include "hardware/kinetis_ftm.h"
 
 #include <drivers/drv_pwm_output.h>
 #include <px4_arch/io_timer.h>
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/adc/adc.cpp b/platforms/nuttx/src/px4/nxp/kinetis/adc/adc.cpp
index 78a650ec93..5e2397daf9 100644
--- a/platforms/nuttx/src/px4/nxp/kinetis/adc/adc.cpp
+++ b/platforms/nuttx/src/px4/nxp/kinetis/adc/adc.cpp
@@ -38,8 +38,8 @@
 
 #include <nuttx/analog/adc.h>
 #include <kinetis.h>
-#include <chip/kinetis_sim.h>
-#include <chip/kinetis_adc.h>
+#include <hardware/kinetis_sim.h>
+#include <hardware/kinetis_adc.h>
 
 
 #define _REG(_addr)	(*(volatile uint32_t *)(_addr))
@@ -146,7 +146,7 @@ void px4_arch_adc_uninit(uint32_t base_address)
 	px4_leave_critical_section(flags);
 }
 
-uint16_t px4_arch_adc_sample(uint32_t base_address, unsigned channel)
+uint32_t px4_arch_adc_sample(uint32_t base_address, unsigned channel)
 {
 	irqstate_t flags = px4_enter_critical_section();
 
@@ -169,7 +169,7 @@ uint16_t px4_arch_adc_sample(uint32_t base_address, unsigned channel)
 	}
 
 	/* read the result and clear EOC */
-	uint16_t result = rRA(1);
+	uint32_t result = rRA(1);
 
 	px4_leave_critical_section(flags);
 
@@ -181,3 +181,7 @@ uint32_t px4_arch_adc_temp_sensor_mask()
 	return 1 << (ADC_SC1_ADCH_TEMP >> ADC_SC1_ADCH_SHIFT);
 }
 
+uint32_t px4_arch_adc_dn_fullcount(void)
+{
+	return 1 << 12; // 12 bit ADC
+}
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/hrt/hrt.c b/platforms/nuttx/src/px4/nxp/kinetis/hrt/hrt.c
index c430fe5a3d..7e2954999b 100644
--- a/platforms/nuttx/src/px4/nxp/kinetis/hrt/hrt.c
+++ b/platforms/nuttx/src/px4/nxp/kinetis/hrt/hrt.c
@@ -67,7 +67,7 @@
 
 
 #include "kinetis.h"
-#include "chip/kinetis_sim.h"
+#include "hardware/kinetis_sim.h"
 #include "kinetis_tpm.h"
 
 #undef PPM_DEBUG
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/io_pins/input_capture.c b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/input_capture.c
index bb5cc56ec6..a1e3490771 100644
--- a/platforms/nuttx/src/px4/nxp/kinetis/io_pins/input_capture.c
+++ b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/input_capture.c
@@ -75,8 +75,8 @@
 #include <px4_arch/io_timer.h>
 
 #include <kinetis.h>
-#include "chip/kinetis_sim.h"
-#include "chip/kinetis_ftm.h"
+#include "hardware/kinetis_sim.h"
+#include "hardware/kinetis_ftm.h"
 
 
 #define _REG(_addr)	(*(volatile uint32_t *)(_addr))
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/io_pins/io_timer.c b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/io_timer.c
index cb5ba56a51..b8ffe90684 100644
--- a/platforms/nuttx/src/px4/nxp/kinetis/io_pins/io_timer.c
+++ b/platforms/nuttx/src/px4/nxp/kinetis/io_pins/io_timer.c
@@ -59,8 +59,8 @@
 #include <px4_arch/io_timer.h>
 
 #include <kinetis.h>
-#include "chip/kinetis_sim.h"
-#include "chip/kinetis_ftm.h"
+#include "hardware/kinetis_sim.h"
+#include "hardware/kinetis_ftm.h"
 
 /* The FTM pre-scalers are limited to Divide by 2^n where n={1-7}
  * Therefore we use Y1 at 16 Mhz to drive FTM_CLKIN0 (PCT12)
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/led_pwm/led_pwm.cpp b/platforms/nuttx/src/px4/nxp/kinetis/led_pwm/led_pwm.cpp
index 3bdf75ba0b..e59021d556 100644
--- a/platforms/nuttx/src/px4/nxp/kinetis/led_pwm/led_pwm.cpp
+++ b/platforms/nuttx/src/px4/nxp/kinetis/led_pwm/led_pwm.cpp
@@ -59,8 +59,8 @@
 #include <px4_arch/io_timer.h>
 
 #include <kinetis.h>
-#include "chip/kinetis_sim.h"
-#include "chip/kinetis_ftm.h"
+#include "hardware/kinetis_sim.h"
+#include "hardware/kinetis_ftm.h"
 
 #if defined(BOARD_HAS_LED_PWM) || defined(BOARD_HAS_UI_LED_PWM)
 
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/tone_alarm/ToneAlarmInterface.cpp b/platforms/nuttx/src/px4/nxp/kinetis/tone_alarm/ToneAlarmInterface.cpp
index 0b39309f76..e9df8ccf92 100644
--- a/platforms/nuttx/src/px4/nxp/kinetis/tone_alarm/ToneAlarmInterface.cpp
+++ b/platforms/nuttx/src/px4/nxp/kinetis/tone_alarm/ToneAlarmInterface.cpp
@@ -35,7 +35,7 @@
  * @file ToneAlarmInterface.cpp
  */
 
-#include "chip/kinetis_sim.h"
+#include "hardware/kinetis_sim.h"
 #include "kinetis_tpm.h"
 
 #include <drivers/device/device.h>
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/version/board_identity.c b/platforms/nuttx/src/px4/nxp/kinetis/version/board_identity.c
index 19b78d05ba..45d265d47b 100644
--- a/platforms/nuttx/src/px4/nxp/kinetis/version/board_identity.c
+++ b/platforms/nuttx/src/px4/nxp/kinetis/version/board_identity.c
@@ -41,8 +41,8 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include <chip/kinetis_memorymap.h>
-#include <chip/kinetis_sim.h>
+#include <hardware/kinetis_memorymap.h>
+#include <hardware/kinetis_sim.h>
 
 static const uint16_t soc_arch_id = PX4_SOC_ARCH_ID;
 
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/version/board_mcu_version.c b/platforms/nuttx/src/px4/nxp/kinetis/version/board_mcu_version.c
index 9a43d5aff9..95e44c0e14 100644
--- a/platforms/nuttx/src/px4/nxp/kinetis/version/board_mcu_version.c
+++ b/platforms/nuttx/src/px4/nxp/kinetis/version/board_mcu_version.c
@@ -41,7 +41,7 @@
 #include <px4_platform_common/defines.h>
 
 #include "up_arch.h"
-#include "chip/kinetis_sim.h"
+#include "hardware/kinetis_sim.h"
 
 #define CHIP_TAG     "Kinetis K??"
 #define CHIP_TAG_LEN sizeof(CHIP_TAG)-1