diff --git a/arch/avr/src/avr/avr.h b/arch/avr/src/avr/avr.h
index b1b37befe60..a06de4c0241 100644
--- a/arch/avr/src/avr/avr.h
+++ b/arch/avr/src/avr/avr.h
@@ -151,7 +151,7 @@ uint8_t *up_doirq(uint8_t irq, uint8_t *regs);
  ****************************************************************************/
 
 struct spi_dev_s; /* Forward references */
-enum spi_dev_e;   /* Forward references */
+uint32_t;   /* Forward references */
 
 FAR struct spi_dev_s *avr_spibus_initialize(int port);
 
@@ -183,10 +183,10 @@ FAR struct spi_dev_s *avr_spibus_initialize(int port);
  ************************************************************************************/
 
 #ifdef CONFIG_AVR_SPI
-void  avr_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
-uint8_t avr_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+void  avr_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
+uint8_t avr_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int avr_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int avr_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
diff --git a/arch/hc/src/m9s12/m9s12.h b/arch/hc/src/m9s12/m9s12.h
index 50e3a14abe7..921c4efa962 100644
--- a/arch/hc/src/m9s12/m9s12.h
+++ b/arch/hc/src/m9s12/m9s12.h
@@ -338,7 +338,7 @@ int hcs12_ethinitialize(int intf);
  ****************************************************************************/
 
 struct spi_dev_s;  /* Forward reference */
-enum spi_dev_e;    /* Forward reference */
+uint32_t;    /* Forward reference */
 
 FAR struct spi_dev_s *hcs12_spibus_initialize(int port);
 
@@ -367,8 +367,8 @@ FAR struct spi_dev_s *hcs12_spibus_initialize(int port);
  *
  ************************************************************************************/
 
-void  hcs12_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
-uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+void  hcs12_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
+uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/arch/mips/src/pic32mx/pic32mx.h b/arch/mips/src/pic32mx/pic32mx.h
index a2de82ed5aa..cd2272597a9 100644
--- a/arch/mips/src/pic32mx/pic32mx.h
+++ b/arch/mips/src/pic32mx/pic32mx.h
@@ -400,7 +400,7 @@ void pic32mx_dumpgpio(uint32_t pinset, const char *msg);
  ****************************************************************************/
 
 struct spi_dev_s;  /* Forward reference */
-enum spi_dev_e;    /* Forward reference */
+uint32_t;    /* Forward reference */
 
 FAR struct spi_dev_s *pic32mx_spibus_initialize(int port);
 
@@ -433,38 +433,38 @@ FAR struct spi_dev_s *pic32mx_spibus_initialize(int port);
  ************************************************************************************/
 
 #ifdef CONFIG_PIC32MX_SPI1
-void  pic32mx_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+void  pic32mx_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
                          bool selected);
-uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t pic32mx_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int pic32mx_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
 #ifdef CONFIG_PIC32MX_SPI2
-void  pic32mx_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+void  pic32mx_spi2select(FAR struct spi_dev_s *dev, uint32_t devid,
                          bool selected);
-uint8_t pic32mx_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t pic32mx_spi2status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int pic32mx_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int pic32mx_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
 #ifdef CONFIG_PIC32MX_SPI3
-void  pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+void  pic32mx_spi3select(FAR struct spi_dev_s *dev, uint32_t devid,
                          bool selected);
-uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
 #ifdef CONFIG_PIC32MX_SPI3
-void  pic32mx_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+void  pic32mx_spi3select(FAR struct spi_dev_s *dev, uint32_t devid,
                          bool selected);
-uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t pic32mx_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int pic32mx_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
diff --git a/arch/mips/src/pic32mz/pic32mz-spi.h b/arch/mips/src/pic32mz/pic32mz-spi.h
index f908f63b7c2..1cbc8e4be33 100644
--- a/arch/mips/src/pic32mz/pic32mz-spi.h
+++ b/arch/mips/src/pic32mz/pic32mz-spi.h
@@ -71,7 +71,7 @@ extern "C"
  ************************************************************************************/
 
 struct spi_dev_s;  /* Forward reference */
-enum spi_dev_e;    /* Forward reference */
+uint32_t;    /* Forward reference */
 
 /****************************************************************************
  * Name: pic32mz_spibus_initialize
@@ -118,56 +118,56 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port);
  ************************************************************************************/
 
 #ifdef CONFIG_PIC32MZ_SPI1
-void pic32mz_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+void pic32mz_spi1select(FAR struct spi_dev_s *dev, uint32_t devid,
                         bool selected);
-uint8_t pic32mz_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t pic32mz_spi1status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int pic32mz_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int pic32mz_spi1cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
 #ifdef CONFIG_PIC32MZ_SPI2
-void pic32mz_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+void pic32mz_spi2select(FAR struct spi_dev_s *dev, uint32_t devid,
                         bool selected);
-uint8_t pic32mz_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t pic32mz_spi2status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int pic32mz_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int pic32mz_spi2cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
 #ifdef CONFIG_PIC32MZ_SPI3
-void pic32mz_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+void pic32mz_spi3select(FAR struct spi_dev_s *dev, uint32_t devid,
                         bool selected);
-uint8_t pic32mz_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t pic32mz_spi3status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int pic32mz_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int pic32mz_spi3cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
 #ifdef CONFIG_PIC32MZ_SPI4
-void pic32mz_spi4select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+void pic32mz_spi4select(FAR struct spi_dev_s *dev, uint32_t devid,
                         bool selected);
-uint8_t pic32mz_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t pic32mz_spi4status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int pic32mz_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int pic32mz_spi4cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
 #ifdef CONFIG_PIC32MZ_SPI5
-void pic32mz_spi5select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+void pic32mz_spi5select(FAR struct spi_dev_s *dev, uint32_t devid,
                         bool selected);
-uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t pic32mz_spi5status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int pic32mz_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int pic32mz_spi5cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
 #ifdef CONFIG_PIC32MZ_SPI6
-void pic32mz_spi6select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+void pic32mz_spi6select(FAR struct spi_dev_s *dev, uint32_t devid,
                         bool selected);
-uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t pic32mz_spi6status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int pic32mz_spi6cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int pic32mz_spi6cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c
index ad367890697..46b96e22019 100644
--- a/arch/sim/src/up_spiflash.c
+++ b/arch/sim/src/up_spiflash.c
@@ -200,11 +200,11 @@ static void        spiflash_setbits(FAR struct spi_dev_s *dev, int nbits);
 static uint16_t    spiflash_send(FAR struct spi_dev_s *dev, uint16_t wd);
 static void        spiflash_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
                                 FAR void *rxbuffer, size_t nwords);
-static void        spiflash_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+static void        spiflash_select(FAR struct spi_dev_s *dev, uint32_t devid,
                      bool selected);
-static uint8_t     spiflash_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+static uint8_t     spiflash_status(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-static int         spiflash_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+static int         spiflash_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #ifndef CONFIG_SPI_EXCHANGE
 static void        spiflash_sndblock(FAR struct spi_dev_s *dev, FAR const void *txbuffer,
@@ -357,7 +357,7 @@ static int spiflash_lock(FAR struct spi_dev_s *dev, bool lock)
  *
  ************************************************************************************/
 
-static void spiflash_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
+static void spiflash_select(FAR struct spi_dev_s *dev, uint32_t devid,
                             bool selected)
 {
   FAR struct sim_spiflashdev_s *priv = (FAR struct sim_spiflashdev_s *)dev;
@@ -392,7 +392,7 @@ static void spiflash_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
  ************************************************************************************/
 
 #ifdef CONFIG_SPI_CMDDATA
-static int spiflash_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+static int spiflash_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd)
 {
   return 0;
 }
@@ -467,7 +467,7 @@ static void spiflash_setbits(FAR struct spi_dev_s *dev, int nbits)
  *
  ************************************************************************************/
 
-static uint8_t spiflash_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+static uint8_t spiflash_status(FAR struct spi_dev_s *dev, uint32_t devid)
 {
   return 0;
 }
diff --git a/arch/x86/src/qemu/qemu.h b/arch/x86/src/qemu/qemu.h
index a42fd0a3285..6eada26a057 100644
--- a/arch/x86/src/qemu/qemu.h
+++ b/arch/x86/src/qemu/qemu.h
@@ -208,7 +208,7 @@ int i486_dumpgpio(uint16_t pinset, const char *msg);
  ****************************************************************************/
 
 struct spi_dev_s;  /* Forward reference */
-enum spi_dev_e;    /* Forward reference */
+uint32_t;    /* Forward reference */
 
 FAR struct spi_dev_s *i486_spibus_initialize(int port);
 
@@ -242,13 +242,13 @@ FAR struct spi_dev_s *i486_spibus_initialize(int port);
  ************************************************************************************/
 
 struct spi_dev_s;
-enum spi_dev_e;
+uint32_t;
 
 #ifdef CONFIG_I486_SPI
-void  i486_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
-uint8_t i486_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+void  i486_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
+uint8_t i486_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
 #ifdef CONFIG_SPI_CMDDATA
-int i486_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int i486_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
diff --git a/arch/z16/src/z16f/chip.h b/arch/z16/src/z16f/chip.h
index 9d4942f7b94..f54a188a22c 100644
--- a/arch/z16/src/z16f/chip.h
+++ b/arch/z16/src/z16f/chip.h
@@ -677,7 +677,7 @@ void z16f_reset(void);
 #ifdef CONFIG_Z16F_ESPI
 
 struct spi_dev_s;  /* Forward reference */
-enum spi_dev_e;    /* Forward reference */
+uint32_t;    /* Forward reference */
 
 /* Initialize the selected SPI port */
 
@@ -685,16 +685,16 @@ FAR struct spi_dev_s *z16_spibus_initialize(int port);
 
 /* Select an SPI device (see include/nuttx/spi/spi.h) */
 
-void z16f_espi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
+void z16f_espi_select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
 
 /* Provide SPI device status (see include/nuttx/spi/spi.h) */
 
-uint8_t z16f_espi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+uint8_t z16f_espi_status(FAR struct spi_dev_s *dev, uint32_t devid);
 
 /* Select CMD/DATA options (often used with LCD devices) */
 
 #ifdef CONFIG_SPI_CMDDATA
-int z16f_espi_cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+int z16f_espi_cmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 #endif
 #endif
 
diff --git a/arch/z80/src/ez80/ez80f91_spi.h b/arch/z80/src/ez80/ez80f91_spi.h
index 36c0016f485..fe7c34bb7e4 100644
--- a/arch/z80/src/ez80/ez80f91_spi.h
+++ b/arch/z80/src/ez80/ez80f91_spi.h
@@ -145,9 +145,9 @@ FAR struct spi_dev_s *ez80_spibus_initialize(int port);
  *
  ************************************************************************************/
 
-void ez80_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected);
-uint8_t ez80_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
-int ez80_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+void ez80_spiselect(FAR struct spi_dev_s *dev, uint32_t devid, bool selected);
+uint8_t ez80_spistatus(FAR struct spi_dev_s *dev, uint32_t devid);
+int ez80_spicmddata(FAR struct spi_dev_s *dev, uint32_t devid, bool cmd);
 
 #undef EXTERN
 #ifdef __cplusplus