From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Date: Wed, 22 Jul 2015 11:17:57 +0200 Subject: [U-Boot] [PATCH 06/12] usb: USB_MUSB_SUNXI move to musb-new Kconfig In-Reply-To: <1437554735-11728-6-git-send-email-contact@paulk.fr> References: <1437554735-11728-1-git-send-email-contact@paulk.fr> <1437554735-11728-6-git-send-email-contact@paulk.fr> Message-ID: <55AF5FC5.7020501@redhat.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, On 22-07-15 10:45, Paul Kocialkowski wrote: > Now that the musb-new driver has a Kconfig, we can move Kconfig options to > enable controllers to it, so that it's easier in e.g. menuconfig. > > Signed-off-by: Paul Kocialkowski > --- > board/sunxi/Kconfig | 9 --------- > drivers/usb/musb-new/Kconfig | 14 ++++++++++++++ > 2 files changed, 14 insertions(+), 9 deletions(-) > > diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig > index 2a1cd3c..9c25d49 100644 > --- a/board/sunxi/Kconfig > +++ b/board/sunxi/Kconfig > @@ -532,15 +532,6 @@ config VIDEO_LCD_TL059WV5C0 > endchoice > > > -config USB_MUSB_SUNXI > - bool "Enable sunxi OTG / DRC USB controller in host mode" > - default n > - ---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. > - > config USB_KEYBOARD > boolean "Enable USB keyboard support" > default y > diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb-new/Kconfig > index 34a8474..5be072a 100644 > --- a/drivers/usb/musb-new/Kconfig > +++ b/drivers/usb/musb-new/Kconfig > @@ -12,3 +12,17 @@ config USB_MUSB_GADGET > bool "MUSB gadget mode support" > help > Enables the MUSB USB dual-role controller in gadget mode. > + > +if USB_MUSB_HOST || USB_MUSB_GADGET > + > +config USB_MUSB_SUNXI > + bool "Enable sunxi OTG / DRC USB controller" > + depends on ARCH_SUNXI > + default n > + ---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. > + > +endif > AFAICT this will break MUSB host usage on current sunxi boards, since their defconfig-s contain CONFIG_USB_MUSB_SUNXI=y but not CONFIG_USB_MUSB_HOST=y please update all sunxi defconfigs which have CONFIG_USB_MUSB_SUNXI=y to also set CONFIG_USB_MUSB_HOST=y in this patch to avoid this breakage. Note all earlier patches in this series look good to me and are: Acked-by: Hans de Goede Regards, Hans