Skip to content

Commit 6aa9c3a

Browse files
committed
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 zephyrproject-rtos#16539 Signed-off-by: Anas Nashif <anas.nashif@intel.com>
1 parent 08a9961 commit 6aa9c3a

File tree

175 files changed

+652
-637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+652
-637
lines changed

boards/arm/efm32hg_slstk3400a/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <init.h>
88
#include "board.h"
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <misc/printk.h>
1111

1212
static int efm32hg_slstk3400a_init(struct device *dev)

boards/arm/efm32pg_stk3402a/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <init.h>
88
#include "board.h"
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <misc/printk.h>
1111

1212
static int efm32pg_stk3402a_init(struct device *dev)

boards/arm/efm32wg_stk3800/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <init.h>
88
#include "board.h"
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <misc/printk.h>
1111

1212
static int efm32wg_stk3800_init(struct device *dev)

boards/arm/efr32_slwstk6061a/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <init.h>
88
#include "board.h"
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <misc/printk.h>
1111

1212
static int efr32_slwstk6061a_init(struct device *dev)

boards/arm/hexiwear_k64/pinmux.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <init.h>
88
#include <pinmux.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <fsl_port.h>
1111

1212
static int hexiwear_k64_pinmux_init(struct device *dev)

boards/arm/nrf52840_pca10090/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <zephyr.h>
88
#include <init.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <logging/log.h>
1111

1212
LOG_MODULE_REGISTER(board_control, CONFIG_BOARD_PCA10090_LOG_LEVEL);

boards/arm/nrf52_pca20020/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
#include <init.h>
8-
#include <gpio.h>
8+
#include <drivers/gpio.h>
99
#include <misc/printk.h>
1010

1111
#define VDD_PWR_CTRL_GPIO_PIN 30

boards/arm/nrf9160_pca10090/nrf52840_reset.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <gpio.h>
7+
#include <drivers/gpio.h>
88
#include <uart.h>
99
#include <device.h>
1010

boards/arm/particle_argon/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include <init.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include "board.h"
1111

1212
static inline void external_antenna(bool on)

boards/arm/particle_boron/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include <init.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include "board.h"
1111

1212
static inline void external_antenna(bool on)

boards/arm/particle_xenon/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include <init.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include "board.h"
1111

1212
static inline void external_antenna(bool on)

boards/x86/arduino_101/nrf51_pm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
#include <zephyr.h>
10-
#include <gpio.h>
10+
#include <drivers/gpio.h>
1111
#include <uart.h>
1212

1313
#include <errno.h>

boards/x86/galileo/pinmux.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <pinmux.h>
1515
#include <i2c.h>
16-
#include <gpio.h>
16+
#include <drivers/gpio.h>
1717
#include <pwm.h>
1818

1919
#include <pinmux/pinmux.h>

boards/x86/quark_se_c1000_devboard/board.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#if defined(CONFIG_IEEE802154_CC2520)
1313

1414
#include <ieee802154/cc2520.h>
15-
#include <gpio.h>
15+
#include <drivers/gpio.h>
1616

1717
static struct cc2520_gpio_configuration cc2520_gpios[CC2520_GPIO_IDX_MAX] = {
1818
{ .dev = NULL, .pin = DT_INST_0_TI_CC2520_VREG_EN_GPIOS_PIN, },

drivers/audio/tlv320dac310x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <device.h>
1212
#include <i2c.h>
13-
#include <gpio.h>
13+
#include <drivers/gpio.h>
1414

1515
#include <audio/codec.h>
1616
#include "tlv320dac310x.h"

drivers/bluetooth/hci/spi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* SPDX-License-Identifier: Apache-2.0
77
*/
88

9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <init.h>
1111
#include <spi.h>
1212
#include <misc/byteorder.h>

drivers/can/can_mcp2515.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <kernel.h>
88
#include <device.h>
99
#include <spi.h>
10-
#include <gpio.h>
10+
#include <drivers/gpio.h>
1111

1212
#define LOG_LEVEL CONFIG_CAN_LOG_LEVEL
1313
#include <logging/log.h>

drivers/display/display_ili9340.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <logging/log.h>
1313
LOG_MODULE_REGISTER(display_ili9340);
1414

15-
#include <gpio.h>
15+
#include <drivers/gpio.h>
1616
#include <misc/byteorder.h>
1717
#include <spi.h>
1818
#include <string.h>

drivers/display/mb_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <zephyr.h>
1515
#include <init.h>
16-
#include <gpio.h>
16+
#include <drivers/gpio.h>
1717
#include <device.h>
1818
#include <string.h>
1919
#include <misc/printk.h>

drivers/display/ssd1306.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LOG_MODULE_REGISTER(ssd1306);
1111
#include <string.h>
1212
#include <device.h>
1313
#include <init.h>
14-
#include <gpio.h>
14+
#include <drivers/gpio.h>
1515
#include <i2c.h>
1616

1717
#include "ssd1306_regs.h"

drivers/display/ssd1673.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LOG_MODULE_REGISTER(ssd1673);
1212
#include <device.h>
1313
#include <display.h>
1414
#include <init.h>
15-
#include <gpio.h>
15+
#include <drivers/gpio.h>
1616
#include <spi.h>
1717
#include <misc/byteorder.h>
1818

drivers/ethernet/eth_enc28j60.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
1515
#include <device.h>
1616
#include <string.h>
1717
#include <errno.h>
18-
#include <gpio.h>
18+
#include <drivers/gpio.h>
1919
#include <spi.h>
2020
#include <net/net_pkt.h>
2121
#include <net/net_if.h>

drivers/ethernet/eth_enc28j60_priv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include <kernel.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010

1111
#ifndef _ENC28J60_
1212
#define _ENC28J60_

drivers/gpio/gpio_altera_nios2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <device.h>
1414
#include <init.h>
1515
#include <soc.h>
16-
#include <gpio.h>
16+
#include <drivers/gpio.h>
1717

1818
#include "gpio_utils.h"
1919
#include "altera_avalon_pio_regs.h"

drivers/gpio/gpio_atmel_sam3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include <soc.h>
1919

20-
#include <gpio.h>
20+
#include <drivers/gpio.h>
2121
#include "gpio_utils.h"
2222

2323
typedef void (*config_func_t)(struct device *dev);

drivers/gpio/gpio_cc13xx_cc26xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <misc/__assert.h>
99
#include <device.h>
1010
#include <errno.h>
11-
#include <gpio.h>
11+
#include <drivers/gpio.h>
1212

1313
#include <driverlib/gpio.h>
1414
#include <driverlib/interrupt.h>

drivers/gpio/gpio_cc2650.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <toolchain/gcc.h>
88
#include <device.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <init.h>
1111
#include <soc.h>
1212
#include <sys/sys_io.h>

drivers/gpio/gpio_cc32xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <errno.h>
77

88
#include <device.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <init.h>
1111
#include <kernel.h>
1212
#include <sys/sys_io.h>

drivers/gpio/gpio_cmsdk_ahb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <device.h>
1010
#include <errno.h>
11-
#include <gpio.h>
11+
#include <drivers/gpio.h>
1212
#include <init.h>
1313
#include <soc.h>
1414
#include <clock_control/arm_clock_control.h>

drivers/gpio/gpio_cmsdk_ahb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_
77
#define ZEPHYR_DRIVERS_GPIO_GPIO_CMSDK_AHB_H_
88

9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010

1111
#ifdef __cplusplus
1212
extern "C" {

drivers/gpio/gpio_dw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <errno.h>
88

99
#include <kernel.h>
10-
#include <gpio.h>
10+
#include <drivers/gpio.h>
1111
#include "gpio_dw.h"
1212
#include "gpio_utils.h"
1313

drivers/gpio/gpio_dw.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define ZEPHYR_DRIVERS_GPIO_GPIO_DW_H_
99

1010
#include <zephyr/types.h>
11-
#include <gpio.h>
11+
#include <drivers/gpio.h>
1212
#include "gpio_dw_registers.h"
1313

1414
#ifdef CONFIG_PCI

drivers/gpio/gpio_esp32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <soc.h>
1414
#include <errno.h>
1515
#include <device.h>
16-
#include <gpio.h>
16+
#include <drivers/gpio.h>
1717
#include <kernel.h>
1818
#include <misc/util.h>
1919
#include <pinmux.h>

drivers/gpio/gpio_gecko.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
#include <errno.h>
8-
#include <gpio.h>
8+
#include <drivers/gpio.h>
99
#include <soc.h>
1010
#include <em_gpio.h>
1111

drivers/gpio/gpio_handlers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <gpio.h>
7+
#include <drivers/gpio.h>
88
#include <syscall_handler.h>
99

1010
Z_SYSCALL_HANDLER(gpio_config, port, access_op, pin, flags)

drivers/gpio/gpio_ht16k33.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @brief GPIO driver for the HT16K33 I2C LED driver with keyscan
1010
*/
1111

12-
#include <gpio.h>
12+
#include <drivers/gpio.h>
1313
#include <zephyr.h>
1414

1515
#define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL

drivers/gpio/gpio_imx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <errno.h>
88
#include <device.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <soc.h>
1111
#include <gpio_imx.h>
1212

drivers/gpio/gpio_intel_apl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define GPIO_INTEL_APL_NR_SUBDEVS 10
2323

2424
#include <errno.h>
25-
#include <gpio.h>
25+
#include <drivers/gpio.h>
2626
#include <soc.h>
2727
#include <sys/sys_io.h>
2828
#include <misc/__assert.h>

drivers/gpio/gpio_mchp_xec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <errno.h>
88
#include <device.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <soc.h>
1111

1212
#include "gpio_utils.h"

drivers/gpio/gpio_mcux.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <errno.h>
99
#include <device.h>
10-
#include <gpio.h>
10+
#include <drivers/gpio.h>
1111
#include <soc.h>
1212
#include <fsl_common.h>
1313
#include <fsl_port.h>

drivers/gpio/gpio_mcux_igpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <errno.h>
88
#include <device.h>
9-
#include <gpio.h>
9+
#include <drivers/gpio.h>
1010
#include <soc.h>
1111
#include <fsl_common.h>
1212
#include <fsl_gpio.h>

drivers/gpio/gpio_mcux_lpc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include <errno.h>
1717
#include <device.h>
18-
#include <gpio.h>
18+
#include <drivers/gpio.h>
1919
#include <soc.h>
2020
#include <fsl_common.h>
2121
#include "gpio_utils.h"

drivers/gpio/gpio_nrfx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <gpio.h>
7+
#include <drivers/gpio.h>
88
#include <hal/nrf_gpio.h>
99
#include <hal/nrf_gpiote.h>
1010

drivers/gpio/gpio_pcal9535a.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <device.h>
1515
#include <init.h>
1616
#include <misc/util.h>
17-
#include <gpio.h>
17+
#include <drivers/gpio.h>
1818
#include <i2c.h>
1919

2020
#include "gpio_pcal9535a.h"

0 commit comments

Comments
 (0)