From 2e30987a7e70769fb4ca9191ef43de20e27b69ba Mon Sep 17 00:00:00 2001
From: Hector Bujanda <hector.bujanda@digi.com>
Date: Thu, 12 Mar 2020 03:21:37 -0700
Subject: [PATCH] libdigiapix: make use of libgpiod

Added libgpiod dependence.

The configuration file entries change to following format:
   - USER_LED = mca-gpio,12
   - USER_BUTTON = mca-gpio,10

https://jira.digi.com/browse/DEL-6425

Signed-off-by: Hector Bujanda <hector.bujanda@digi.com>
---
 .../ccimx6qpsbc/libdigiapix.conf              | 10 ++++----
 .../ccimx6sbc/libdigiapix.conf                | 10 ++++----
 .../ccimx6ulsbc/libdigiapix.conf              |  8 +++----
 .../ccimx6ulstarter/libdigiapix.conf          |  8 +++----
 .../ccimx8mn-dvk/libdigiapix.conf             | 24 +++++++++----------
 .../ccimx8x-sbc-express/libdigiapix.conf      |  8 +++----
 .../ccimx8x-sbc-pro/libdigiapix.conf          | 14 +++++------
 .../libdigiapix/libdigiapix_git.bb            |  2 +-
 8 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6qpsbc/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6qpsbc/libdigiapix.conf
index 42e862742..4f6914386 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6qpsbc/libdigiapix.conf
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6qpsbc/libdigiapix.conf
@@ -4,17 +4,17 @@ model = Digi International ConnectCore 6 QuadPlus Single Board Computer.
 [GPIO]
 
 # USER LED (RED) - GPIO02_IO02
-USER_LED = 34
-USER_LED0 = 34
+USER_LED = gpio2,2
+USER_LED0 = gpio2,2
 
 # USER LED (ORANGE) - GPIO02_IO03
-USER_LED1 = 35
+USER_LED1 = gpio2,3
 
 # USER LED (GREEN) - GPIO02_IO04
-USER_LED2 = 36
+USER_LED2 = gpio2,4
 
 # USER BUTTON - GPIO02_IO05
-USER_BUTTON = 37
+USER_BUTTON = gpio2,5
 
 [I2C]
 
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6sbc/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6sbc/libdigiapix.conf
index 7025848c5..1beae687b 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6sbc/libdigiapix.conf
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6sbc/libdigiapix.conf
@@ -4,17 +4,17 @@ model = Digi International ConnectCore 6 Single Board Computer.
 [GPIO]
 
 # USER LED (RED) - GPIO02_IO02
-USER_LED = 34
-USER_LED0 = 34
+USER_LED = gpio2,2
+USER_LED0 = gpio2,2
 
 # USER LED (ORANGE) - GPIO02_IO03
-USER_LED1 = 35
+USER_LED1 = gpio2,3
 
 # USER LED (GREEN) - GPIO02_IO04
-USER_LED2 = 36
+USER_LED2 = gpio2,4
 
 # USER BUTTON - GPIO02_IO05
-USER_BUTTON = 37
+USER_BUTTON = gpio2,5
 
 [I2C]
 
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulsbc/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulsbc/libdigiapix.conf
index f311343c6..6d3f3fde5 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulsbc/libdigiapix.conf
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulsbc/libdigiapix.conf
@@ -3,11 +3,11 @@ model = Digi International ConnectCore 6UL SBC.
 
 [GPIO]
 
-# USER LED - I/O Expander IO23
-USER_LED = 488
+# USER LED
+USER_LED = ioexp-gpio,23
 
-# USER BUTTON - MCA_IO1
-USER_BUTTON = 505
+# USER BUTTON
+USER_BUTTON = mca-gpio,1
 
 [I2C]
 
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulstarter/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulstarter/libdigiapix.conf
index cfce290e0..ad5abc81d 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulstarter/libdigiapix.conf
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6ulstarter/libdigiapix.conf
@@ -3,11 +3,11 @@ model = Digi International ConnectCore 6UL Starter Board.
 
 [GPIO]
 
-# USER LED - GPIO03_IO11
-USER_LED = 75
+# USER LED
+USER_LED = gpio3,11
 
-# USER BUTTON - GPIO03_IO03
-USER_BUTTON = 67
+# USER BUTTON
+USER_BUTTON = gpio3,3
 
 [I2C]
 
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8mn-dvk/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8mn-dvk/libdigiapix.conf
index e2c401ab4..df7370c4e 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8mn-dvk/libdigiapix.conf
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8mn-dvk/libdigiapix.conf
@@ -3,22 +3,22 @@ model = Digi International ConnectCore 8M Nano DVK.
 
 [GPIO]
 
-# USER LED1 - MCA_IO12
-USER_LED = 505
-USER_LED1 = 505
+# USER LED1
+USER_LED = mca-gpio,12
+USER_LED1 = mca-gpio,12
 
-# USER_LED2 - MCA_IO18
-USER_LED2 = 511
+# USER_LED2
+USER_LED2 = mca-gpio,18
 
-# USER_LED3 - GPIO2_IO19
-USER_LED3 = 51
+# USER_LED3
+USER_LED3 = gpio2,19
 
-# USER BUTTON1 - MCA_IO10
-USER_BUTTON = 503
-USER_BUTTON1 = 503
+# USER BUTTON1
+USER_BUTTON = mca-gpio,10
+USER_BUTTON1 = mca-gpio,10
 
-# USER BUTTON2 - GPIO2_IO20
-USER_BUTTON2 = 52
+# USER BUTTON2
+USER_BUTTON2 = gpio2,20
 
 [I2C]
 
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/libdigiapix.conf
index dd4e8f41b..b58d4c589 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/libdigiapix.conf
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/libdigiapix.conf
@@ -3,11 +3,11 @@ model = Digi International ConnectCore 8X SBC Express.
 
 [GPIO]
 
-# USER LED - GPIO0_19
-USER_LED = 499
+# USER LED
+USER_LED = gpio0,19
 
-# USER BUTTON - GPIO0_20
-USER_BUTTON = 500
+# USER BUTTON
+USER_BUTTON = gpio0,20
 
 [I2C]
 
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf
index 021aa99ca..16e62818c 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf
@@ -3,15 +3,15 @@ model = Digi International ConnectCore 8X SBC Pro.
 
 [GPIO]
 
-# USER LED0 - MCA_IO18
-USER_LED = 223
-USER_LED0 = 223
+# USER LED0
+USER_LED = mca-gpio,18
+USER_LED0 = mca-gpio,18
 
-# USER_LED1 - MCA_IO10
-USER_LED1 = 215
+# USER_LED1
+USER_LED1 = mca-gpio,10
 
-# USER BUTTON - MCA_IO07
-USER_BUTTON = 212
+# USER BUTTON
+USER_BUTTON = mca-gpio,7
 
 [I2C]
 
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
index b0fde7bf2..8dd3c771f 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d"
 
-DEPENDS = "libsoc libsocketcan"
+DEPENDS = "libsoc libsocketcan libgpiod"
 
 SRCBRANCH ?= "master"
 SRCREV = "${AUTOREV}"