From 714a7c19b358fd01985256c33529831bc9e88e6e Mon Sep 17 00:00:00 2001
From: Nicolas Pouillon <nipo@ssji.net>
Date: Wed, 2 Nov 2016 10:00:53 +0100
Subject: [PATCH] soft: Update pinky def

---
 software/library/boards/board.build | 12 ++++++++++++
 software/library/boards/pinky.c     | 11 ++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/software/library/boards/board.build b/software/library/boards/board.build
index 7e47155..96ee02f 100644
--- a/software/library/boards/board.build
+++ b/software/library/boards/board.build
@@ -10,6 +10,8 @@
   CONFIG_DRIVER_NRF5X_RTC
   CONFIG_DRIVER_NRF5X_PRINTK_PIN 19
   CONFIG_DRIVER_NRF5X_GPIO
+  CONFIG_DRIVER_NRF5X_GPIO_ICU
+  CONFIG_DRIVER_NRF5X_GPIO_ICU_CHANNEL_COUNT 2
   CONFIG_MUTEK_PRINTK_ADDR 0x40002000
 
   %subsection printk-uart
@@ -42,6 +44,7 @@
 
   %subsection can
     CONFIG_DRIVER_MCP2515
+    %inherit spi
   %end
 
   %subsection lcd
@@ -52,4 +55,13 @@
     CONFIG_DRIVER_HD44780_4BIT_SWAPPED
   %end
 
+  %subsection nfc
+    CONFIG_DRIVER_NFC_MICORE2
+    %inherit spi
+  %end
+
+  %subsection spi
+    CONFIG_DRIVER_NRF5X_SPI
+  %end
+
 %common
diff --git a/software/library/boards/pinky.c b/software/library/boards/pinky.c
index a46d7ad..0cb931a 100644
--- a/software/library/boards/pinky.c
+++ b/software/library/boards/pinky.c
@@ -66,19 +66,20 @@ DEV_DECLARE_STATIC(spi_dev, "spi0", 0, nrf5x_spi_drv,
                    DEV_STATIC_RES_DEV_IOMUX("/gpio"),
                    DEV_STATIC_RES_IOMUX("clk", 0, 29, 0, 0),
                    DEV_STATIC_RES_IOMUX("mosi", 0, 28, 0, 0),
-                   DEV_STATIC_RES_IOMUX("miso", 0, 27, 0, 0)
+//                   DEV_STATIC_RES_IOMUX("miso", 0, 27, 0, 0)
+                   DEV_STATIC_RES_IOMUX("miso", 0, 12, 0, 0)
                    );
 
-# if defined(CONFIG_DRIVER_PN512)
+# if defined(CONFIG_DRIVER_NFC_MICORE2)
 
-DEV_DECLARE_STATIC(pn512_dev, "nfc0", 0, pn512_drv,
+DEV_DECLARE_STATIC(micore2_dev, "nfc0", 0, micore2_drv,
                    DEV_STATIC_RES_DEV_PARAM("spi", "/spi*"),
                    DEV_STATIC_RES_DEV_PARAM("gpio", "/gpio"),
                    DEV_STATIC_RES_DEV_PARAM("icu", "/gpio"),
                    DEV_STATIC_RES_IRQ(0, 2, DEV_IRQ_SENSE_FALLING_EDGE, 0, 1),
-                   DEV_STATIC_RES_GPIO("nirq", 2, 1),
-                   DEV_STATIC_RES_GPIO("rst", 0, 1),
                    DEV_STATIC_RES_UINT_PARAM("gpio-cs-id", 1),
+                   DEV_STATIC_RES_DEV_TIMER("rtc* timer*"),
+                   DEV_STATIC_RES_GPIO("resetn", 0, 1),
                    );
 
 # endif
-- 
GitLab