From: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> To: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>, Kishon Vijay Abraham I <kishon-l0cyMroinI0@public.gmane.org>, Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Cc: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>, Roman Byshko <rbyshko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Subject: [PATCH 06/15] musb: Fix platform code being unable to override ep access ops Date: Mon, 9 Mar 2015 21:40:19 +0100 [thread overview] Message-ID: <1425933628-9672-7-git-send-email-hdegoede@redhat.com> (raw) In-Reply-To: <1425933628-9672-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> musb-core was setting the ops to the default indexed or flat handlers after checking for platform overrides. Reverse the order of this so that platform overrides actually work. Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> --- drivers/usb/musb/musb_core.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 47c1a0a..374d181 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2019,13 +2019,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) if (musb->ops->quirks) musb->io.quirks = musb->ops->quirks; - /* At least tusb6010 has it's own offsets.. */ - if (musb->ops->ep_offset) - musb->io.ep_offset = musb->ops->ep_offset; - if (musb->ops->ep_select) - musb->io.ep_select = musb->ops->ep_select; - - /* ..and some devices use indexed offset or flat offset */ + /* Set default ep access to indexed offset or flat offset ops */ if (musb->io.quirks & MUSB_INDEXED_EP) { musb->io.ep_offset = musb_indexed_ep_offset; musb->io.ep_select = musb_indexed_ep_select; @@ -2033,6 +2027,11 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) musb->io.ep_offset = musb_flat_ep_offset; musb->io.ep_select = musb_flat_ep_select; } + /* And override them with platform specific ops if specified. */ + if (musb->ops->ep_offset) + musb->io.ep_offset = musb->ops->ep_offset; + if (musb->ops->ep_select) + musb->io.ep_select = musb->ops->ep_select; if (musb->ops->fifo_mode) fifo_mode = musb->ops->fifo_mode; -- 2.3.1
WARNING: multiple messages have this Message-ID (diff)
From: hdegoede@redhat.com (Hans de Goede) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/15] musb: Fix platform code being unable to override ep access ops Date: Mon, 9 Mar 2015 21:40:19 +0100 [thread overview] Message-ID: <1425933628-9672-7-git-send-email-hdegoede@redhat.com> (raw) In-Reply-To: <1425933628-9672-1-git-send-email-hdegoede@redhat.com> musb-core was setting the ops to the default indexed or flat handlers after checking for platform overrides. Reverse the order of this so that platform overrides actually work. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/usb/musb/musb_core.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 47c1a0a..374d181 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2019,13 +2019,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) if (musb->ops->quirks) musb->io.quirks = musb->ops->quirks; - /* At least tusb6010 has it's own offsets.. */ - if (musb->ops->ep_offset) - musb->io.ep_offset = musb->ops->ep_offset; - if (musb->ops->ep_select) - musb->io.ep_select = musb->ops->ep_select; - - /* ..and some devices use indexed offset or flat offset */ + /* Set default ep access to indexed offset or flat offset ops */ if (musb->io.quirks & MUSB_INDEXED_EP) { musb->io.ep_offset = musb_indexed_ep_offset; musb->io.ep_select = musb_indexed_ep_select; @@ -2033,6 +2027,11 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) musb->io.ep_offset = musb_flat_ep_offset; musb->io.ep_select = musb_flat_ep_select; } + /* And override them with platform specific ops if specified. */ + if (musb->ops->ep_offset) + musb->io.ep_offset = musb->ops->ep_offset; + if (musb->ops->ep_select) + musb->io.ep_select = musb->ops->ep_select; if (musb->ops->fifo_mode) fifo_mode = musb->ops->fifo_mode; -- 2.3.1
next prev parent reply other threads:[~2015-03-09 20:40 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-09 20:40 [PATCH 00/15] musb: Add support for the Allwinner sunxi musb controller Hans de Goede 2015-03-09 20:40 ` Hans de Goede [not found] ` <1425933628-9672-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-09 20:40 ` [PATCH 01/15] ARM: sunxi: Add register bit definitions for SRAM mapping syscon Hans de Goede 2015-03-09 20:40 ` Hans de Goede 2015-03-09 20:40 ` [PATCH 02/15] phy-sun4i-usb: Add a helper function to update the iscr register Hans de Goede 2015-03-09 20:40 ` Hans de Goede [not found] ` <1425933628-9672-3-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-09 21:47 ` Arnd Bergmann 2015-03-09 21:47 ` Arnd Bergmann 2015-03-10 8:04 ` Hans de Goede 2015-03-10 8:04 ` Hans de Goede [not found] ` <54FEA59B.7020400-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-10 8:57 ` Arnd Bergmann 2015-03-10 8:57 ` Arnd Bergmann 2015-03-10 10:13 ` Hans de Goede 2015-03-10 10:13 ` Hans de Goede [not found] ` <54FEC3DD.10108-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-10 10:53 ` Kishon Vijay Abraham I 2015-03-10 10:53 ` Kishon Vijay Abraham I [not found] ` <54FECD30.6080106-l0cyMroinI0@public.gmane.org> 2015-03-10 11:03 ` Hans de Goede 2015-03-10 11:03 ` Hans de Goede [not found] ` <54FECF9F.7020606-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-11 9:13 ` Kishon Vijay Abraham I 2015-03-11 9:13 ` Kishon Vijay Abraham I [not found] ` <55000749.9040606-l0cyMroinI0@public.gmane.org> 2015-03-11 11:39 ` Hans de Goede 2015-03-11 11:39 ` Hans de Goede [not found] ` <55002970.8090206-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-11 12:50 ` Kishon Vijay Abraham I 2015-03-11 12:50 ` Kishon Vijay Abraham I [not found] ` <55003A15.2070900-l0cyMroinI0@public.gmane.org> 2015-03-11 13:03 ` Hans de Goede 2015-03-11 13:03 ` Hans de Goede [not found] ` <55003D2B.60502-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-11 13:07 ` Kishon Vijay Abraham I 2015-03-11 13:07 ` Kishon Vijay Abraham I [not found] ` <55003E0D.9040509-l0cyMroinI0@public.gmane.org> 2015-03-11 14:44 ` Hans de Goede 2015-03-11 14:44 ` Hans de Goede 2015-03-09 20:40 ` [PATCH 03/15] musb: Make musb_write_rxfun* and musb_write_rxhub* work like their tx versions Hans de Goede 2015-03-09 20:40 ` Hans de Goede 2015-03-09 20:40 ` [PATCH 04/15] musb: Make busctl_offset an io-op rather then a define Hans de Goede 2015-03-09 20:40 ` Hans de Goede 2015-03-09 20:40 ` [PATCH 05/15] musb: Do not use musb_read[b|w] / _write[b|w] wrappers in generic fifo functions Hans de Goede 2015-03-09 20:40 ` Hans de Goede [not found] ` <1425933628-9672-6-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-09 21:50 ` Arnd Bergmann 2015-03-09 21:50 ` Arnd Bergmann 2015-03-10 7:43 ` Hans de Goede 2015-03-10 7:43 ` Hans de Goede [not found] ` <54FEA09A.6040401-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-10 8:50 ` Arnd Bergmann 2015-03-10 8:50 ` Arnd Bergmann 2015-03-10 8:56 ` Hans de Goede 2015-03-10 8:56 ` Hans de Goede [not found] ` <54FEB1D4.3080700-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-10 13:43 ` Arnd Bergmann 2015-03-10 13:43 ` Arnd Bergmann 2015-03-09 20:40 ` Hans de Goede [this message] 2015-03-09 20:40 ` [PATCH 06/15] musb: Fix platform code being unable to override ep access ops Hans de Goede 2015-03-09 20:40 ` [PATCH 07/15] musb: Add support for the Allwinner sunxi musb controller Hans de Goede 2015-03-09 20:40 ` Hans de Goede 2015-03-09 20:40 ` [PATCH 08/15] ARM: dts: sunxi: Add syscon node for controlling SRAM mapping Hans de Goede 2015-03-09 20:40 ` Hans de Goede 2015-03-09 20:40 ` [PATCH 09/15] ARM: dts: sun4i: Add USB Dual Role Controller Hans de Goede 2015-03-09 20:40 ` Hans de Goede [not found] ` <1425933628-9672-10-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-09 23:31 ` Julian Calaby 2015-03-09 23:31 ` [linux-sunxi] " Julian Calaby [not found] ` <CAGRGNgVsf05rtLC2+yOPrbrPV-ceQzPC=ZX1zX+hfNxdC7OX-A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-03-10 9:10 ` Hans de Goede 2015-03-10 9:10 ` [linux-sunxi] " Hans de Goede 2015-03-09 20:40 ` [PATCH 10/15] ARM: dts: sun5i: " Hans de Goede 2015-03-09 20:40 ` Hans de Goede 2015-03-09 20:40 ` [PATCH 11/15] ARM: dts: sun7i: " Hans de Goede 2015-03-09 20:40 ` Hans de Goede 2015-03-09 20:40 ` [PATCH 12/15] ARM: dts: sun4i: Enable USB DRC on Chuwi V7 CW0825 Hans de Goede 2015-03-09 20:40 ` Hans de Goede [not found] ` <1425933628-9672-13-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-10 15:07 ` Maxime Ripard 2015-03-10 15:07 ` Maxime Ripard 2015-03-10 15:23 ` Hans de Goede 2015-03-10 15:23 ` Hans de Goede [not found] ` <54FF0C5D.3090706-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-03-10 18:17 ` Maxime Ripard 2015-03-10 18:17 ` Maxime Ripard 2015-03-09 20:40 ` [PATCH 13/15] ARM: dts: sun5i: Enable USB DRC on UTOO P66 Hans de Goede 2015-03-09 20:40 ` Hans de Goede 2015-03-09 20:40 ` [PATCH 14/15] ARM: dts: sun7i: Enable USB DRC on Cubietruck Hans de Goede 2015-03-09 20:40 ` Hans de Goede 2015-03-09 20:40 ` [PATCH 15/15] ARM: dts: sun7i: Enable USB DRC on A20-OLinuxIno-Lime Hans de Goede 2015-03-09 20:40 ` Hans de Goede 2015-03-09 21:44 ` [PATCH 00/15] musb: Add support for the Allwinner sunxi musb controller Arnd Bergmann 2015-03-09 21:44 ` Arnd Bergmann 2015-03-10 1:46 ` Chen-Yu Tsai 2015-03-10 1:46 ` Chen-Yu Tsai [not found] ` <CAGb2v67GkL9Mdr98Chf6MhMff7CO8OGgfF2kaB3Xcnz=SkMG3w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2015-03-10 7:38 ` Hans de Goede 2015-03-10 7:38 ` Hans de Goede 2015-03-10 8:31 ` Arnd Bergmann 2015-03-10 8:31 ` Arnd Bergmann 2015-03-10 17:41 ` Maxime Ripard 2015-03-10 17:41 ` Maxime Ripard 2015-03-10 22:35 ` Hans de Goede 2015-03-10 22:35 ` Hans de Goede
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1425933628-9672-7-git-send-email-hdegoede@redhat.com \ --to=hdegoede-h+wxahxf7alqt0dzr+alfa@public.gmane.org \ --cc=balbi-l0cyMroinI0@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=kishon-l0cyMroinI0@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \ --cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=rbyshko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=wens-jdAy2FN1RRM@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.