diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c
index b2feba8cee14..b43b5432d7a6 100644
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -1024,7 +1024,7 @@ static void gb_audio_disconnect(struct gb_bundle *bundle)
 }
 
 static const struct greybus_bundle_id gb_audio_id_table[] = {
-	{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_AUDIO_MGMT) },
+	{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_AUDIO) },
 	{ }
 };
 MODULE_DEVICE_TABLE(greybus, gb_audio_id_table);
diff --git a/drivers/staging/greybus/greybus_manifest.h b/drivers/staging/greybus/greybus_manifest.h
index 32602b1951b8..76649a649554 100644
--- a/drivers/staging/greybus/greybus_manifest.h
+++ b/drivers/staging/greybus/greybus_manifest.h
@@ -69,8 +69,8 @@ enum greybus_class_type {
 	GREYBUS_CLASS_LIGHTS		= 0x0f,
 	GREYBUS_CLASS_VIBRATOR		= 0x10,
 	GREYBUS_CLASS_LOOPBACK		= 0x11,
-	GREYBUS_CLASS_AUDIO_MGMT	= 0x12,
-	GREYBUS_CLASS_AUDIO_DATA	= 0x13,
+	GREYBUS_CLASS_AUDIO		= 0x12,
+	/* 0x13 is unused */
 	GREYBUS_CLASS_SVC		= 0x14,
 	GREYBUS_CLASS_FIRMWARE		= 0x15,
 		/* ... */