[U-Boot] [PATCH 1/2] sunxi: mmc: Always declare High Capacity capability

[U-Boot] [PATCH 1/2] sunxi: mmc: Always declare High Capacity capability

[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.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/mmc/sunxi_mmc.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index ebfec7c..2233545 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -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;
-- 
2.1.0

[U-Boot] [PATCH 2/2] sunxi: Add support for the UTOO P66 tablet

[Hans de Goede]

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

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 configs/UTOO_P66_defconfig | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 configs/UTOO_P66_defconfig

diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig
new file mode 100644
index 0000000..919a467
--- /dev/null
+++ b/configs/UTOO_P66_defconfig
@@ -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
-- 
2.1.0

[U-Boot] [PATCH 1/2] sunxi: mmc: Always declare High Capacity capability

[Ian Campbell]

On Thu, 2015-02-19 at 21:03 +0100, Hans de Goede wrote:
> 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.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Ian Campbell <ijc@hellion.org.uk>

[U-Boot] [PATCH 2/2] sunxi: Add support for the UTOO P66 tablet

[Ian Campbell]

On Thu, 2015-02-19 at 21:03 +0100, Hans de Goede wrote:
> The UTOO P66 is a 6" A13 tablet / lcd ereader. It features a 6" 480x800 ips
> lcd screen, 512MB RAM & 4GB emmc.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Ian Campbell <ijc@hellion.org.uk>

[U-Boot] [PATCH 1/2] sunxi: mmc: Always declare High Capacity capability

[Pantelis Antoniou]

Hi Hans,

> On Feb 19, 2015, at 22:03 , Hans de Goede <hdegoede@redhat.com> wrote:
> 
> 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.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> drivers/mmc/sunxi_mmc.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
> index ebfec7c..2233545 100644
> --- a/drivers/mmc/sunxi_mmc.c
> +++ b/drivers/mmc/sunxi_mmc.c
> @@ -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;
> -- 
> 2.1.0

Thanks, applied.

? Pantelis

[U-Boot] [PATCH 1/2] sunxi: mmc: Always declare High Capacity capability

[Hans de Goede]

Hi,

On 23-02-15 18:45, Pantelis Antoniou wrote:
> Hi Hans,
>
>> On Feb 19, 2015, at 22:03 , Hans de Goede <hdegoede@redhat.com> wrote:
>>
>> 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.
>>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> ---
>> drivers/mmc/sunxi_mmc.c | 6 +-----
>> 1 file changed, 1 insertion(+), 5 deletions(-)
>>
>> diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
>> index ebfec7c..2233545 100644
>> --- a/drivers/mmc/sunxi_mmc.c
>> +++ b/drivers/mmc/sunxi_mmc.c
>> @@ -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;
>> --
>> 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

[U-Boot] [PATCH 1/2] sunxi: mmc: Always declare High Capacity capability

[Hans de Goede]

Hi,

On 24-02-15 10:02, Hans de Goede wrote:
> Hi,
>
> On 23-02-15 18:45, Pantelis Antoniou wrote:
>> Hi Hans,
>>
>>> On Feb 19, 2015, at 22:03 , Hans de Goede <hdegoede@redhat.com> wrote:
>>>
>>> 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.
>>>
>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>> ---
>>> drivers/mmc/sunxi_mmc.c | 6 +-----
>>> 1 file changed, 1 insertion(+), 5 deletions(-)
>>>
>>> diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
>>> index ebfec7c..2233545 100644
>>> --- a/drivers/mmc/sunxi_mmc.c
>>> +++ b/drivers/mmc/sunxi_mmc.c
>>> @@ -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;
>>> --
>>> 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.

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