diff --git a/src/drivers/bmi055/bmi055.hpp b/src/drivers/bmi055/bmi055.hpp
index b3c14265ad..a09a673f97 100644
--- a/src/drivers/bmi055/bmi055.hpp
+++ b/src/drivers/bmi055/bmi055.hpp
@@ -309,7 +309,7 @@ protected:
 
 public:
 
-	BMI055(const char *name, const char *devname, int bus, enum spi_dev_e device, enum spi_mode_e mode, uint32_t frequency,
+	BMI055(const char *name, const char *devname, int bus, uint32_t device, enum spi_mode_e mode, uint32_t frequency,
 	       enum Rotation rotation);
 	virtual ~BMI055();
 
@@ -321,7 +321,7 @@ public:
 class BMI055_accel : public BMI055
 {
 public:
-	BMI055_accel(int bus, const char *path_accel, spi_dev_e device, enum Rotation rotation);
+	BMI055_accel(int bus, const char *path_accel, uint32_t device, enum Rotation rotation);
 	virtual ~BMI055_accel();
 
 	virtual int     init();
@@ -484,7 +484,7 @@ private:
 class BMI055_gyro : public BMI055
 {
 public:
-	BMI055_gyro(int bus, const char *path_gyro, spi_dev_e device, enum Rotation rotation);
+	BMI055_gyro(int bus, const char *path_gyro, uint32_t device, enum Rotation rotation);
 	virtual ~BMI055_gyro();
 
 	virtual int     init();
diff --git a/src/drivers/bmi055/bmi055_accel.cpp b/src/drivers/bmi055/bmi055_accel.cpp
index 6b9b88bff8..7b6c086151 100644
--- a/src/drivers/bmi055/bmi055_accel.cpp
+++ b/src/drivers/bmi055/bmi055_accel.cpp
@@ -14,7 +14,7 @@ const uint8_t BMI055_accel::_checked_registers[BMI055_ACCEL_NUM_CHECKED_REGISTER
 
 
 
-BMI055_accel::BMI055_accel(int bus, const char *path_accel, spi_dev_e device, enum Rotation rotation) :
+BMI055_accel::BMI055_accel(int bus, const char *path_accel, uint32_t device, enum Rotation rotation) :
 	BMI055("BMI055_ACCEL", path_accel, bus, device, SPIDEV_MODE3, BMI055_BUS_SPEED, rotation),
 	_accel_reports(nullptr),
 	_accel_scale{},
diff --git a/src/drivers/bmi055/bmi055_gyro.cpp b/src/drivers/bmi055/bmi055_gyro.cpp
index 123cdc9c8a..c6f3605a48 100644
--- a/src/drivers/bmi055/bmi055_gyro.cpp
+++ b/src/drivers/bmi055/bmi055_gyro.cpp
@@ -17,7 +17,7 @@ const uint8_t BMI055_gyro::_checked_registers[BMI055_GYRO_NUM_CHECKED_REGISTERS]
 										   };
 
 
-BMI055_gyro::BMI055_gyro(int bus, const char *path_gyro, spi_dev_e device, enum Rotation rotation) :
+BMI055_gyro::BMI055_gyro(int bus, const char *path_gyro, uint32_t device, enum Rotation rotation) :
 	BMI055("BMI055_GYRO", path_gyro, bus, device, SPIDEV_MODE3, BMI055_BUS_SPEED, rotation),
 	_gyro_reports(nullptr),
 	_gyro_scale{},
diff --git a/src/drivers/bmi055/bmi055_main.cpp b/src/drivers/bmi055/bmi055_main.cpp
index 43547690be..3332749517 100644
--- a/src/drivers/bmi055/bmi055_main.cpp
+++ b/src/drivers/bmi055/bmi055_main.cpp
@@ -62,13 +62,13 @@ start(bool external_bus, enum Rotation rotation, enum sensor_type sensor)
 		/* create the driver */
 		if (external_bus) {
 #if defined(PX4_SPI_BUS_EXT) && defined(PX4_SPIDEV_EXT_BMI)
-			*g_dev_acc_ptr = new BMI055_accel(PX4_SPI_BUS_EXT, path_accel, (spi_dev_e)PX4_SPIDEV_EXT_BMI, rotation);
+			*g_dev_acc_ptr = new BMI055_accel(PX4_SPI_BUS_EXT, path_accel, PX4_SPIDEV_EXT_BMI, rotation);
 #else
 			errx(0, "External SPI not available");
 #endif
 
 		} else {
-			*g_dev_acc_ptr = new BMI055_accel(PX4_SPI_BUS_SENSORS, path_accel, (spi_dev_e)PX4_SPIDEV_BMI055_ACC, rotation);
+			*g_dev_acc_ptr = new BMI055_accel(PX4_SPI_BUS_SENSORS, path_accel, PX4_SPIDEV_BMI055_ACC, rotation);
 		}
 
 		if (*g_dev_acc_ptr == nullptr) {
@@ -102,13 +102,13 @@ start(bool external_bus, enum Rotation rotation, enum sensor_type sensor)
 		/* create the driver */
 		if (external_bus) {
 #if defined(PX4_SPI_BUS_EXT) && defined(PX4_SPIDEV_EXT_BMI)
-			*g_dev_ptr = new BMI055_gyro(PX4_SPI_BUS_EXT, path_gyro, (spi_dev_e)PX4_SPIDEV_EXT_BMI, rotation);
+			*g_dev_ptr = new BMI055_gyro(PX4_SPI_BUS_EXT, path_gyro, PX4_SPIDEV_EXT_BMI, rotation);
 #else
 			errx(0, "External SPI not available");
 #endif
 
 		} else {
-			*g_dev_gyr_ptr = new BMI055_gyro(PX4_SPI_BUS_SENSORS, path_gyro, (spi_dev_e)PX4_SPIDEV_BMI055_GYR, rotation);
+			*g_dev_gyr_ptr = new BMI055_gyro(PX4_SPI_BUS_SENSORS, path_gyro, PX4_SPIDEV_BMI055_GYR, rotation);
 		}
 
 		if (*g_dev_gyr_ptr == nullptr) {
@@ -452,7 +452,7 @@ usage()
 }//namespace ends
 
 
-BMI055::BMI055(const char *name, const char *devname, int bus, enum spi_dev_e device, enum spi_mode_e mode,
+BMI055::BMI055(const char *name, const char *devname, int bus, uint32_t device, enum spi_mode_e mode,
 	       uint32_t frequency, enum Rotation rotation):
 	SPI(name, devname, bus, device, mode, frequency),
 	_whoami(0),