From 1bb8a424225d6d4f5c92a56b8d0e4ae1d6469716 Mon Sep 17 00:00:00 2001
From: Mark Olsson <mark@markolsson.se>
Date: Thu, 19 Mar 2020 21:56:27 +0100
Subject: [PATCH] boards: Change dependency for I2C on i.mx rt boards

Changes dependency for I2C so that it's enabled if kscan is enabled.
This is to allow the kscan_ft5336 sample to run.
Note: LVGL has KSCAN as a dependency.
Applies to the mimxrt10{50,60,64}_evk boards.

Signed-off-by: Mark Olsson <mark@markolsson.se>
---
 boards/arm/mimxrt1050_evk/Kconfig.defconfig   | 2 +-
 boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts  | 3 ++-
 boards/arm/mimxrt1050_evk/mimxrt1050_evk.yaml | 1 +
 boards/arm/mimxrt1060_evk/Kconfig.defconfig   | 2 +-
 boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts  | 3 ++-
 boards/arm/mimxrt1060_evk/mimxrt1060_evk.yaml | 1 +
 boards/arm/mimxrt1064_evk/Kconfig.defconfig   | 2 +-
 boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts  | 3 ++-
 boards/arm/mimxrt1064_evk/mimxrt1064_evk.yaml | 1 +
 9 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/boards/arm/mimxrt1050_evk/Kconfig.defconfig b/boards/arm/mimxrt1050_evk/Kconfig.defconfig
index 45290c37792..67ed0e37462 100644
--- a/boards/arm/mimxrt1050_evk/Kconfig.defconfig
+++ b/boards/arm/mimxrt1050_evk/Kconfig.defconfig
@@ -21,7 +21,7 @@ config DISK_ACCESS_USDHC1
 	depends on DISK_ACCESS_USDHC
 
 config I2C
-	default y if LVGL
+	default y if KSCAN
 
 config I2C_1
 	default y
diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts
index 0f283467927..a6ecaff35b1 100644
--- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts
+++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts
@@ -15,6 +15,7 @@
 	aliases {
 		led0 = &green_led;
 		sw0 = &user_button;
+		kscan0 = &touch_controller;
 	};
 
 	chosen {
@@ -121,7 +122,7 @@ arduino_serial: &lpuart3 {};
 		int2-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
 	};
 
-	ft5336@38 {
+	touch_controller: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		label = "FT5336";
diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.yaml b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.yaml
index 2c02b8f7b04..df5514d89bc 100644
--- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.yaml
+++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.yaml
@@ -24,3 +24,4 @@ supported:
   - sdhc
   - spi
   - usb_device
+  - kscan:touch
diff --git a/boards/arm/mimxrt1060_evk/Kconfig.defconfig b/boards/arm/mimxrt1060_evk/Kconfig.defconfig
index af6253a513a..f97c11675fb 100644
--- a/boards/arm/mimxrt1060_evk/Kconfig.defconfig
+++ b/boards/arm/mimxrt1060_evk/Kconfig.defconfig
@@ -18,7 +18,7 @@ choice DATA_LOCATION
 endchoice
 
 config I2C
-	default y if LVGL
+	default y if KSCAN
 
 config I2C_1
 	default y
diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
index 0ca72159c4e..984d0b6e80a 100644
--- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
+++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts
@@ -15,6 +15,7 @@
 	aliases {
 		led0 = &green_led;
 		sw0 = &user_button;
+		kscan0 = &touch_controller;
 	};
 
 	chosen {
@@ -111,7 +112,7 @@ arduino_serial: &lpuart3 {};
 &lpi2c1 {
 	status = "okay";
 
-	ft5336@38 {
+	touch_controller: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		label = "FT5336";
diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.yaml b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.yaml
index 06ff53f11db..72ff2b8e64d 100644
--- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.yaml
+++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.yaml
@@ -22,3 +22,4 @@ supported:
   - i2c
   - netif:eth
   - usb_device
+  - kscan:touch
diff --git a/boards/arm/mimxrt1064_evk/Kconfig.defconfig b/boards/arm/mimxrt1064_evk/Kconfig.defconfig
index 0107a2888b5..a740413c99e 100644
--- a/boards/arm/mimxrt1064_evk/Kconfig.defconfig
+++ b/boards/arm/mimxrt1064_evk/Kconfig.defconfig
@@ -17,7 +17,7 @@ choice DATA_LOCATION
 endchoice
 
 config I2C
-	default y if LVGL
+	default y if KSCAN
 
 config I2C_1
 	default y
diff --git a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts
index 93710aef9d7..d7f46ec5fde 100644
--- a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts
+++ b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts
@@ -16,6 +16,7 @@
 		led0 = &green_led;
 		pwm-led0 = &green_pwm_led;
 		sw0 = &user_button;
+		kscan0 = &touch_controller;
 	};
 
 	chosen {
@@ -120,7 +121,7 @@ arduino_i2c: &lpi2c1 {};
 		};
 	};
 
-	ft5336@38 {
+	touch_controller: ft5336@38 {
 		compatible = "focaltech,ft5336";
 		reg = <0x38>;
 		label = "FT5336";
diff --git a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.yaml b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.yaml
index 4e3ad478cc6..e136da50ec0 100644
--- a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.yaml
+++ b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.yaml
@@ -24,3 +24,4 @@ supported:
   - pwm
   - usb_device
   - video
+  - kscan:touch