fixed there is no eMMC if user boot from sdcard with jumper

Change-Id: Icebb8574245688c5bd9e49a7c292629c7cc6b0ff Reviewed-on: https://tp-biosrd-v02/gerrit/81136 Reviewed-by: Jamess Huang(黃以民) <[email protected]> Tested-by: Jamess Huang(黃以民) <[email protected]>
TinkerBoard · Oct 20, 2017 · 71ed3e4 · 71ed3e4
1 parent 19d99d8
commit 71ed3e4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
@@ -347,6 +347,7 @@
 		fifo-depth = <0x100>;
 		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
 		reg = <0x0 0xff0f0000 0x0 0x4000>;
+		maskrom_gpio = <&gpio6 7 GPIO_ACTIVE_HIGH>;
 		status = "okay";
 		supports-emmc;
 	};

diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -20,6 +20,12 @@
 #include "dw_mmc.h"
 #include "dw_mmc-pltfm.h"
 
+#include <dt-bindings/gpio/gpio.h>
+#ifdef CONFIG_OF
+#include <linux/of_gpio.h>
+#endif
+
+
 #define RK3288_CLKGEN_DIV       2
 
 struct dw_mci_rockchip_priv_data {
@@ -232,12 +238,26 @@ static int dw_mci_rk3288_parse_dt(struct dw_mci *host)
 
 static int dw_mci_rockchip_init(struct dw_mci *host)
 {
+	struct device_node *np = host->dev->of_node;
+	int gpio;
+	enum of_gpio_flags flags;
+
 	/* It is slot 8 on Rockchip SoCs */
 	host->sdio_id0 = 8;
 
 	/* It needs this quirk on all Rockchip SoCs */
 	host->pdata->quirks |= DW_MCI_QUIRK_BROKEN_DTO;
 
+	gpio = of_get_named_gpio_flags(np, "maskrom_gpio", 0, &flags);
+
+	if (gpio_is_valid(gpio)) {
+		if(!gpio_request(gpio, "maskrom_gpio")) {
+			gpio_direction_output(gpio, (flags==GPIO_ACTIVE_HIGH)?1:0);
+			gpio_free(gpio);
+			mdelay(10);
+			dev_info(host->dev, "set maskrom gpio to enable emmc\n");
+		}
+	}
 	return 0;
 }