From 4a368a61ae50413e9ceab70fa16c05c14bc07e51 Mon Sep 17 00:00:00 2001
From: zhiayang <gpg@tsumaran.ai>
Date: Sat, 4 Jun 2022 16:40:51 +0800
Subject: [PATCH] move max7318 driver out of the folder too

---
 app/drivers/gpio/CMakeLists.txt                       | 3 +++
 app/drivers/gpio/Kconfig                              | 1 +
 app/drivers/gpio/{max7318/Kconfig => Kconfig.max7318} | 0
 app/drivers/gpio/{max7318 => }/gpio_max7318.c         | 0
 app/drivers/gpio/{max7318 => }/gpio_max7318.h         | 0
 app/drivers/gpio/max7318/CMakeLists.txt               | 8 --------
 6 files changed, 4 insertions(+), 8 deletions(-)
 rename app/drivers/gpio/{max7318/Kconfig => Kconfig.max7318} (100%)
 rename app/drivers/gpio/{max7318 => }/gpio_max7318.c (100%)
 rename app/drivers/gpio/{max7318 => }/gpio_max7318.h (100%)
 delete mode 100644 app/drivers/gpio/max7318/CMakeLists.txt

diff --git a/app/drivers/gpio/CMakeLists.txt b/app/drivers/gpio/CMakeLists.txt
index 1dc6ad25..2fe30c05 100644
--- a/app/drivers/gpio/CMakeLists.txt
+++ b/app/drivers/gpio/CMakeLists.txt
@@ -6,3 +6,6 @@ zephyr_library_include_directories(${CMAKE_SOURCE_DIR}/include)
 
 zephyr_library_sources_ifdef(CONFIG_GPIO_MCP23017 gpio_mcp23017.c)
 zephyr_library_sources_ifndef(CONFIG_GPIO_MCP23017 ${ZEPHYR_BASE}/misc/empty_file.c)
+
+zephyr_library_sources_ifdef(CONFIG_GPIO_MAX7318 gpio_max7318.c)
+zephyr_library_sources_ifndef(CONFIG_GPIO_MAX7318 ${ZEPHYR_BASE}/misc/empty_file.c)
diff --git a/app/drivers/gpio/Kconfig b/app/drivers/gpio/Kconfig
index 09f9609f..53192619 100644
--- a/app/drivers/gpio/Kconfig
+++ b/app/drivers/gpio/Kconfig
@@ -1 +1,2 @@
 rsource "Kconfig.mcp23017"
+rsource "Kconfig.max7318"
diff --git a/app/drivers/gpio/max7318/Kconfig b/app/drivers/gpio/Kconfig.max7318
similarity index 100%
rename from app/drivers/gpio/max7318/Kconfig
rename to app/drivers/gpio/Kconfig.max7318
diff --git a/app/drivers/gpio/max7318/gpio_max7318.c b/app/drivers/gpio/gpio_max7318.c
similarity index 100%
rename from app/drivers/gpio/max7318/gpio_max7318.c
rename to app/drivers/gpio/gpio_max7318.c
diff --git a/app/drivers/gpio/max7318/gpio_max7318.h b/app/drivers/gpio/gpio_max7318.h
similarity index 100%
rename from app/drivers/gpio/max7318/gpio_max7318.h
rename to app/drivers/gpio/gpio_max7318.h
diff --git a/app/drivers/gpio/max7318/CMakeLists.txt b/app/drivers/gpio/max7318/CMakeLists.txt
deleted file mode 100644
index 98a67cd6..00000000
--- a/app/drivers/gpio/max7318/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2022 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-zephyr_library_named(zmk__drivers__gpio)
-zephyr_library_include_directories(${CMAKE_SOURCE_DIR}/include)
-
-zephyr_library_sources_ifdef(CONFIG_GPIO_MAX7318 gpio_max7318.c)
-zephyr_library_sources_ifndef(CONFIG_GPIO_MAX7318 ${ZEPHYR_BASE}/misc/empty_file.c)