From cc28f49c962e6c91f810775685a7a5fd1ab7b655 Mon Sep 17 00:00:00 2001
From: Cindy Chaumont <cchaumont@witekio.com>
Date: Fri, 17 Apr 2020 10:42:30 +0200
Subject: [PATCH] Fixes #24439 issue : LPCXpresso55S69_ns target : build failed

lpcxpresso55s69_ns_defconfig file : CONFIG_ARM is not user configurable
nxp_lpx55s6x_ns.dtsi file : missing i2c.h and replace kinetis-gpio by
lpc-gpio

Signed-off-by: Cindy Chaumont <cchaumont@witekio.com>
---
 boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns_defconfig | 1 -
 dts/arm/nxp/nxp_lpc55S6x_ns.dtsi                        | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns_defconfig b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns_defconfig
index 87c140bd29dca4..e3df7057657668 100644
--- a/boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns_defconfig
+++ b/boards/arm/lpcxpresso55s69/lpcxpresso55s69_ns_defconfig
@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-CONFIG_ARM=y
 CONFIG_SOC_SERIES_LPC55XXX=y
 CONFIG_BOARD_LPCXPRESSO55S69_CPU0=y
 CONFIG_CONSOLE=y
diff --git a/dts/arm/nxp/nxp_lpc55S6x_ns.dtsi b/dts/arm/nxp/nxp_lpc55S6x_ns.dtsi
index d75478b0840099..bfc0acf356ae0f 100644
--- a/dts/arm/nxp/nxp_lpc55S6x_ns.dtsi
+++ b/dts/arm/nxp/nxp_lpc55S6x_ns.dtsi
@@ -7,6 +7,7 @@
 #include <mem.h>
 #include <arm/armv8-m.dtsi>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/i2c/i2c.h>
 
 / {
 	aliases {
@@ -98,7 +99,7 @@
 		};
 
 		gpio0: gpio@0 {
-			compatible = "nxp,kinetis-gpio";
+			compatible = "nxp,lpc-gpio";
 			reg = <0x4008c000 0x2488>;
 			interrupts = <2 2>;
 			label = "GPIO_0";
@@ -107,7 +108,7 @@
 		};
 
 		gpio1: gpio@1 {
-			compatible = "nxp,kinetis-gpio";
+			compatible = "nxp,lpc-gpio";
 			reg = <0x4008c000 0x2488>;
 			interrupts = <3 2>;
 			label = "GPIO_1";