Index: sys/dev/bhnd/bhnd.h
===================================================================
--- sys/dev/bhnd/bhnd.h
+++ sys/dev/bhnd/bhnd.h
@@ -257,12 +257,18 @@
 	uint32_t			 device_flags;		/**< required BHND_DF_* flags */
 };
 
-#define	_BHND_DEVICE(_device, _desc, _quirks, _flags, ...)	\
-	{ BHND_CORE_MATCH(BHND_MFGID_BCM, BHND_COREID_ ## _device, \
+#define	_BHND_DEVICE(_vendor, _device, _desc, _quirks, _flags, ...)	\
+	{ BHND_CORE_MATCH(BHND_MFGID_ ## _vendor, BHND_COREID_ ## _device, \
 	    BHND_HWREV_ANY), _desc, _quirks, _flags }
 
+#define MIPS_DEVICE(_device, _desc, _quirks, ...)	\
+	_BHND_DEVICE(MIPS, _device, _desc, _quirks, ## __VA_ARGS__, 0)
+
+#define	ARM_DEVICE(_device, _desc, _quirks, ...)	\
+	_BHND_DEVICE(ARM, _device, _desc, _quirks, ## __VA_ARGS__, 0)
+
 #define	BHND_DEVICE(_device, _desc, _quirks, ...)	\
-	_BHND_DEVICE(_device, _desc, _quirks, ## __VA_ARGS__, 0)
+	_BHND_DEVICE(BCM, _device, _desc, _quirks, ## __VA_ARGS__, 0)
 
 #define	BHND_DEVICE_END			{ BHND_CORE_MATCH_ANY, NULL, NULL, 0 }