Skip to contentSkip to conversation

sunxi: mmc: Always declare High Capacity capability

PATCH New Hans de Goede 3 participants 7 messages Feb 19, 2015 – Feb 24, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 sunxi: mmc: Always declare High Capacity capability

High Capacity (e)MMC cards work fine on sun4i / sun5i, and not having this capability set causes u-boot to not recognize the eMMC on an Utoo P66 A13 tablet, so always set it thereby fixing this.

---
 drivers/mmc/sunxi_mmc.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/mmc/sunxi_mmc.c +1 -5
index ebfec7c..2233545 100644
@@ -449,11 +449,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)
 
 	cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
 	cfg->host_caps = MMC_MODE_4BIT;
-	cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
-#if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
-    defined(CONFIG_MACH_SUN8I) || defined(CONFIG_MACH_SUN9I)
-	cfg->host_caps |= MMC_MODE_HC;
-#endif
+	cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_HC;
 	cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
 
 	cfg->f_min = 400000;
Signature · 1 line
2.1.0
#1 lore raw

PATCH 2/2 sunxi: Add support for the UTOO P66 tablet

The UTOO P66 is a 6" A13 tablet / lcd ereader. It features a 6" 480x800 ips lcd screen, 512MB RAM & 4GB emmc.

---
 configs/UTOO_P66_defconfig | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 configs/UTOO_P66_defconfig
configs/UTOO_P66_defconfig new file +21 -0
new file mode 100644
index 0000000..919a467
@@ -0,0 +1,21 @@
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
+CONFIG_FDTFILE="sun5i-a13-utoo-p66.dtb"
+CONFIG_USB_MUSB_SUNXI=y
+CONFIG_USB0_VBUS_PIN="PB04"
+CONFIG_USB0_VBUS_DET="PG01"
+CONFIG_VIDEO_LCD_MODE="x:480,y:800,depth:18,pclk_khz:25000,le:2,ri:93,up:2,lo:93,hs:1,vs:1,sync:3,vmode:0"
+CONFIG_VIDEO_LCD_DCLK_PHASE=0
+CONFIG_VIDEO_LCD_POWER="PG4"
+CONFIG_VIDEO_LCD_RESET="PG11"
+CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
+CONFIG_VIDEO_LCD_BL_PWM="PB2"
+CONFIG_VIDEO_LCD_TL059WV5C0=y
++S:CONFIG_MMC_SUNXI_SLOT_EXTRA=2
++S:CONFIG_MMC0_CD_PIN="PG0"
++S:CONFIG_ARM=y
++S:CONFIG_ARCH_SUNXI=y
++S:CONFIG_MACH_SUN5I=y
++S:CONFIG_DRAM_CLK=432
++S:CONFIG_DRAM_ZQ=123
++S:CONFIG_DRAM_EMR1=0
Signature · 1 line
2.1.0
#4 lore raw

PATCH 1/2 sunxi: mmc: Always declare High Capacity capability

In reply to Hans de Goede

Hi Hans,

Quoted 30 lines · Hans de Goede

High Capacity (e)MMC cards work fine on sun4i / sun5i, and not having this capability set causes u-boot to not recognize the eMMC on an Utoo P66 A13 tablet, so always set it thereby fixing this.

---
drivers/mmc/sunxi_mmc.c | 6 +-----

1 file changed, 1 insertion(+), 5 deletions(-)
drivers/mmc/sunxi_mmc.c +1 -5
index ebfec7c..2233545 100644
@@ -449,11 +449,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)
 
 	cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
 	cfg->host_caps = MMC_MODE_4BIT;
-	cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
-#if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
-    defined(CONFIG_MACH_SUN8I) || defined(CONFIG_MACH_SUN9I)
-	cfg->host_caps |= MMC_MODE_HC;
-#endif
+	cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_HC;
 	cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
 
 	cfg->f_min = 400000;
Signature · 1 line
2.1.0

Thanks, applied.

? Pantelis

#5 lore raw

PATCH 1/2 sunxi: mmc: Always declare High Capacity capability

Hi,

Quoted 29 lines · Pantelis Antoniou

Hi Hans,

Quoted 27 lines · Hans de Goede

High Capacity (e)MMC cards work fine on sun4i / sun5i, and not having this capability set causes u-boot to not recognize the eMMC on an Utoo P66 A13 tablet, so always set it thereby fixing this.

---
drivers/mmc/sunxi_mmc.c | 6 +-----

1 file changed, 1 insertion(+), 5 deletions(-)
drivers/mmc/sunxi_mmc.c +1 -5
index ebfec7c..2233545 100644
@@ -449,11 +449,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)
 
 	cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
 	cfg->host_caps = MMC_MODE_4BIT;
-	cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
-#if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
-    defined(CONFIG_MACH_SUN8I) || defined(CONFIG_MACH_SUN9I)
-	cfg->host_caps |= MMC_MODE_HC;
-#endif
+	cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_HC;
 	cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
 
Quoted 5 lines
Quoted 3 lines
drivers/mmc/sunxi_mmc.c +0 -1
 	cfg->f_min = 400000;
--

2.1.0

Thanks, applied.

Thanks, but since this was touching only sunxi code this has already been merged through the sunxi tree, if you rebase on the latest master this should drop from your tree.

Regards,

Hans

#6 lore raw

PATCH 1/2 sunxi: mmc: Always declare High Capacity capability

Hi,

Quoted 38 lines · Hans de Goede

Hi,

Quoted 29 lines · Pantelis Antoniou

Hi Hans,

Quoted 27 lines · Hans de Goede

High Capacity (e)MMC cards work fine on sun4i / sun5i, and not having this capability set causes u-boot to not recognize the eMMC on an Utoo P66 A13 tablet, so always set it thereby fixing this.

---
drivers/mmc/sunxi_mmc.c | 6 +-----

1 file changed, 1 insertion(+), 5 deletions(-)
drivers/mmc/sunxi_mmc.c +1 -5
index ebfec7c..2233545 100644
@@ -449,11 +449,7 @@ struct mmc *sunxi_mmc_init(int sdc_no)
 
    cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34;
    cfg->host_caps = MMC_MODE_4BIT;
-    cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
-#if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
-    defined(CONFIG_MACH_SUN8I) || defined(CONFIG_MACH_SUN9I)
-    cfg->host_caps |= MMC_MODE_HC;
-#endif
+    cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_HC;
    cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
 
Quoted 5 lines
Quoted 3 lines
drivers/mmc/sunxi_mmc.c +0 -1
    cfg->f_min = 400000;
--

2.1.0

Thanks, applied.

Quoted 3 lines

Thanks, but since this was touching only sunxi code this has already been merged through the sunxi tree, if you rebase on the latest master this should drop from your tree.

Ah I see that Tom has already pulled from your tree too, so now the patch is upstream through both pulls, which git handles without problems, so we're good here.

Regards,

Hans