Merge git://git.denx.de/u-boot-rockchip

Tom Rini
2 parents 71229098a6 3c8fb12b77
Showing 3 changed files Side-by-side Diff
MAINTAINERS
drivers/mmc/rockchip_dw_mmc.c
drivers/mtd/spi/sf-uclass.c
@@ -109,6 +109,12 @@
 F:	arch/arm/cpu/pxa/
 F:	arch/arm/include/asm/arch-pxa/
  
+ARM ROCKCHIP
+M:	Simon Glass <sjg@chromium.org>
+S:	Maintained
+T:	git git://git.denx.de/u-boot-rockchip.git
+F:	arch/arm/mach-rockchip/
+
 ARM SAMSUNG
 M:	Minkyu Kang <mk7.kang@samsung.com>
 S:	Maintained
@@ -52,6 +52,8 @@
  
 	/* use non-removeable as sdcard and emmc as judgement */
 	if (fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "non-removable"))
+		host->dev_index = 0;
+	else
 		host->dev_index = 1;
  
 	return 0;
@@ -55,11 +55,17 @@
 {
 	struct spi_slave *slave;
 	struct udevice *bus;
-	char name[30], *str;
+	char *str;
 	int ret;
  
+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_USE_TINY_PRINTF)
+	str = "spi_flash";
+#else
+	char name[30];
+
 	snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs);
 	str = strdup(name);
+#endif
 	ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode,
 				  "spi_flash_std", str, &bus, &slave);
 	if (ret)
...	...	@@ -109,6 +109,12 @@
109	109	F: arch/arm/cpu/pxa/
110	110	F: arch/arm/include/asm/arch-pxa/
111	111
	112	+ARM ROCKCHIP
	113	+M: Simon Glass <sjg@chromium.org>
	114	+S: Maintained
	115	+T: git git://git.denx.de/u-boot-rockchip.git
	116	+F: arch/arm/mach-rockchip/
	117	+
112	118	ARM SAMSUNG
113	119	M: Minkyu Kang <mk7.kang@samsung.com>
114	120	S: Maintained
...	...	@@ -52,6 +52,8 @@
52	52
53	53	/* use non-removeable as sdcard and emmc as judgement */
54	54	if (fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "non-removable"))
	55	+ host->dev_index = 0;
	56	+ else
55	57	host->dev_index = 1;
56	58
57	59	return 0;
...	...	@@ -55,11 +55,17 @@
55	55	{
56	56	struct spi_slave *slave;
57	57	struct udevice *bus;
58		- char name[30], *str;
	58	+ char *str;
59	59	int ret;
60	60
	61	+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_USE_TINY_PRINTF)
	62	+ str = "spi_flash";
	63	+#else
	64	+ char name[30];
	65	+
61	66	snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs);
62	67	str = strdup(name);
	68	+#endif
63	69	ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode,
64	70	"spi_flash_std", str, &bus, &slave);
65	71	if (ret)