Patchwork [Applied] UBUNTU: [Config] omap3: MFD_OMAP_USB_HOST is usb host in omap2+.

login
register
mail settings
Submitter Leann Ogasawara
Date June 5, 2012, 5:32 p.m.
Message ID <4FCE42C0.50505@canonical.com>
Download mbox | patch
Permalink /patch/163111/
State New
Headers show

Comments

Leann Ogasawara - June 5, 2012, 5:32 p.m.
On 06/05/2012 07:28 AM, Paolo Pisati wrote:
> Wit MFD_OMAP_USB_HOST being unset, no devices attach to the usb bus, and thus
> no network, no keyboard/mouse, etcetc.
>
> With MFD_OMAP_USB_HOST unset:
>
> flag@flag-desktop:~$ ls -la /sys/bus/usb/devices/
> total 0
> drwxr-xr-x 2 root root 0 Jun  5 16:19 .
> drwxr-xr-x 4 root root 0 Jun  5 16:19 ..
>
> With MFD_OMAP_USB_HOST set:
>
> flag@flag-desktop:~$ ls -la /sys/bus/usb/devices/
> total 0
> drwxr-xr-x 2 root root 0 Jun  4 23:36 .
> drwxr-xr-x 4 root root 0 Jun  4 23:36 ..
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-0:1.0 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-0:1.0
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.1 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.1
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2:1.0 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2:1.0
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.1:1.0 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.1/1-2.1:1.0
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.3 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.3
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.3:1.0 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.3/1-2.3:1.0
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.4 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.4
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.4.1 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.4/1-2.4.1
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.4:1.0 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.4/1-2.4:1.0
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.4.1:1.0 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.4/1-2.4.1/1-2.4.1:1.0
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.4.1:1.1 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.4/1-2.4.1/1-2.4.1:1.1
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.4.2 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.4/1-2.4.2
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 1-2.4.2:1.0 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1/1-2/1-2.4/1-2.4.2/1-2.4.2:1.0
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 2-0:1.0 -> ../../../devices/platform/usbhs_omap/ohci-omap3.0/usb2/2-0:1.0
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 usb1 -> ../../../devices/platform/usbhs_omap/ehci-omap.0/usb1
> lrwxrwxrwx 1 root root 0 Jun  4 23:36 usb2 -> ../../../devices/platform/usbhs_omap/ohci-omap3.0/usb2
>
> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
> ---
>  debian.master/config/amd64/config.common.amd64     |    1 +
>  debian.master/config/armel/config.common.armel     |    1 +
>  debian.master/config/armhf/config.flavour.highbank |    1 +
>  debian.master/config/armhf/config.flavour.omap     |    1 +
>  debian.master/config/config.common.ubuntu          |    1 -
>  debian.master/config/i386/config.common.i386       |    1 +
>  debian.master/config/powerpc/config.common.powerpc |    1 +
>  debian.master/config/ppc64/config.common.ppc64     |    1 +
>  8 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 7cfba45..783fa96 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -142,6 +142,7 @@ CONFIG_MFD_AAT2870_CORE=y
>  CONFIG_MFD_MAX8925=y
>  CONFIG_MFD_MAX8997=y
>  CONFIG_MFD_MAX8998=y
> +# CONFIG_MFD_OMAP_USB_HOST is not set
>  CONFIG_MFD_STMPE=y
>  CONFIG_MFD_TC3589X=y
>  # CONFIG_MFD_TMIO is not set
> diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
> index 92f0837..783c3c7 100644
> --- a/debian.master/config/armel/config.common.armel
> +++ b/debian.master/config/armel/config.common.armel
> @@ -143,6 +143,7 @@ CONFIG_MFD_ASIC3=y
>  CONFIG_MFD_MAX8925=y
>  CONFIG_MFD_MAX8997=y
>  CONFIG_MFD_MAX8998=y
> +CONFIG_MFD_OMAP_USB_HOST=y
>  CONFIG_MFD_STMPE=y
>  CONFIG_MFD_T7L66XB=y
>  CONFIG_MFD_TC3589X=y
> diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
> index c8b7046..ae87f15 100644
> --- a/debian.master/config/armhf/config.flavour.highbank
> +++ b/debian.master/config/armhf/config.flavour.highbank
> @@ -93,6 +93,7 @@ CONFIG_LEGACY_PTY_COUNT=256
>  # CONFIG_MFD_MAX8925 is not set
>  # CONFIG_MFD_MAX8997 is not set
>  # CONFIG_MFD_MAX8998 is not set
> +# CONFIG_MFD_OMAP_USB_HOST is not set
>  # CONFIG_MFD_STMPE is not set
>  # CONFIG_MFD_T7L66XB is not set
>  # CONFIG_MFD_TC3589X is not set
> diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
> index b169187..c40586d 100644
> --- a/debian.master/config/armhf/config.flavour.omap
> +++ b/debian.master/config/armhf/config.flavour.omap
> @@ -93,6 +93,7 @@ CONFIG_MFD_ASIC3=y
>  CONFIG_MFD_MAX8925=y
>  CONFIG_MFD_MAX8997=y
>  CONFIG_MFD_MAX8998=y
> +CONFIG_MFD_OMAP_USB_HOST=y
>  CONFIG_MFD_STMPE=y
>  CONFIG_MFD_T7L66XB=y
>  CONFIG_MFD_TC3589X=y
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 6576f5e..3a71de4 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -3151,7 +3151,6 @@ CONFIG_MFD_INTEL_MSIC=y
>  CONFIG_MFD_JANZ_CMODIO=m
>  CONFIG_MFD_MC13783=m
>  CONFIG_MFD_MC13XXX=m
> -# CONFIG_MFD_OMAP_USB_HOST is not set
>  CONFIG_MFD_PCF50633=m
>  CONFIG_MFD_RC5T583=y
>  CONFIG_MFD_RDC321X=m
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index e65267c..68bf912 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -142,6 +142,7 @@ CONFIG_MFD_AAT2870_CORE=y
>  CONFIG_MFD_MAX8925=y
>  CONFIG_MFD_MAX8997=y
>  CONFIG_MFD_MAX8998=y
> +# CONFIG_MFD_OMAP_USB_HOST is not set
>  CONFIG_MFD_STMPE=y
>  CONFIG_MFD_TC3589X=y
>  # CONFIG_MFD_TMIO is not set
> diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
> index 0fed2bd..1e1ea94 100644
> --- a/debian.master/config/powerpc/config.common.powerpc
> +++ b/debian.master/config/powerpc/config.common.powerpc
> @@ -131,6 +131,7 @@ CONFIG_MFD_AAT2870_CORE=y
>  CONFIG_MFD_MAX8925=y
>  CONFIG_MFD_MAX8997=y
>  CONFIG_MFD_MAX8998=y
> +# CONFIG_MFD_OMAP_USB_HOST is not set
>  CONFIG_MFD_STMPE=y
>  CONFIG_MFD_TC3589X=y
>  # CONFIG_MFD_TMIO is not set
> diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
> index 1e477dc..077deb9 100644
> --- a/debian.master/config/ppc64/config.common.ppc64
> +++ b/debian.master/config/ppc64/config.common.ppc64
> @@ -145,6 +145,7 @@ CONFIG_MFD_AAT2870_CORE=y
>  CONFIG_MFD_MAX8925=y
>  CONFIG_MFD_MAX8997=y
>  CONFIG_MFD_MAX8998=y
> +# CONFIG_MFD_OMAP_USB_HOST is not set
>  CONFIG_MFD_STMPE=y
>  CONFIG_MFD_TC3589X=y
>  # CONFIG_MFD_TMIO is not set

I ran updateconfigs after applying to condense and clean this up a bit.  Eg.



Applied to Quantal master.

Thanks,
Leann

Patch

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1da26ae..ea1b5f9 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3152,7 +3152,7 @@  CONFIG_MFD_INTEL_MSIC=y
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_MC13783=m
 CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_OMAP_USB_HOST is not set
+CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_PCF50633=m
 CONFIG_MFD_RC5T583=y
 CONFIG_MFD_RDC321X=m