[U-Boot] [PATCH 1/3] sunxi: musb: Drop no longer accurate comment in Kconfig help text

[U-Boot] [PATCH 1/3] sunxi: musb: Drop no longer accurate comment in Kconfig help text

[Hans de Goede]

Drop the no longer accurate part of the USB_MUSB_SUNXI Kconfig help text,
since the musb-host code now supports the device-model, ehci and musb in
host mode can both be enabled at the same time without issues.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/usb/musb-new/Kconfig | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb-new/Kconfig
index 0082ff8..6a6cb93 100644
--- a/drivers/usb/musb-new/Kconfig
+++ b/drivers/usb/musb-new/Kconfig
@@ -21,8 +21,6 @@ config USB_MUSB_SUNXI
 	default y
 	---help---
 	Say y here to enable support for the sunxi OTG / DRC USB controller
-	used on almost all sunxi boards. Note currently u-boot can only have
-	one usb host controller enabled at a time, so enabling this on boards
-	which also use the ehci host controller will result in build errors.
+	used on almost all sunxi boards.
 
 endif
-- 
2.4.3

[U-Boot] [PATCH 2/3] sunxi: Drop LCD_MODE from A13-OLinuxIno defconfigs

[Hans de Goede]

With the unified / cleaned up default display output selection changes,
which were done as part of adding composite video out support, our
example LCD_MODE line in the A13-OLinuxIno defconfigs causes the display
code to setup a LCD console by default, rather then a VGA console.

Given that the LCD console is only useful for people who have hooked up
the exact lcd-panel from the config, while most people will not have any
lcd panel connected to these boards, this is not a good default.

Dropping the LCD_MODE line which was intended as an example fixes this,
instead add a link to the LCD_MODE help text pointing to
http://linux-sunxi.org/LCD which contains the removed and other example
modes.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 board/sunxi/Kconfig              | 1 +
 configs/A13-OLinuXinoM_defconfig | 1 -
 configs/A13-OLinuXino_defconfig  | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index fd6668f..55906b5 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -425,6 +425,7 @@ config VIDEO_LCD_MODE
 	LCD panel timing details string, leave empty if there is no LCD panel.
 	This is in drivers/video/videomodes.c: video_get_params() format, e.g.
 	x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:0,vmode:0
+	Also see: http://linux-sunxi.org/LCD
 
 config VIDEO_LCD_DCLK_PHASE
 	int "LCD panel display clock phase"
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index dcaaff9..5852be6 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -7,7 +7,6 @@ CONFIG_USB1_VBUS_PIN="PG11"
 # CONFIG_VIDEO_HDMI is not set
 CONFIG_VIDEO_VGA_VIA_LCD=y
 CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y
-CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_POWER="PB10"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro"
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index eed53d5..a2e7c38 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -8,7 +8,6 @@ CONFIG_AXP_GPIO=y
 # CONFIG_VIDEO_HDMI is not set
 CONFIG_VIDEO_VGA_VIA_LCD=y
 CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH=y
-CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:16,ri:209,up:22,lo:22,hs:30,vs:1,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_POWER="AXP0-0"
 CONFIG_VIDEO_LCD_BL_PWM="PB2"
 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino"
-- 
2.4.3

[U-Boot] [PATCH 2/3] sunxi: Drop LCD_MODE from A13-OLinuxIno defconfigs

[Ian Campbell]

On Sun, 2015-08-16 at 11:39 +0200, Hans de Goede wrote:
> With the unified / cleaned up default display output selection changes,
> which were done as part of adding composite video out support, our
> example LCD_MODE line in the A13-OLinuxIno defconfigs causes the display
> code to setup a LCD console by default, rather then a VGA console.
> 
> Given that the LCD console is only useful for people who have hooked up
> the exact lcd-panel from the config, while most people will not have any
> lcd panel connected to these boards, this is not a good default.
> 
> Dropping the LCD_MODE line which was intended as an example fixes this,
> instead add a link to the LCD_MODE help text pointing to
> http://linux-sunxi.org/LCD which contains the removed and other example
> modes.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

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

[U-Boot] [PATCH 3/3] sunxi: Add CONFIG_MMC0_CD_PIN to various boards

[Hans de Goede]

Add CONFIG_MMC0_CD_PIN to various boards, this stoos the SPL from still
trying to access the sdcard when there is none (e.g. when booting from
nand).

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 configs/A10-OLinuXino-Lime_defconfig | 1 +
 configs/A13-OLinuXinoM_defconfig     | 1 +
 configs/A13-OLinuXino_defconfig      | 1 +
 configs/A20-OLinuXino-Lime_defconfig | 1 +
 configs/Cubieboard_defconfig         | 1 +
 configs/Cubietruck_defconfig         | 1 +
 6 files changed, 6 insertions(+)

diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index 0245bfc..ee219f8 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=480
 CONFIG_DRAM_EMR1=4
+CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_SYS_CLK_FREQ=912000000
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index 5852be6..ccf35c7 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_EMR1=0
+CONFIG_MMC0_CD_PIN="PG0"
 CONFIG_USB1_VBUS_PIN="PG11"
 # CONFIG_VIDEO_HDMI is not set
 CONFIG_VIDEO_VGA_VIA_LCD=y
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index a2e7c38..ef239a98 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN5I=y
 CONFIG_DRAM_CLK=408
 CONFIG_DRAM_EMR1=0
+CONFIG_MMC0_CD_PIN="PG0"
 CONFIG_USB1_VBUS_PIN="PG11"
 CONFIG_AXP_GPIO=y
 # CONFIG_VIDEO_HDMI is not set
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index fb1f240..4a257b3 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=480
+CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index b2f5d09..819fffd 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
 CONFIG_DRAM_CLK=480
+CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index ebd45b3..7a188d3 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=432
+CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_VIDEO_VGA=y
 CONFIG_GMAC_TX_DELAY=1
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
-- 
2.4.3

[U-Boot] [PATCH 3/3] sunxi: Add CONFIG_MMC0_CD_PIN to various boards

[Chen-Yu Tsai]

On Sun, Aug 16, 2015 at 5:39 PM, Hans de Goede <hdegoede@redhat.com> wrote:
> Add CONFIG_MMC0_CD_PIN to various boards, this stoos the SPL from still

                                                 ^^^^^
                                                 stops

> trying to access the sdcard when there is none (e.g. when booting from
> nand).
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  configs/A10-OLinuXino-Lime_defconfig | 1 +
>  configs/A13-OLinuXinoM_defconfig     | 1 +
>  configs/A13-OLinuXino_defconfig      | 1 +
>  configs/A20-OLinuXino-Lime_defconfig | 1 +
>  configs/Cubieboard_defconfig         | 1 +
>  configs/Cubietruck_defconfig         | 1 +
>  6 files changed, 6 insertions(+)
>
> diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
> index 0245bfc..ee219f8 100644
> --- a/configs/A10-OLinuXino-Lime_defconfig
> +++ b/configs/A10-OLinuXino-Lime_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y
>  CONFIG_MACH_SUN4I=y
>  CONFIG_DRAM_CLK=480
>  CONFIG_DRAM_EMR1=4
> +CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_SYS_CLK_FREQ=912000000
>  CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
> index 5852be6..ccf35c7 100644
> --- a/configs/A13-OLinuXinoM_defconfig
> +++ b/configs/A13-OLinuXinoM_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y
>  CONFIG_MACH_SUN5I=y
>  CONFIG_DRAM_CLK=408
>  CONFIG_DRAM_EMR1=0
> +CONFIG_MMC0_CD_PIN="PG0"
>  CONFIG_USB1_VBUS_PIN="PG11"
>  # CONFIG_VIDEO_HDMI is not set
>  CONFIG_VIDEO_VGA_VIA_LCD=y
> diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
> index a2e7c38..ef239a98 100644
> --- a/configs/A13-OLinuXino_defconfig
> +++ b/configs/A13-OLinuXino_defconfig
> @@ -3,6 +3,7 @@ CONFIG_ARCH_SUNXI=y
>  CONFIG_MACH_SUN5I=y
>  CONFIG_DRAM_CLK=408
>  CONFIG_DRAM_EMR1=0
> +CONFIG_MMC0_CD_PIN="PG0"
>  CONFIG_USB1_VBUS_PIN="PG11"
>  CONFIG_AXP_GPIO=y
>  # CONFIG_VIDEO_HDMI is not set
> diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
> index fb1f240..4a257b3 100644
> --- a/configs/A20-OLinuXino-Lime_defconfig
> +++ b/configs/A20-OLinuXino-Lime_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_SUNXI=y
>  CONFIG_MACH_SUN7I=y
>  CONFIG_DRAM_CLK=480
> +CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SPL=y
> diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
> index b2f5d09..819fffd 100644
> --- a/configs/Cubieboard_defconfig
> +++ b/configs/Cubieboard_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_SUNXI=y
>  CONFIG_MACH_SUN4I=y
>  CONFIG_DRAM_CLK=480
> +CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>  CONFIG_SPL=y
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index ebd45b3..7a188d3 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_SUNXI=y
>  CONFIG_MACH_SUN7I=y
>  CONFIG_DRAM_CLK=432
> +CONFIG_MMC0_CD_PIN="PH1"
>  CONFIG_VIDEO_VGA=y
>  CONFIG_GMAC_TX_DELAY=1
>  CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
> --
> 2.4.3
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 3/3] sunxi: Add CONFIG_MMC0_CD_PIN to various boards

[Ian Campbell]

On Sun, 2015-08-16 at 11:39 +0200, Hans de Goede wrote:
> Add CONFIG_MMC0_CD_PIN to various boards, this stoos the SPL from still

                                                 stops

> trying to access the sdcard when there is none (e.g. when booting from
> nand).
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

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

[U-Boot] [PATCH 1/3] sunxi: musb: Drop no longer accurate comment in Kconfig help text

[Ian Campbell]

On Sun, 2015-08-16 at 11:39 +0200, Hans de Goede wrote:
> Drop the no longer accurate part of the USB_MUSB_SUNXI Kconfig help 
> text,
> since the musb-host code now supports the device-model, ehci and musb 
> in
> host mode can both be enabled at the same time without issues.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

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