Skip to content
Permalink
Browse files

cleanup: include/: move gpio.h to drivers/gpio.h

move gpio.h to drivers/gpio.h and
create a shim for backward-compatibility.

No functional changes to the headers.
A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES.

Related to #16539

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
  • Loading branch information...
nashif committed Jun 25, 2019
1 parent 08a9961 commit 6aa9c3a68f0ba40e502ed95d64518cd4583bb39c
Showing with 652 additions and 637 deletions.
  1. +1 −1 boards/arm/efm32hg_slstk3400a/board.c
  2. +1 −1 boards/arm/efm32pg_stk3402a/board.c
  3. +1 −1 boards/arm/efm32wg_stk3800/board.c
  4. +1 −1 boards/arm/efr32_slwstk6061a/board.c
  5. +1 −1 boards/arm/hexiwear_k64/pinmux.c
  6. +1 −1 boards/arm/nrf52840_pca10090/board.c
  7. +1 −1 boards/arm/nrf52_pca20020/board.c
  8. +1 −1 boards/arm/nrf9160_pca10090/nrf52840_reset.c
  9. +1 −1 boards/arm/particle_argon/board.c
  10. +1 −1 boards/arm/particle_boron/board.c
  11. +1 −1 boards/arm/particle_xenon/board.c
  12. +1 −1 boards/x86/arduino_101/nrf51_pm.c
  13. +1 −1 boards/x86/galileo/pinmux.c
  14. +1 −1 boards/x86/quark_se_c1000_devboard/board.c
  15. +1 −1 drivers/audio/tlv320dac310x.c
  16. +1 −1 drivers/bluetooth/hci/spi.c
  17. +1 −1 drivers/can/can_mcp2515.c
  18. +1 −1 drivers/display/display_ili9340.c
  19. +1 −1 drivers/display/mb_display.c
  20. +1 −1 drivers/display/ssd1306.c
  21. +1 −1 drivers/display/ssd1673.c
  22. +1 −1 drivers/ethernet/eth_enc28j60.c
  23. +1 −1 drivers/ethernet/eth_enc28j60_priv.h
  24. +1 −1 drivers/gpio/gpio_altera_nios2.c
  25. +1 −1 drivers/gpio/gpio_atmel_sam3.c
  26. +1 −1 drivers/gpio/gpio_cc13xx_cc26xx.c
  27. +1 −1 drivers/gpio/gpio_cc2650.c
  28. +1 −1 drivers/gpio/gpio_cc32xx.c
  29. +1 −1 drivers/gpio/gpio_cmsdk_ahb.c
  30. +1 −1 drivers/gpio/gpio_cmsdk_ahb.h
  31. +1 −1 drivers/gpio/gpio_dw.c
  32. +1 −1 drivers/gpio/gpio_dw.h
  33. +1 −1 drivers/gpio/gpio_esp32.c
  34. +1 −1 drivers/gpio/gpio_gecko.c
  35. +1 −1 drivers/gpio/gpio_handlers.c
  36. +1 −1 drivers/gpio/gpio_ht16k33.c
  37. +1 −1 drivers/gpio/gpio_imx.c
  38. +1 −1 drivers/gpio/gpio_intel_apl.c
  39. +1 −1 drivers/gpio/gpio_mchp_xec.c
  40. +1 −1 drivers/gpio/gpio_mcux.c
  41. +1 −1 drivers/gpio/gpio_mcux_igpio.c
  42. +1 −1 drivers/gpio/gpio_mcux_lpc.c
  43. +1 −1 drivers/gpio/gpio_nrfx.c
  44. +1 −1 drivers/gpio/gpio_pcal9535a.c
  45. +1 −1 drivers/gpio/gpio_pcal9535a.h
  46. +1 −1 drivers/gpio/gpio_qmsi.c
  47. +1 −1 drivers/gpio/gpio_qmsi_ss.c
  48. +1 −1 drivers/gpio/gpio_rv32m1.c
  49. +1 −1 drivers/gpio/gpio_sam.c
  50. +1 −1 drivers/gpio/gpio_sam0.c
  51. +1 −1 drivers/gpio/gpio_sch.h
  52. +1 −1 drivers/gpio/gpio_shell.c
  53. +1 −1 drivers/gpio/gpio_sifive.c
  54. +1 −1 drivers/gpio/gpio_stellaris.c
  55. +1 −1 drivers/gpio/gpio_stm32.c
  56. +1 −1 drivers/gpio/gpio_stm32.h
  57. +1 −1 drivers/gpio/gpio_sx1509b.c
  58. +1 −1 drivers/i2c/i2c_esp32.c
  59. +1 −1 drivers/i2c/i2c_gpio.c
  60. +1 −1 drivers/ieee802154/ieee802154_cc1200.c
  61. +1 −1 drivers/ieee802154/ieee802154_cc2520.c
  62. +1 −1 drivers/ieee802154/ieee802154_mcr20a.c
  63. +1 −1 drivers/led/ht16k33.c
  64. +1 −1 drivers/led_strip/ws2812b_sw.c
  65. +1 −1 drivers/modem/ublox-sara-r4.c
  66. +1 −1 drivers/modem/wncm14a2a.c
  67. +1 −1 drivers/pwm/pwm_led_esp32.c
  68. +1 −1 drivers/pwm/pwm_pca9685.h
  69. +1 −1 drivers/sensor/adt7420/adt7420.h
  70. +1 −1 drivers/sensor/adt7420/adt7420_trigger.c
  71. +1 −1 drivers/sensor/adxl362/adxl362.c
  72. +1 −1 drivers/sensor/adxl362/adxl362.h
  73. +1 −1 drivers/sensor/adxl362/adxl362_trigger.c
  74. +1 −1 drivers/sensor/adxl372/adxl372.c
  75. +1 −1 drivers/sensor/adxl372/adxl372.h
  76. +1 −1 drivers/sensor/adxl372/adxl372_trigger.c
  77. +1 −1 drivers/sensor/amg88xx/amg88xx.c
  78. +1 −1 drivers/sensor/amg88xx/amg88xx.h
  79. +1 −1 drivers/sensor/amg88xx/amg88xx_trigger.c
  80. +1 −1 drivers/sensor/apds9960/apds9960.h
  81. +1 −1 drivers/sensor/apds9960/apds9960_trigger.c
  82. +1 −1 drivers/sensor/bma280/bma280.h
  83. +1 −1 drivers/sensor/bmc150_magn/bmc150_magn.c
  84. +1 −1 drivers/sensor/bmc150_magn/bmc150_magn_trigger.c
  85. +1 −1 drivers/sensor/bme280/bme280.c
  86. +1 −1 drivers/sensor/bme680/bme680.c
  87. +1 −1 drivers/sensor/bmg160/bmg160.h
  88. +1 −1 drivers/sensor/bmi160/bmi160.h
  89. +1 −1 drivers/sensor/bmi160/bmi160_trigger.c
  90. +1 −1 drivers/sensor/bmm150/bmm150.h
  91. +1 −1 drivers/sensor/ccs811/ccs811.c
  92. +1 −1 drivers/sensor/ccs811/ccs811.h
  93. +1 −1 drivers/sensor/dht/dht.c
  94. +1 −1 drivers/sensor/ens210/ens210.h
  95. +1 −1 drivers/sensor/fxas21002/fxas21002.h
  96. +1 −1 drivers/sensor/fxos8700/fxos8700.h
  97. +1 −1 drivers/sensor/hmc5883l/hmc5883l.h
  98. +1 −1 drivers/sensor/hp206c/hp206c.c
  99. +1 −1 drivers/sensor/hts221/hts221.h
  100. +1 −1 drivers/sensor/isl29035/isl29035.h
  101. +1 −1 drivers/sensor/lis2dh/lis2dh.h
  102. +1 −1 drivers/sensor/lis2ds12/lis2ds12.h
  103. +1 −1 drivers/sensor/lis2dw12/lis2dw12.h
  104. +1 −1 drivers/sensor/lis2dw12/lis2dw12_trigger.c
  105. +1 −1 drivers/sensor/lis2mdl/lis2mdl.h
  106. +1 −1 drivers/sensor/lis2mdl/lis2mdl_trigger.c
  107. +1 −1 drivers/sensor/lis3mdl/lis3mdl.h
  108. +1 −1 drivers/sensor/lsm6dsl/lsm6dsl.h
  109. +1 −1 drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c
  110. +1 −1 drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro_trigger.c
  111. +1 −1 drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c
  112. +1 −1 drivers/sensor/max30101/max30101.h
  113. +1 −1 drivers/sensor/mcp9808/mcp9808.h
  114. +1 −1 drivers/sensor/mpu6050/mpu6050.h
  115. +1 −1 drivers/sensor/sht3xd/sht3xd.h
  116. +1 −1 drivers/sensor/sx9500/sx9500.c
  117. +1 −1 drivers/sensor/sx9500/sx9500_trigger.c
  118. +1 −1 drivers/sensor/ti_hdc/ti_hdc.c
  119. +1 −1 drivers/sensor/tmp007/tmp007.c
  120. +1 −1 drivers/sensor/tmp007/tmp007.h
  121. +1 −1 drivers/sensor/tmp007/tmp007_trigger.c
  122. +1 −1 drivers/sensor/vl53l0x/vl53l0x.c
  123. +1 −1 drivers/spi/spi_context.h
  124. +1 −1 drivers/usb/device/usb_dc_stm32.c
  125. +1 −1 drivers/wifi/eswifi/eswifi_bus_spi.c
  126. +1 −1 drivers/wifi/eswifi/eswifi_core.c
  127. +1 −1 drivers/wifi/winc1500/wifi_winc1500_nm_bsp_internal.h
  128. +474 −0 include/drivers/gpio.h
  129. +1 −1 include/drivers/gpio/gpio_mmio32.h
  130. +4 −463 include/gpio.h
  131. +1 −1 samples/basic/blinky/src/main.c
  132. +1 −1 samples/basic/button/src/main.c
  133. +1 −1 samples/basic/disco/src/main.c
  134. +1 −1 samples/basic/threads/src/main.c
  135. +1 −1 samples/bluetooth/hci_spi/src/main.c
  136. +1 −1 samples/bluetooth/mesh/src/microbit.c
  137. +2 −2 samples/bluetooth/mesh_demo/src/microbit.c
  138. +1 −1 samples/boards/96b_argonkey/microphone/src/main.c
  139. +1 −1 samples/boards/96b_argonkey/sensors/src/main.c
  140. +1 −1 samples/boards/altera_max10/pio/src/main.c
  141. +1 −1 samples/boards/bbc_microbit/display/src/main.c
  142. +1 −1 samples/boards/bbc_microbit/pong/src/ble.c
  143. +1 −1 samples/boards/bbc_microbit/pong/src/main.c
  144. +1 −1 samples/boards/bbc_microbit/sound/src/main.c
  145. +1 −1 samples/boards/nrf52/mesh/onoff-app/src/main.c
  146. +1 −1 samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/app_gpio.c
  147. +1 −1 samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/main.c
  148. +1 −1 samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/device_composition.c
  149. +1 −1 samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/publisher.c
  150. +1 −1 samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c
  151. +1 −1 samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c
  152. +1 −1 samples/boards/nrf52/power_mgr/src/sample.h
  153. +1 −1 samples/boards/reel_board/mesh_badge/src/periphs.c
  154. +1 −1 samples/boards/reel_board/mesh_badge/src/reel_board.c
  155. +1 −1 samples/boards/up_squared/gpio_counter/src/main.c
  156. +1 −1 samples/drivers/CAN/src/main.c
  157. +1 −1 samples/drivers/gpio/src/main.c
  158. +1 −1 samples/drivers/ht16k33/src/main.c
  159. +1 −1 samples/drivers/lcd_hd44780/src/main.c
  160. +1 −1 samples/drivers/led_apa102c_bitbang/src/main.c
  161. +1 −1 samples/net/lwm2m_client/src/lwm2m-client.c
  162. +1 −1 samples/net/nats/src/main.c
  163. +1 −1 samples/net/wifi/src/wifi_test.c
  164. +1 −1 samples/sensor/fxos8700-hid/src/main.c
  165. +1 −1 samples/sensor/ti_hdc/src/main.c
  166. +1 −1 samples/subsys/usb/hid-cdc/src/main.c
  167. +1 −1 samples/subsys/usb/hid-mouse/src/main.c
  168. +1 −1 subsys/disk/disk_access_sdhc.c
  169. +1 −1 subsys/usb/usb_device.c
  170. +1 −1 tests/application_development/cpp/src/main.cpp
  171. +1 −1 tests/bluetooth/mesh/src/microbit.c
  172. +1 −1 tests/boards/intel_s1000_crb/src/gpio_test.c
  173. +1 −1 tests/drivers/aio/api/src/test_callback.c
  174. +1 −1 tests/drivers/gpio/gpio_basic_api/src/test_gpio.h
  175. +1 −1 tests/drivers/pinmux/pinmux_basic_api/src/pinmux_gpio.c
@@ -6,7 +6,7 @@

#include <init.h>
#include "board.h"
#include <gpio.h>
#include <drivers/gpio.h>
#include <misc/printk.h>

static int efm32hg_slstk3400a_init(struct device *dev)
@@ -6,7 +6,7 @@

#include <init.h>
#include "board.h"
#include <gpio.h>
#include <drivers/gpio.h>
#include <misc/printk.h>

static int efm32pg_stk3402a_init(struct device *dev)
@@ -6,7 +6,7 @@

#include <init.h>
#include "board.h"
#include <gpio.h>
#include <drivers/gpio.h>
#include <misc/printk.h>

static int efm32wg_stk3800_init(struct device *dev)
@@ -6,7 +6,7 @@

#include <init.h>
#include "board.h"
#include <gpio.h>
#include <drivers/gpio.h>
#include <misc/printk.h>

static int efr32_slwstk6061a_init(struct device *dev)
@@ -6,7 +6,7 @@

#include <init.h>
#include <pinmux.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <fsl_port.h>

static int hexiwear_k64_pinmux_init(struct device *dev)
@@ -6,7 +6,7 @@

#include <zephyr.h>
#include <init.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <logging/log.h>

LOG_MODULE_REGISTER(board_control, CONFIG_BOARD_PCA10090_LOG_LEVEL);
@@ -5,7 +5,7 @@
*/

#include <init.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <misc/printk.h>

#define VDD_PWR_CTRL_GPIO_PIN 30
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <gpio.h>
#include <drivers/gpio.h>
#include <uart.h>
#include <device.h>

@@ -6,7 +6,7 @@
*/

#include <init.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include "board.h"

static inline void external_antenna(bool on)
@@ -6,7 +6,7 @@
*/

#include <init.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include "board.h"

static inline void external_antenna(bool on)
@@ -6,7 +6,7 @@
*/

#include <init.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include "board.h"

static inline void external_antenna(bool on)
@@ -7,7 +7,7 @@
*/

#include <zephyr.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <uart.h>

#include <errno.h>
@@ -13,7 +13,7 @@

#include <pinmux.h>
#include <i2c.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <pwm.h>

#include <pinmux/pinmux.h>
@@ -12,7 +12,7 @@
#if defined(CONFIG_IEEE802154_CC2520)

#include <ieee802154/cc2520.h>
#include <gpio.h>
#include <drivers/gpio.h>

static struct cc2520_gpio_configuration cc2520_gpios[CC2520_GPIO_IDX_MAX] = {
{ .dev = NULL, .pin = DT_INST_0_TI_CC2520_VREG_EN_GPIOS_PIN, },
@@ -10,7 +10,7 @@

#include <device.h>
#include <i2c.h>
#include <gpio.h>
#include <drivers/gpio.h>

#include <audio/codec.h>
#include "tlv320dac310x.h"
@@ -6,7 +6,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <gpio.h>
#include <drivers/gpio.h>
#include <init.h>
#include <spi.h>
#include <misc/byteorder.h>
@@ -7,7 +7,7 @@
#include <kernel.h>
#include <device.h>
#include <spi.h>
#include <gpio.h>
#include <drivers/gpio.h>

#define LOG_LEVEL CONFIG_CAN_LOG_LEVEL
#include <logging/log.h>
@@ -12,7 +12,7 @@
#include <logging/log.h>
LOG_MODULE_REGISTER(display_ili9340);

#include <gpio.h>
#include <drivers/gpio.h>
#include <misc/byteorder.h>
#include <spi.h>
#include <string.h>
@@ -13,7 +13,7 @@

#include <zephyr.h>
#include <init.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <device.h>
#include <string.h>
#include <misc/printk.h>
@@ -11,7 +11,7 @@ LOG_MODULE_REGISTER(ssd1306);
#include <string.h>
#include <device.h>
#include <init.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <i2c.h>

#include "ssd1306_regs.h"
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(ssd1673);
#include <device.h>
#include <display.h>
#include <init.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <spi.h>
#include <misc/byteorder.h>

@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
#include <device.h>
#include <string.h>
#include <errno.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <spi.h>
#include <net/net_pkt.h>
#include <net/net_if.h>
@@ -6,7 +6,7 @@
*/

#include <kernel.h>
#include <gpio.h>
#include <drivers/gpio.h>

#ifndef _ENC28J60_
#define _ENC28J60_
@@ -13,7 +13,7 @@
#include <device.h>
#include <init.h>
#include <soc.h>
#include <gpio.h>
#include <drivers/gpio.h>

#include "gpio_utils.h"
#include "altera_avalon_pio_regs.h"
@@ -17,7 +17,7 @@

#include <soc.h>

#include <gpio.h>
#include <drivers/gpio.h>
#include "gpio_utils.h"

typedef void (*config_func_t)(struct device *dev);
@@ -8,7 +8,7 @@
#include <misc/__assert.h>
#include <device.h>
#include <errno.h>
#include <gpio.h>
#include <drivers/gpio.h>

#include <driverlib/gpio.h>
#include <driverlib/interrupt.h>
@@ -6,7 +6,7 @@

#include <toolchain/gcc.h>
#include <device.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <init.h>
#include <soc.h>
#include <sys/sys_io.h>
@@ -6,7 +6,7 @@
#include <errno.h>

#include <device.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <init.h>
#include <kernel.h>
#include <sys/sys_io.h>
@@ -8,7 +8,7 @@

#include <device.h>
#include <errno.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <init.h>
#include <soc.h>
#include <clock_control/arm_clock_control.h>
@@ -6,7 +6,7 @@
#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_
#define ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_

#include <gpio.h>
#include <drivers/gpio.h>

#ifdef __cplusplus
extern "C" {
@@ -7,7 +7,7 @@
#include <errno.h>

#include <kernel.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include "gpio_dw.h"
#include "gpio_utils.h"

@@ -8,7 +8,7 @@
#define ZEPHYR_DRIVERS_GPIO_GPIO_DW_H_

#include <zephyr/types.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include "gpio_dw_registers.h"

#ifdef CONFIG_PCI
@@ -13,7 +13,7 @@
#include <soc.h>
#include <errno.h>
#include <device.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <kernel.h>
#include <misc/util.h>
#include <pinmux.h>
@@ -5,7 +5,7 @@
*/

#include <errno.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <soc.h>
#include <em_gpio.h>

@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <gpio.h>
#include <drivers/gpio.h>
#include <syscall_handler.h>

Z_SYSCALL_HANDLER(gpio_config, port, access_op, pin, flags)
@@ -9,7 +9,7 @@
* @brief GPIO driver for the HT16K33 I2C LED driver with keyscan
*/

#include <gpio.h>
#include <drivers/gpio.h>
#include <zephyr.h>

#define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
@@ -6,7 +6,7 @@

#include <errno.h>
#include <device.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <soc.h>
#include <gpio_imx.h>

@@ -22,7 +22,7 @@
#define GPIO_INTEL_APL_NR_SUBDEVS 10

#include <errno.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <soc.h>
#include <sys/sys_io.h>
#include <misc/__assert.h>
@@ -6,7 +6,7 @@

#include <errno.h>
#include <device.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <soc.h>

#include "gpio_utils.h"
@@ -7,7 +7,7 @@

#include <errno.h>
#include <device.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <soc.h>
#include <fsl_common.h>
#include <fsl_port.h>
@@ -6,7 +6,7 @@

#include <errno.h>
#include <device.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <soc.h>
#include <fsl_common.h>
#include <fsl_gpio.h>
@@ -15,7 +15,7 @@

#include <errno.h>
#include <device.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <soc.h>
#include <fsl_common.h>
#include "gpio_utils.h"
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <gpio.h>
#include <drivers/gpio.h>
#include <hal/nrf_gpio.h>
#include <hal/nrf_gpiote.h>

@@ -14,7 +14,7 @@
#include <device.h>
#include <init.h>
#include <misc/util.h>
#include <gpio.h>
#include <drivers/gpio.h>
#include <i2c.h>

#include "gpio_pcal9535a.h"

0 comments on commit 6aa9c3a

Please sign in to comment.
You can’t perform that action at this time.