diff --git a/include/soc/tegra/bpmp.h b/include/soc/tegra/bpmp.h
index 822851ef4bf8..a33582590a3b 100644
--- a/include/soc/tegra/bpmp.h
+++ b/include/soc/tegra/bpmp.h
@@ -144,7 +144,7 @@ bool tegra_bpmp_mrq_is_supported(struct tegra_bpmp *bpmp, unsigned int mrq);
 #else
 static inline struct tegra_bpmp *tegra_bpmp_get(struct device *dev)
 {
-	return ERR_PTR(-ENOTSUPP);
+	return ERR_PTR(-ENODEV);
 }
 
 static inline struct tegra_bpmp *tegra_bpmp_get_with_id(struct device *dev,
@@ -156,16 +156,19 @@ static inline struct tegra_bpmp *tegra_bpmp_get_with_id(struct device *dev,
 static inline void tegra_bpmp_put(struct tegra_bpmp *bpmp)
 {
 }
+
 static inline int tegra_bpmp_transfer_atomic(struct tegra_bpmp *bpmp,
 					     struct tegra_bpmp_message *msg)
 {
-	return -ENOTSUPP;
+	return -ENODEV;
 }
+
 static inline int tegra_bpmp_transfer(struct tegra_bpmp *bpmp,
 				      struct tegra_bpmp_message *msg)
 {
-	return -ENOTSUPP;
+	return -ENODEV;
 }
+
 static inline void tegra_bpmp_mrq_return(struct tegra_bpmp_channel *channel,
 					 int code, const void *data,
 					 size_t size)
@@ -177,8 +180,9 @@ static inline int tegra_bpmp_request_mrq(struct tegra_bpmp *bpmp,
 					 tegra_bpmp_mrq_handler_t handler,
 					 void *data)
 {
-	return -ENOTSUPP;
+	return -ENODEV;
 }
+
 static inline void tegra_bpmp_free_mrq(struct tegra_bpmp *bpmp,
 				       unsigned int mrq, void *data)
 {