diff --git a/[refs] b/[refs]
index 62e30d1c3795..0a4f0a805a0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf9c86efecf9510e62388fd174cf607671c59fa3
+refs/heads/master: bb29785e0d6d150181704be2efcc3141044625e2
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index 19ee901577da..08ff4acd5225 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/drivers/spi/spi.c
@@ -1135,6 +1135,9 @@ int spi_register_master(struct spi_master *master)
 	if (master->num_chipselect == 0)
 		return -EINVAL;
 
+	if ((master->bus_num < 0) && master->dev.of_node)
+		master->bus_num = of_alias_get_id(master->dev.of_node, "spi");
+
 	/* convention:  dynamically assigned bus IDs count down from the max */
 	if (master->bus_num < 0) {
 		/* FIXME switch to an IDR based scheme, something like