linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v5 0/6] Add MediaTek MUSB Controller Driver
@ 2019-02-19  7:36 min.guo
  2019-02-19  7:36 ` [PATCH v5 1/6] dt-bindings: usb: musb: Add support for MediaTek musb controller min.guo
                   ` (5 more replies)
  0 siblings, 6 replies; 13+ messages in thread
From: min.guo @ 2019-02-19  7:36 UTC (permalink / raw)
  To: Bin Liu, Rob Herring
  Cc: Greg Kroah-Hartman, Mark Rutland, Matthias Brugger, Alan Stern,
	chunfeng.yun, linux-usb, devicetree, linux-kernel,
	linux-arm-kernel, linux-mediatek, tony, hdegoede, Min Guo

From: Min Guo <min.guo@mediatek.com>

These patches introduce the MediaTek MUSB controller driver.

The driver can be configured as Dual-Role Device (DRD),
Peripheral Only and Host Only modes. This has beed tested on
MT2701 with a variety of devices in host mode and with the 
f_mass gadget driver in peripheral mode, plugging otg cables
in/out a lot of times in all possible imaginable plug orders.

changes in v5:
changes of dt-bindings suggested by Rob:
1. Modify compatible as 
- compatible : should be one of:
               "mediatek,mt-2701"
               ...
               followed by "mediatek,mtk-musb"
2. Add usb connector child node
changes of DTS:
1. Add usb connector child node
changes of driver suggested by Bin:
1. Replace musb_readb() with musb_clearb() to clear dma pending interrupts
2. Replace musb_readb() with musb_clearb() to clear common/tx/rx pending interrupts
3. Make musb_clearb/w() return the value of musb_readb/w()

changes in v4:
changes of dt-bindings suggested by Sergei:
1. String alignment
changes of driver suggested by Tony and Bin:
1. Add a new patch for set/get_toggle()
2. Add a new patch for noirq type of dma
3. Add a new patch musb_clearb/w()
4. Abondon patch "usb: musb: Delete the const attribute of addr parameter in readb/w/l hooks"

changes in v3:
changes of driver suggested by Bin:
1. Add a new patch for musb_readb/w/l() to remove const attribute 
2. Use is_out as function parameter in set_toggle/get_toggle() hooks
3. Remove 'u8/u16 data' parameter in clearb/w() hooks
4. Remove musb_default_clearb/w()
5. Replace musb_readb/w() with musb_clearb/w() to clear pending interrupts 
6. Add comments to clearb/w() hooks
7. Replace musb_save_toggle() with musb->io.get_toggle()
8. Replace musb_set_toggle() with musb->io.set_toggle()

changes in v2:
changes of dt-bindings suggested by Rob and Bin:
1. Modify DRC to DRD
2. Drop the "<soc-model>-musb" in compatible
3. Remove phy-names
4. Add space after comma in clock-names
dtsi:
1. Remove phy-names
changes of driver suggested by Bin:
1. Add a new patch for musb_set_toggle
2. Add summarize of MediaTek musb controller differences in the commit log
3. Abondon patch "usb: musb: Move musbhsdma macro definition to musb_dma.h"
4. Add "|| COMPILE_TEST" in Kconfig
5. Add musb_clearb() and musb_clearw() hooks
6. Add get_toggle() and set_toggle() hooks
7. Replace musb_readl() with musb_readw() to read 16bit toggle register
8. Move MediaTek's private toggle registers from musb_regs.h to mediatek.c
9. Create musbhs_dma_controller_create_noirq()

Min Guo (6):
  dt-bindings: usb: musb: Add support for MediaTek musb controller
  arm: dts: mt2701: Add usb2 device nodes
  usb: musb: Add get/set toggle hooks
  usb: musb: Add noirq type of dma create interface
  usb: musb: Add musb_clearb/w() interface
  usb: musb: Add support for MediaTek musb controller

 .../devicetree/bindings/usb/mediatek,musb.txt      |  54 ++
 arch/arm/boot/dts/mt2701-evb.dts                   |  26 +
 arch/arm/boot/dts/mt2701.dtsi                      |  33 ++
 drivers/usb/musb/Kconfig                           |   8 +-
 drivers/usb/musb/Makefile                          |   1 +
 drivers/usb/musb/mediatek.c                        | 629 +++++++++++++++++++++
 drivers/usb/musb/musb_core.c                       |  74 ++-
 drivers/usb/musb/musb_core.h                       |  13 +-
 drivers/usb/musb/musb_dma.h                        |   9 +
 drivers/usb/musb/musb_host.c                       |  46 +-
 drivers/usb/musb/musb_io.h                         |  12 +-
 drivers/usb/musb/musbhsdma.c                       |  56 +-
 drivers/usb/musb/sunxi.c                           |   4 +-
 drivers/usb/musb/tusb6010.c                        |   2 +-
 14 files changed, 895 insertions(+), 72 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.txt
 create mode 100644 drivers/usb/musb/mediatek.c

-- 
1.9.1


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH v5 1/6] dt-bindings: usb: musb: Add support for MediaTek musb controller
  2019-02-19  7:36 [PATCH v5 0/6] Add MediaTek MUSB Controller Driver min.guo
@ 2019-02-19  7:36 ` min.guo
  2019-02-22 16:49   ` Rob Herring
  2019-02-19  7:36 ` [PATCH v5 2/6] arm: dts: mt2701: Add usb2 device nodes min.guo
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 13+ messages in thread
From: min.guo @ 2019-02-19  7:36 UTC (permalink / raw)
  To: Bin Liu, Rob Herring
  Cc: Greg Kroah-Hartman, Mark Rutland, Matthias Brugger, Alan Stern,
	chunfeng.yun, linux-usb, devicetree, linux-kernel,
	linux-arm-kernel, linux-mediatek, tony, hdegoede, Min Guo

From: Min Guo <min.guo@mediatek.com>

This adds support for MediaTek musb controller in
host, peripheral and otg mode.

Signed-off-by: Min Guo <min.guo@mediatek.com>
---
changes in v5:
suggested by Rob:
1. Modify compatible as 
- compatible : should be one of:
               "mediatek,mt-2701"
               ...
               followed by "mediatek,mtk-musb"
2. Add usb connector child node

changes in v4:
suggested by Sergei:
1. String alignment

changes in v3:
1. no changes

changes in v2:
suggested by Bin:
1. Modify DRC to DRD
suggested by Rob:
2. Drop the "<soc-model>-musb" in compatible
3. Remove phy-names
4. Add space after comma in clock-names
---
 .../devicetree/bindings/usb/mediatek,musb.txt      | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.txt

diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.txt b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
new file mode 100644
index 0000000..0632e6e
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
@@ -0,0 +1,54 @@
+MediaTek musb DRD/OTG controller
+-------------------------------------------
+
+Required properties:
+ - compatible      : should be one of:
+                     "mediatek,mt-2701"
+                     ...
+                     followed by "mediatek,mtk-musb"
+ - reg             : specifies physical base address and size of
+                     the registers
+ - interrupts      : interrupt used by musb controller
+ - interrupt-names : must be "mc"
+ - phys            : PHY specifier for the OTG phy
+ - dr_mode         : should be one of "host", "peripheral" or "otg",
+                     refer to usb/generic.txt
+ - clocks          : a list of phandle + clock-specifier pairs, one for
+                     each entry in clock-names
+ - clock-names     : must contain "main", "mcu", "univpll"
+                     for clocks of controller
+
+Optional properties:
+ - power-domains   : a phandle to USB power domain node to control USB's
+                     MTCMOS
+
+Required child nodes:
+ usb connector node as defined in bindings/connector/usb-connector.txt
+ - extcon          : for VBUS and ID pin changes detection, needed when
+                     supports dual-role mode
+ - vbus-supply     : reference to the VBUS regulator, needed when supports
+                     dual-role mode
+
+Example:
+
+usb2: usb@11200000 {
+	compatible = "mediatek,mt2701-musb",
+		     "mediatek,mtk-musb";
+	reg = <0 0x11200000 0 0x1000>;
+	interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
+	interrupt-names = "mc";
+	phys = <&u2port2 PHY_TYPE_USB2>;
+	dr_mode = "otg";
+	clocks = <&pericfg CLK_PERI_USB0>,
+		 <&pericfg CLK_PERI_USB0_MCU>,
+		 <&pericfg CLK_PERI_USB_SLV>;
+	clock-names = "main","mcu","univpll";
+	power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
+	usb_con: connector{
+		compatible = "usb-b-connector";
+		label = "micro-USB";
+		type = "micro";
+		extcon = <&extcon_usb>;
+		vbus-supply = <&usb_vbus>;
+	};
+};
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v5 2/6] arm: dts: mt2701: Add usb2 device nodes
  2019-02-19  7:36 [PATCH v5 0/6] Add MediaTek MUSB Controller Driver min.guo
  2019-02-19  7:36 ` [PATCH v5 1/6] dt-bindings: usb: musb: Add support for MediaTek musb controller min.guo
@ 2019-02-19  7:36 ` min.guo
  2019-02-19  7:36 ` [PATCH v5 3/6] usb: musb: Add get/set toggle hooks min.guo
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 13+ messages in thread
From: min.guo @ 2019-02-19  7:36 UTC (permalink / raw)
  To: Bin Liu, Rob Herring
  Cc: Greg Kroah-Hartman, Mark Rutland, Matthias Brugger, Alan Stern,
	chunfeng.yun, linux-usb, devicetree, linux-kernel,
	linux-arm-kernel, linux-mediatek, tony, hdegoede, Min Guo

From: Min Guo <min.guo@mediatek.com>

Add musb nodes and usb2 phy nodes for MT2701

Signed-off-by: Min Guo <min.guo@mediatek.com>
---
changes in v5:
1. Add usb connector child node

changes in v4:
1. no changes

changes in v3:
1. no changes

changes in v2:
1. Remove phy-names
---
 arch/arm/boot/dts/mt2701-evb.dts | 26 ++++++++++++++++++++++++++
 arch/arm/boot/dts/mt2701.dtsi    | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/arch/arm/boot/dts/mt2701-evb.dts b/arch/arm/boot/dts/mt2701-evb.dts
index be0edb3..95458ea 100644
--- a/arch/arm/boot/dts/mt2701-evb.dts
+++ b/arch/arm/boot/dts/mt2701-evb.dts
@@ -6,6 +6,7 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
 #include "mt2701.dtsi"
 
 / {
@@ -60,6 +61,20 @@
 		>;
 		default-brightness-level = <9>;
 	};
+
+	extcon_usb: extcon_iddig {
+		compatible = "linux,extcon-usb-gpio";
+		id-gpio = <&pio 44 GPIO_ACTIVE_HIGH>;
+	};
+
+	usb_vbus: regulator@0 {
+		compatible = "regulator-fixed";
+		regulator-name = "usb_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&pio 45 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
 };
 
 &auxadc {
@@ -229,3 +244,14 @@
 &uart0 {
 	status = "okay";
 };
+
+&usb2 {
+	status = "okay";
+	usb_con: connector{
+		compatible = "usb-b-connector";
+		label = "micro-USB";
+		type = "micro";
+		extcon = <&extcon_usb>;
+		vbus-supply = <&usb_vbus>;
+	};
+};
diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi
index 180377e..a6b1434 100644
--- a/arch/arm/boot/dts/mt2701.dtsi
+++ b/arch/arm/boot/dts/mt2701.dtsi
@@ -670,6 +670,39 @@
 		};
 	};
 
+	usb2: usb@11200000 {
+		compatible = "mediatek,mt2701-musb",
+			     "mediatek,mtk-musb";
+		reg = <0 0x11200000 0 0x1000>;
+		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-names = "mc";
+		phys = <&u2port2 PHY_TYPE_USB2>;
+		dr_mode = "otg";
+		clocks = <&pericfg CLK_PERI_USB0>,
+			 <&pericfg CLK_PERI_USB0_MCU>,
+			 <&pericfg CLK_PERI_USB_SLV>;
+		clock-names = "main","mcu","univpll";
+		power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
+		status = "disabled";
+	};
+
+	u2phy0: usb-phy@11210000 {
+		compatible = "mediatek,generic-tphy-v1";
+		reg = <0 0x11210000 0 0x0800>;
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+		status = "okay";
+
+		u2port2: usb-phy@1a1c4800 {
+			reg = <0 0x11210800 0 0x0100>;
+			clocks = <&topckgen CLK_TOP_USB_PHY48M>;
+			clock-names = "ref";
+			#phy-cells = <1>;
+			status = "okay";
+		};
+	};
+
 	ethsys: syscon@1b000000 {
 		compatible = "mediatek,mt2701-ethsys", "syscon";
 		reg = <0 0x1b000000 0 0x1000>;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v5 3/6] usb: musb: Add get/set toggle hooks
  2019-02-19  7:36 [PATCH v5 0/6] Add MediaTek MUSB Controller Driver min.guo
  2019-02-19  7:36 ` [PATCH v5 1/6] dt-bindings: usb: musb: Add support for MediaTek musb controller min.guo
  2019-02-19  7:36 ` [PATCH v5 2/6] arm: dts: mt2701: Add usb2 device nodes min.guo
@ 2019-02-19  7:36 ` min.guo
  2019-02-19  7:36 ` [PATCH v5 4/6] usb: musb: Add noirq type of dma create interface min.guo
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 13+ messages in thread
From: min.guo @ 2019-02-19  7:36 UTC (permalink / raw)
  To: Bin Liu, Rob Herring
  Cc: Greg Kroah-Hartman, Mark Rutland, Matthias Brugger, Alan Stern,
	chunfeng.yun, linux-usb, devicetree, linux-kernel,
	linux-arm-kernel, linux-mediatek, tony, hdegoede, Min Guo

From: Min Guo <min.guo@mediatek.com>

Add get/set toggle hooks in struct musb_io and struct musb_platform_ops
for special platform; remove function musb_save_toggle, use the set/get
callback to handle toggle.

Signed-off-by: Min Guo <min.guo@mediatek.com>
---
changes in v5:
1. no changes

new patch based on v4:
---
 drivers/usb/musb/musb_core.c | 42 ++++++++++++++++++++++++++++++++++++++++
 drivers/usb/musb/musb_core.h |  5 +++++
 drivers/usb/musb/musb_host.c | 46 ++++++++++----------------------------------
 drivers/usb/musb/musb_io.h   |  4 ++++
 4 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index b7d5627..2fe5225 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -274,6 +274,38 @@ static void musb_default_writew(void __iomem *addr, unsigned offset, u16 data)
 	__raw_writew(data, addr + offset);
 }
 
+static u16 musb_default_get_toggle(struct musb_qh *qh, int is_out)
+{
+	void __iomem *epio = qh->hw_ep->regs;
+	u16 csr;
+
+	if (is_out)
+		csr = musb_readw(epio, MUSB_TXCSR) & MUSB_TXCSR_H_DATATOGGLE;
+	else
+		csr = musb_readw(epio, MUSB_RXCSR) & MUSB_RXCSR_H_DATATOGGLE;
+
+	return csr;
+}
+
+static u16 musb_default_set_toggle(struct musb_qh *qh, int is_out,
+				   struct urb *urb)
+{
+	u16 csr;
+	u16 toggle;
+
+	toggle = usb_gettoggle(urb->dev, qh->epnum, is_out);
+
+	if (is_out)
+		csr = toggle ? (MUSB_TXCSR_H_WR_DATATOGGLE
+				| MUSB_TXCSR_H_DATATOGGLE)
+				: MUSB_TXCSR_CLRDATATOG;
+	else
+		csr = toggle ? (MUSB_RXCSR_H_WR_DATATOGGLE
+				| MUSB_RXCSR_H_DATATOGGLE) : 0;
+
+	return csr;
+}
+
 /*
  * Load an endpoint's FIFO
  */
@@ -2277,6 +2309,16 @@ static void musb_deassert_reset(struct work_struct *work)
 	else
 		musb->io.write_fifo = musb_default_write_fifo;
 
+	if (musb->ops->get_toggle)
+		musb->io.get_toggle = musb->ops->get_toggle;
+	else
+		musb->io.get_toggle = musb_default_get_toggle;
+
+	if (musb->ops->set_toggle)
+		musb->io.set_toggle = musb->ops->set_toggle;
+	else
+		musb->io.set_toggle = musb_default_set_toggle;
+
 	if (!musb->xceiv->io_ops) {
 		musb->xceiv->io_dev = musb->controller;
 		musb->xceiv->io_priv = musb->mregs;
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 04203b7..9f5a69c 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -27,6 +27,7 @@
 struct musb;
 struct musb_hw_ep;
 struct musb_ep;
+struct musb_qh;
 
 /* Helper defines for struct musb->hwvers */
 #define MUSB_HWVERS_MAJOR(x)	((x >> 10) & 0x1f)
@@ -123,6 +124,8 @@ enum musb_g_ep0_state {
  * @writew:	write 16 bits
  * @read_fifo:	reads the fifo
  * @write_fifo:	writes to fifo
+ * @get_toggle:	platform specific get toggle function
+ * @set_toggle:	platform specific set toggle function
  * @dma_init:	platform specific dma init function
  * @dma_exit:	platform specific dma exit function
  * @init:	turns on clocks, sets up platform-specific registers, etc
@@ -167,6 +170,8 @@ struct musb_platform_ops {
 	void	(*writew)(void __iomem *addr, unsigned offset, u16 data);
 	void	(*read_fifo)(struct musb_hw_ep *hw_ep, u16 len, u8 *buf);
 	void	(*write_fifo)(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf);
+	u16	(*get_toggle)(struct musb_qh *qh, int is_out);
+	u16	(*set_toggle)(struct musb_qh *qh, int is_out, struct urb *urb);
 	struct dma_controller *
 		(*dma_init) (struct musb *musb, void __iomem *base);
 	void	(*dma_exit)(struct dma_controller *c);
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index b59ce9a..b97fbf9 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -286,26 +286,6 @@ static void musb_giveback(struct musb *musb, struct urb *urb, int status)
 	spin_lock(&musb->lock);
 }
 
-/* For bulk/interrupt endpoints only */
-static inline void musb_save_toggle(struct musb_qh *qh, int is_in,
-				    struct urb *urb)
-{
-	void __iomem		*epio = qh->hw_ep->regs;
-	u16			csr;
-
-	/*
-	 * FIXME: the current Mentor DMA code seems to have
-	 * problems getting toggle correct.
-	 */
-
-	if (is_in)
-		csr = musb_readw(epio, MUSB_RXCSR) & MUSB_RXCSR_H_DATATOGGLE;
-	else
-		csr = musb_readw(epio, MUSB_TXCSR) & MUSB_TXCSR_H_DATATOGGLE;
-
-	usb_settoggle(urb->dev, qh->epnum, !is_in, csr ? 1 : 0);
-}
-
 /*
  * Advance this hardware endpoint's queue, completing the specified URB and
  * advancing to either the next URB queued to that qh, or else invalidating
@@ -320,6 +300,7 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb,
 	struct musb_hw_ep	*ep = qh->hw_ep;
 	int			ready = qh->is_ready;
 	int			status;
+	u16			toggle;
 
 	status = (urb->status == -EINPROGRESS) ? 0 : urb->status;
 
@@ -327,7 +308,8 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb,
 	switch (qh->type) {
 	case USB_ENDPOINT_XFER_BULK:
 	case USB_ENDPOINT_XFER_INT:
-		musb_save_toggle(qh, is_in, urb);
+		toggle = musb->io.get_toggle(qh, !is_in);
+		usb_settoggle(urb->dev, qh->epnum, !is_in, toggle ? 1 : 0);
 		break;
 	case USB_ENDPOINT_XFER_ISOC:
 		if (status == 0 && urb->error_count)
@@ -772,13 +754,8 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
 					);
 			csr |= MUSB_TXCSR_MODE;
 
-			if (!hw_ep->tx_double_buffered) {
-				if (usb_gettoggle(urb->dev, qh->epnum, 1))
-					csr |= MUSB_TXCSR_H_WR_DATATOGGLE
-						| MUSB_TXCSR_H_DATATOGGLE;
-				else
-					csr |= MUSB_TXCSR_CLRDATATOG;
-			}
+			if (!hw_ep->tx_double_buffered)
+				csr |= musb->io.set_toggle(qh, is_out, urb);
 
 			musb_writew(epio, MUSB_TXCSR, csr);
 			/* REVISIT may need to clear FLUSHFIFO ... */
@@ -860,17 +837,12 @@ static void musb_ep_program(struct musb *musb, u8 epnum,
 
 	/* IN/receive */
 	} else {
-		u16	csr;
+		u16 csr = 0;
 
 		if (hw_ep->rx_reinit) {
 			musb_rx_reinit(musb, qh, epnum);
+			csr |= musb->io.set_toggle(qh, is_out, urb);
 
-			/* init new state: toggle and NYET, maybe DMA later */
-			if (usb_gettoggle(urb->dev, qh->epnum, 0))
-				csr = MUSB_RXCSR_H_WR_DATATOGGLE
-					| MUSB_RXCSR_H_DATATOGGLE;
-			else
-				csr = 0;
 			if (qh->type == USB_ENDPOINT_XFER_INT)
 				csr |= MUSB_RXCSR_DISNYET;
 
@@ -933,6 +905,7 @@ static void musb_bulk_nak_timeout(struct musb *musb, struct musb_hw_ep *ep,
 	void __iomem		*epio = ep->regs;
 	struct musb_qh		*cur_qh, *next_qh;
 	u16			rx_csr, tx_csr;
+	u16			toggle;
 
 	musb_ep_select(mbase, ep->epnum);
 	if (is_in) {
@@ -970,7 +943,8 @@ static void musb_bulk_nak_timeout(struct musb *musb, struct musb_hw_ep *ep,
 			urb->actual_length += dma->actual_len;
 			dma->actual_len = 0L;
 		}
-		musb_save_toggle(cur_qh, is_in, urb);
+		toggle = musb->io.get_toggle(cur_qh, !is_in);
+		usb_settoggle(urb->dev, cur_qh->epnum, !is_in, toggle ? 1 : 0);
 
 		if (is_in) {
 			/* move cur_qh to end of queue */
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 8058a58..8179334 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -22,6 +22,8 @@
  * @read_fifo:	platform specific function to read fifo
  * @write_fifo:	platform specific function to write fifo
  * @busctl_offset: platform specific function to get busctl offset
+ * @get_toggle: platform specific function to get toggle
+ * @set_toggle: platform specific function to set toggle
  */
 struct musb_io {
 	u32	(*ep_offset)(u8 epnum, u16 offset);
@@ -30,6 +32,8 @@ struct musb_io {
 	void	(*read_fifo)(struct musb_hw_ep *hw_ep, u16 len, u8 *buf);
 	void	(*write_fifo)(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf);
 	u32	(*busctl_offset)(u8 epnum, u16 offset);
+	u16	(*get_toggle)(struct musb_qh *qh, int is_out);
+	u16	(*set_toggle)(struct musb_qh *qh, int is_out, struct urb *urb);
 };
 
 /* Do not add new entries here, add them the struct musb_io instead */
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v5 4/6] usb: musb: Add noirq type of dma create interface
  2019-02-19  7:36 [PATCH v5 0/6] Add MediaTek MUSB Controller Driver min.guo
                   ` (2 preceding siblings ...)
  2019-02-19  7:36 ` [PATCH v5 3/6] usb: musb: Add get/set toggle hooks min.guo
@ 2019-02-19  7:36 ` min.guo
  2019-02-19  7:36 ` [PATCH v5 5/6] usb: musb: Add musb_clearb/w() interface min.guo
  2019-02-19  7:36 ` [PATCH v5 6/6] usb: musb: Add support for MediaTek musb controller min.guo
  5 siblings, 0 replies; 13+ messages in thread
From: min.guo @ 2019-02-19  7:36 UTC (permalink / raw)
  To: Bin Liu, Rob Herring
  Cc: Greg Kroah-Hartman, Mark Rutland, Matthias Brugger, Alan Stern,
	chunfeng.yun, linux-usb, devicetree, linux-kernel,
	linux-arm-kernel, linux-mediatek, tony, hdegoede, Min Guo

From: Min Guo <min.guo@mediatek.com>

Add noirq type of dma create interface for platform which do not
have dedicated DMA interrupt line, move musbhsdma macro definition
to musb_dma.h

Signed-off-by: Min Guo <min.guo@mediatek.com>
---
changes in v5:
1. no changes

new patch based on v4:
---
 drivers/usb/musb/musb_dma.h  |  9 ++++++++
 drivers/usb/musb/musbhsdma.c | 54 ++++++++++++++++++++++++++++++--------------
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h
index 8f60271..05103ea 100644
--- a/drivers/usb/musb/musb_dma.h
+++ b/drivers/usb/musb/musb_dma.h
@@ -35,6 +35,12 @@
  *    whether shared with the Inventra core or separate.
  */
 
+#define MUSB_HSDMA_BASE		0x200
+#define MUSB_HSDMA_INTR		(MUSB_HSDMA_BASE + 0)
+#define MUSB_HSDMA_CONTROL		0x4
+#define MUSB_HSDMA_ADDRESS		0x8
+#define MUSB_HSDMA_COUNT		0xc
+
 #define	DMA_ADDR_INVALID	(~(dma_addr_t)0)
 
 #ifdef CONFIG_MUSB_PIO_ONLY
@@ -191,6 +197,9 @@ static inline void musb_dma_controller_destroy(struct dma_controller *d) { }
 extern struct dma_controller *
 musbhs_dma_controller_create(struct musb *musb, void __iomem *base);
 extern void musbhs_dma_controller_destroy(struct dma_controller *c);
+extern struct dma_controller *
+musbhs_dma_controller_create_noirq(struct musb *musb, void __iomem *base);
+extern irqreturn_t dma_controller_irq(int irq, void *private_data);
 
 extern struct dma_controller *
 tusb_dma_controller_create(struct musb *musb, void __iomem *base);
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index a688f7f..b2394a7 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -10,12 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include "musb_core.h"
-
-#define MUSB_HSDMA_BASE		0x200
-#define MUSB_HSDMA_INTR		(MUSB_HSDMA_BASE + 0)
-#define MUSB_HSDMA_CONTROL		0x4
-#define MUSB_HSDMA_ADDRESS		0x8
-#define MUSB_HSDMA_COUNT		0xc
+#include "musb_dma.h"
 
 #define MUSB_HSDMA_CHANNEL_OFFSET(_bchannel, _offset)		\
 		(MUSB_HSDMA_BASE + (_bchannel << 4) + _offset)
@@ -268,7 +263,7 @@ static int dma_channel_abort(struct dma_channel *channel)
 	return 0;
 }
 
-static irqreturn_t dma_controller_irq(int irq, void *private_data)
+irqreturn_t dma_controller_irq(int irq, void *private_data)
 {
 	struct musb_dma_controller *controller = private_data;
 	struct musb *musb = controller->private_data;
@@ -382,6 +377,7 @@ static irqreturn_t dma_controller_irq(int irq, void *private_data)
 	spin_unlock_irqrestore(&musb->lock, flags);
 	return retval;
 }
+EXPORT_SYMBOL_GPL(dma_controller_irq);
 
 void musbhs_dma_controller_destroy(struct dma_controller *c)
 {
@@ -397,18 +393,10 @@ void musbhs_dma_controller_destroy(struct dma_controller *c)
 }
 EXPORT_SYMBOL_GPL(musbhs_dma_controller_destroy);
 
-struct dma_controller *musbhs_dma_controller_create(struct musb *musb,
-						    void __iomem *base)
+static struct musb_dma_controller *
+dma_controller_alloc(struct musb *musb, void __iomem *base)
 {
 	struct musb_dma_controller *controller;
-	struct device *dev = musb->controller;
-	struct platform_device *pdev = to_platform_device(dev);
-	int irq = platform_get_irq_byname(pdev, "dma");
-
-	if (irq <= 0) {
-		dev_err(dev, "No DMA interrupt line!\n");
-		return NULL;
-	}
 
 	controller = kzalloc(sizeof(*controller), GFP_KERNEL);
 	if (!controller)
@@ -422,6 +410,25 @@ struct dma_controller *musbhs_dma_controller_create(struct musb *musb,
 	controller->controller.channel_release = dma_channel_release;
 	controller->controller.channel_program = dma_channel_program;
 	controller->controller.channel_abort = dma_channel_abort;
+	return controller;
+}
+
+struct dma_controller *
+musbhs_dma_controller_create(struct musb *musb, void __iomem *base)
+{
+	struct musb_dma_controller *controller;
+	struct device *dev = musb->controller;
+	struct platform_device *pdev = to_platform_device(dev);
+	int irq = platform_get_irq_byname(pdev, "dma");
+
+	if (irq <= 0) {
+		dev_err(dev, "No DMA interrupt line!\n");
+		return NULL;
+	}
+
+	controller = dma_controller_alloc(musb, base);
+	if (!controller)
+		return NULL;
 
 	if (request_irq(irq, dma_controller_irq, 0,
 			dev_name(musb->controller), &controller->controller)) {
@@ -436,3 +443,16 @@ struct dma_controller *musbhs_dma_controller_create(struct musb *musb,
 	return &controller->controller;
 }
 EXPORT_SYMBOL_GPL(musbhs_dma_controller_create);
+
+struct dma_controller *
+musbhs_dma_controller_create_noirq(struct musb *musb, void __iomem *base)
+{
+	struct musb_dma_controller *controller;
+
+	controller = dma_controller_alloc(musb, base);
+	if (!controller)
+		return NULL;
+
+	return &controller->controller;
+}
+EXPORT_SYMBOL_GPL(musbhs_dma_controller_create_noirq);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v5 5/6] usb: musb: Add musb_clearb/w() interface
  2019-02-19  7:36 [PATCH v5 0/6] Add MediaTek MUSB Controller Driver min.guo
                   ` (3 preceding siblings ...)
  2019-02-19  7:36 ` [PATCH v5 4/6] usb: musb: Add noirq type of dma create interface min.guo
@ 2019-02-19  7:36 ` min.guo
  2019-02-19  7:36 ` [PATCH v5 6/6] usb: musb: Add support for MediaTek musb controller min.guo
  5 siblings, 0 replies; 13+ messages in thread
From: min.guo @ 2019-02-19  7:36 UTC (permalink / raw)
  To: Bin Liu, Rob Herring
  Cc: Greg Kroah-Hartman, Mark Rutland, Matthias Brugger, Alan Stern,
	chunfeng.yun, linux-usb, devicetree, linux-kernel,
	linux-arm-kernel, linux-mediatek, tony, hdegoede, Min Guo

From: Min Guo <min.guo@mediatek.com>

Delete the const attribute of addr parameter in readb/w/l hooks, these
changes are for implementing clearing W1C registers.
Replace musb_readb/w with musb_clearb/w to clear the interrupt status.

Signed-off-by: Min Guo <min.guo@mediatek.com>
---
changes in v5:
1. Replace musb_readb() with musb_clearb() to clear dma pending interrupts

new patch based on v4:
---
 drivers/usb/musb/musb_core.c | 32 +++++++++++++++++++++++---------
 drivers/usb/musb/musb_core.h |  8 ++++++--
 drivers/usb/musb/musb_io.h   |  8 +++++---
 drivers/usb/musb/musbhsdma.c |  2 +-
 drivers/usb/musb/sunxi.c     |  4 ++--
 drivers/usb/musb/tusb6010.c  |  2 +-
 6 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 2fe5225..5ef8848 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -246,7 +246,7 @@ static u32 musb_default_busctl_offset(u8 epnum, u16 offset)
 	return 0x80 + (0x08 * epnum) + offset;
 }
 
-static u8 musb_default_readb(const void __iomem *addr, unsigned offset)
+static u8 musb_default_readb(void __iomem *addr, unsigned offset)
 {
 	u8 data =  __raw_readb(addr + offset);
 
@@ -260,7 +260,7 @@ static void musb_default_writeb(void __iomem *addr, unsigned offset, u8 data)
 	__raw_writeb(data, addr + offset);
 }
 
-static u16 musb_default_readw(const void __iomem *addr, unsigned offset)
+static u16 musb_default_readw(void __iomem *addr, unsigned offset)
 {
 	u16 data = __raw_readw(addr + offset);
 
@@ -396,19 +396,25 @@ static void musb_default_read_fifo(struct musb_hw_ep *hw_ep, u16 len, u8 *dst)
 /*
  * Old style IO functions
  */
-u8 (*musb_readb)(const void __iomem *addr, unsigned offset);
+u8 (*musb_readb)(void __iomem *addr, unsigned offset);
 EXPORT_SYMBOL_GPL(musb_readb);
 
 void (*musb_writeb)(void __iomem *addr, unsigned offset, u8 data);
 EXPORT_SYMBOL_GPL(musb_writeb);
 
-u16 (*musb_readw)(const void __iomem *addr, unsigned offset);
+u8 (*musb_clearb)(void __iomem *addr, unsigned int offset);
+EXPORT_SYMBOL_GPL(musb_clearb);
+
+u16 (*musb_readw)(void __iomem *addr, unsigned offset);
 EXPORT_SYMBOL_GPL(musb_readw);
 
 void (*musb_writew)(void __iomem *addr, unsigned offset, u16 data);
 EXPORT_SYMBOL_GPL(musb_writew);
 
-u32 musb_readl(const void __iomem *addr, unsigned offset)
+u16 (*musb_clearw)(void __iomem *addr, unsigned int offset);
+EXPORT_SYMBOL_GPL(musb_clearw);
+
+u32 musb_readl(void __iomem *addr, unsigned offset)
 {
 	u32 data = __raw_readl(addr + offset);
 
@@ -1047,7 +1053,6 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 static void musb_disable_interrupts(struct musb *musb)
 {
 	void __iomem	*mbase = musb->mregs;
-	u16	temp;
 
 	/* disable interrupts */
 	musb_writeb(mbase, MUSB_INTRUSBE, 0);
@@ -1057,9 +1062,9 @@ static void musb_disable_interrupts(struct musb *musb)
 	musb_writew(mbase, MUSB_INTRRXE, 0);
 
 	/*  flush pending interrupts */
-	temp = musb_readb(mbase, MUSB_INTRUSB);
-	temp = musb_readw(mbase, MUSB_INTRTX);
-	temp = musb_readw(mbase, MUSB_INTRRX);
+	musb_clearb(mbase, MUSB_INTRUSB);
+	musb_clearw(mbase, MUSB_INTRTX);
+	musb_clearw(mbase, MUSB_INTRRX);
 }
 
 static void musb_enable_interrupts(struct musb *musb)
@@ -2284,10 +2289,19 @@ static void musb_deassert_reset(struct work_struct *work)
 		musb_readb = musb->ops->readb;
 	if (musb->ops->writeb)
 		musb_writeb = musb->ops->writeb;
+	if (musb->ops->clearb)
+		musb_clearb = musb->ops->clearb;
+	else
+		musb_clearb = musb_readb;
+
 	if (musb->ops->readw)
 		musb_readw = musb->ops->readw;
 	if (musb->ops->writew)
 		musb_writew = musb->ops->writew;
+	if (musb->ops->clearw)
+		musb_clearw = musb->ops->clearw;
+	else
+		musb_clearw = musb_readw;
 
 #ifndef CONFIG_MUSB_PIO_ONLY
 	if (!musb->ops->dma_init || !musb->ops->dma_exit) {
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 9f5a69c..0d9a35f 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -120,8 +120,10 @@ enum musb_g_ep0_state {
  * @fifo_offset: returns the fifo offset
  * @readb:	read 8 bits
  * @writeb:	write 8 bits
+ * @clearb:	could be clear-on-readb or W1C
  * @readw:	read 16 bits
  * @writew:	write 16 bits
+ * @clearw:	could be clear-on-readw or W1C
  * @read_fifo:	reads the fifo
  * @write_fifo:	writes to fifo
  * @get_toggle:	platform specific get toggle function
@@ -164,10 +166,12 @@ struct musb_platform_ops {
 	u16	fifo_mode;
 	u32	(*fifo_offset)(u8 epnum);
 	u32	(*busctl_offset)(u8 epnum, u16 offset);
-	u8	(*readb)(const void __iomem *addr, unsigned offset);
+	u8	(*readb)(void __iomem *addr, unsigned offset);
 	void	(*writeb)(void __iomem *addr, unsigned offset, u8 data);
-	u16	(*readw)(const void __iomem *addr, unsigned offset);
+	u8	(*clearb)(void __iomem *addr, unsigned int offset);
+	u16	(*readw)(void __iomem *addr, unsigned offset);
 	void	(*writew)(void __iomem *addr, unsigned offset, u16 data);
+	u16	(*clearw)(void __iomem *addr, unsigned int offset);
 	void	(*read_fifo)(struct musb_hw_ep *hw_ep, u16 len, u8 *buf);
 	void	(*write_fifo)(struct musb_hw_ep *hw_ep, u16 len, const u8 *buf);
 	u16	(*get_toggle)(struct musb_qh *qh, int is_out);
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 8179334..7200596 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -37,11 +37,13 @@ struct musb_io {
 };
 
 /* Do not add new entries here, add them the struct musb_io instead */
-extern u8 (*musb_readb)(const void __iomem *addr, unsigned offset);
+extern u8 (*musb_readb)(void __iomem *addr, unsigned offset);
 extern void (*musb_writeb)(void __iomem *addr, unsigned offset, u8 data);
-extern u16 (*musb_readw)(const void __iomem *addr, unsigned offset);
+extern u8 (*musb_clearb)(void __iomem *addr, unsigned int offset);
+extern u16 (*musb_readw)(void __iomem *addr, unsigned offset);
 extern void (*musb_writew)(void __iomem *addr, unsigned offset, u16 data);
-extern u32 musb_readl(const void __iomem *addr, unsigned offset);
+extern u16 (*musb_clearw)(void __iomem *addr, unsigned int offset);
+extern u32 musb_readl(void __iomem *addr, unsigned offset);
 extern void musb_writel(void __iomem *addr, unsigned offset, u32 data);
 
 #endif
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index b2394a7..ed72bee 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -284,7 +284,7 @@ irqreturn_t dma_controller_irq(int irq, void *private_data)
 
 	spin_lock_irqsave(&musb->lock, flags);
 
-	int_hsdma = musb_readb(mbase, MUSB_HSDMA_INTR);
+	int_hsdma = musb_clearb(mbase, MUSB_HSDMA_INTR);
 
 	if (!int_hsdma) {
 		musb_dbg(musb, "spurious DMA irq");
diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index 832a41f..2c1bbaa 100644
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -407,7 +407,7 @@ static u32 sunxi_musb_busctl_offset(u8 epnum, u16 offset)
 	return SUNXI_MUSB_TXFUNCADDR + offset;
 }
 
-static u8 sunxi_musb_readb(const void __iomem *addr, unsigned offset)
+static u8 sunxi_musb_readb(void __iomem *addr, unsigned offset)
 {
 	struct sunxi_glue *glue;
 
@@ -520,7 +520,7 @@ static void sunxi_musb_writeb(void __iomem *addr, unsigned offset, u8 data)
 		(int)(addr - sunxi_musb->mregs));
 }
 
-static u16 sunxi_musb_readw(const void __iomem *addr, unsigned offset)
+static u16 sunxi_musb_readw(void __iomem *addr, unsigned offset)
 {
 	if (addr == sunxi_musb->mregs) {
 		/* generic control or fifo control reg access */
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 3945328..cfb94f9 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -142,7 +142,7 @@ static void tusb_ep_select(void __iomem *mbase, u8 epnum)
 /*
  * TUSB6010 doesn't allow 8-bit access; 16-bit access is the minimum.
  */
-static u8 tusb_readb(const void __iomem *addr, unsigned offset)
+static u8 tusb_readb(void __iomem *addr, unsigned offset)
 {
 	u16 tmp;
 	u8 val;
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH v5 6/6] usb: musb: Add support for MediaTek musb controller
  2019-02-19  7:36 [PATCH v5 0/6] Add MediaTek MUSB Controller Driver min.guo
                   ` (4 preceding siblings ...)
  2019-02-19  7:36 ` [PATCH v5 5/6] usb: musb: Add musb_clearb/w() interface min.guo
@ 2019-02-19  7:36 ` min.guo
  2019-03-30  8:52   ` Fabien Parent
  5 siblings, 1 reply; 13+ messages in thread
From: min.guo @ 2019-02-19  7:36 UTC (permalink / raw)
  To: Bin Liu, Rob Herring
  Cc: Greg Kroah-Hartman, Mark Rutland, Matthias Brugger, Alan Stern,
	chunfeng.yun, linux-usb, devicetree, linux-kernel,
	linux-arm-kernel, linux-mediatek, tony, hdegoede, Min Guo,
	Yonglong Wu

From: Min Guo <min.guo@mediatek.com>

This adds support for MediaTek musb controller in
host, peripheral and otg mode.
There are some quirk of MediaTek musb controller, such as:
 -W1C interrupt status registers
 -Private data toggle registers
 -No dedicated DMA interrupt line

Signed-off-by: Min Guo <min.guo@mediatek.com>
Signed-off-by: Yonglong Wu <yonglong.wu@mediatek.com>
---
changes in v5:
1. Replace musb_readb() with musb_clearb() to clear common/tx/rx pending interrupts
2. Make musb_clearb/w() return the value of musb_readb/w()
3. Add driver to get child nodes of usb connector and extcon device

changes in v4:
1. no changes

changes in v3:
suggested by Bin:
1. Remove 'u8/u16 data' parameter in clearb/w() hooks
2. Replace musb_readb/w() with musb_clearb/w() to clear interrupts status

changes in v2:
suggested by Bin:
1. Add summarize of MediaTek musb controller differences in the commit log
2. Add "|| COMPILE_TEST" in Kconfig
3. Move MediaTek's private toggle registers from musb_regs.h to mediatek.c
4. Replace musb_readl() with musb_readw() to read 16bit toggle register
---
 drivers/usb/musb/Kconfig    |   8 +-
 drivers/usb/musb/Makefile   |   1 +
 drivers/usb/musb/mediatek.c | 629 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 637 insertions(+), 1 deletion(-)
 create mode 100644 drivers/usb/musb/mediatek.c

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index ad08895..b72b7c1 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -115,6 +115,12 @@ config USB_MUSB_JZ4740
 	depends on USB_MUSB_GADGET
 	depends on USB_OTG_BLACKLIST_HUB
 
+config USB_MUSB_MEDIATEK
+	tristate "MediaTek platforms"
+	depends on ARCH_MEDIATEK || COMPILE_TEST
+	depends on NOP_USB_XCEIV
+	depends on GENERIC_PHY
+
 config USB_MUSB_AM335X_CHILD
 	tristate
 
@@ -141,7 +147,7 @@ config USB_UX500_DMA
 
 config USB_INVENTRA_DMA
 	bool 'Inventra'
-	depends on USB_MUSB_OMAP2PLUS
+	depends on USB_MUSB_OMAP2PLUS || USB_MUSB_MEDIATEK
 	help
 	  Enable DMA transfers using Mentor's engine.
 
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 3a88c79..63d82d0 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_USB_MUSB_DA8XX)			+= da8xx.o
 obj-$(CONFIG_USB_MUSB_UX500)			+= ux500.o
 obj-$(CONFIG_USB_MUSB_JZ4740)			+= jz4740.o
 obj-$(CONFIG_USB_MUSB_SUNXI)			+= sunxi.o
+obj-$(CONFIG_USB_MUSB_MEDIATEK)      		+= mediatek.o
 
 
 obj-$(CONFIG_USB_MUSB_AM335X_CHILD)		+= musb_am335x.o
diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c
new file mode 100644
index 0000000..946b453
--- /dev/null
+++ b/drivers/usb/musb/mediatek.c
@@ -0,0 +1,629 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2018 MediaTek Inc.
+ *
+ * Author:
+ *  Min Guo <min.guo@mediatek.com>
+ *  Yonglong Wu <yonglong.wu@mediatek.com>
+ */
+
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/usb/usb_phy_generic.h>
+#include "musb_core.h"
+#include "musb_dma.h"
+
+#define USB_L1INTS	0x00a0
+#define USB_L1INTM	0x00a4
+#define MTK_MUSB_TXFUNCADDR	0x0480
+
+/* MediaTek controller toggle enable and status reg */
+#define MUSB_RXTOG		0x80
+#define MUSB_RXTOGEN		0x82
+#define MUSB_TXTOG		0x84
+#define MUSB_TXTOGEN		0x86
+
+#define TX_INT_STATUS		BIT(0)
+#define RX_INT_STATUS		BIT(1)
+#define USBCOM_INT_STATUS		BIT(2)
+#define DMA_INT_STATUS		BIT(3)
+
+#define DMA_INTR_STATUS_MSK		GENMASK(7, 0)
+#define DMA_INTR_UNMASK_SET_MSK	GENMASK(31, 24)
+
+enum mtk_vbus_id_state {
+	MTK_ID_FLOAT = 1,
+	MTK_ID_GROUND,
+	MTK_VBUS_OFF,
+	MTK_VBUS_VALID,
+};
+
+struct mtk_glue {
+	struct device *dev;
+	struct musb *musb;
+	struct platform_device *musb_pdev;
+	struct platform_device *usb_phy;
+	struct phy *phy;
+	struct usb_phy *xceiv;
+	enum phy_mode phy_mode;
+	struct clk *main;
+	struct clk *mcu;
+	struct clk *univpll;
+	struct regulator *vbus;
+	struct extcon_dev *edev;
+	struct notifier_block vbus_nb;
+	struct notifier_block id_nb;
+};
+
+static int mtk_musb_clks_get(struct mtk_glue *glue)
+{
+	struct device *dev = glue->dev;
+
+	glue->main = devm_clk_get(dev, "main");
+	if (IS_ERR(glue->main)) {
+		dev_err(dev, "fail to get main clock\n");
+		return PTR_ERR(glue->main);
+	}
+
+	glue->mcu = devm_clk_get(dev, "mcu");
+	if (IS_ERR(glue->mcu)) {
+		dev_err(dev, "fail to get mcu clock\n");
+		return PTR_ERR(glue->mcu);
+	}
+
+	glue->univpll = devm_clk_get(dev, "univpll");
+	if (IS_ERR(glue->univpll)) {
+		dev_err(dev, "fail to get univpll clock\n");
+		return PTR_ERR(glue->univpll);
+	}
+
+	return 0;
+}
+
+static int mtk_musb_clks_enable(struct mtk_glue *glue)
+{
+	int ret;
+
+	ret = clk_prepare_enable(glue->main);
+	if (ret) {
+		dev_err(glue->dev, "failed to enable main clock\n");
+		goto err_main_clk;
+	}
+
+	ret = clk_prepare_enable(glue->mcu);
+	if (ret) {
+		dev_err(glue->dev, "failed to enable mcu clock\n");
+		goto err_mcu_clk;
+	}
+
+	ret = clk_prepare_enable(glue->univpll);
+	if (ret) {
+		dev_err(glue->dev, "failed to enable univpll clock\n");
+		goto err_univpll_clk;
+	}
+
+	return 0;
+
+err_univpll_clk:
+	clk_disable_unprepare(glue->mcu);
+err_mcu_clk:
+	clk_disable_unprepare(glue->main);
+err_main_clk:
+	return ret;
+}
+
+static void mtk_musb_clks_disable(struct mtk_glue *glue)
+{
+	clk_disable_unprepare(glue->univpll);
+	clk_disable_unprepare(glue->mcu);
+	clk_disable_unprepare(glue->main);
+}
+
+static void mtk_musb_set_vbus(struct musb *musb, int is_on)
+{
+	struct device *dev = musb->controller;
+	struct mtk_glue *glue = dev_get_drvdata(dev->parent);
+	int ret;
+
+	/* vbus is optional */
+	if (!glue->vbus)
+		return;
+
+	dev_dbg(musb->controller, "%s, is_on=%d\r\n", __func__, is_on);
+	if (is_on) {
+		ret = regulator_enable(glue->vbus);
+		if (ret) {
+			dev_err(glue->dev, "fail to enable vbus regulator\n");
+			return;
+		}
+	} else {
+		regulator_disable(glue->vbus);
+	}
+}
+
+/*
+ * switch to host: -> MTK_VBUS_OFF --> MTK_ID_GROUND
+ * switch to device: -> MTK_ID_FLOAT --> MTK_VBUS_VALID
+ */
+static void mtk_musb_set_mailbox(struct mtk_glue *glue,
+				 enum mtk_vbus_id_state status)
+{
+	struct musb *musb = glue->musb;
+	u8 devctl = 0;
+
+	dev_dbg(glue->dev, "mailbox state(%d)\n", status);
+	switch (status) {
+	case MTK_ID_GROUND:
+		phy_power_on(glue->phy);
+		devctl = readb(musb->mregs + MUSB_DEVCTL);
+		musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
+		mtk_musb_set_vbus(musb, 1);
+		glue->phy_mode = PHY_MODE_USB_HOST;
+		phy_set_mode(glue->phy, glue->phy_mode);
+		devctl |= MUSB_DEVCTL_SESSION;
+		musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
+		MUSB_HST_MODE(musb);
+		break;
+	/*
+	 * MTK_ID_FLOAT process is the same as MTK_VBUS_VALID
+	 * except that turn off VBUS
+	 */
+	case MTK_ID_FLOAT:
+		mtk_musb_set_vbus(musb, 0);
+		/* fall through */
+	case MTK_VBUS_OFF:
+		musb->xceiv->otg->state = OTG_STATE_B_IDLE;
+		devctl &= ~MUSB_DEVCTL_SESSION;
+		musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
+		phy_power_off(glue->phy);
+		break;
+	case MTK_VBUS_VALID:
+		phy_power_on(glue->phy);
+		glue->phy_mode = PHY_MODE_USB_DEVICE;
+		phy_set_mode(glue->phy, glue->phy_mode);
+		MUSB_DEV_MODE(musb);
+		break;
+	default:
+		dev_err(glue->dev, "invalid state\n");
+	}
+}
+
+static int mtk_musb_id_notifier(struct notifier_block *nb,
+				unsigned long event, void *ptr)
+{
+	struct mtk_glue *glue = container_of(nb, struct mtk_glue, id_nb);
+
+	if (event)
+		mtk_musb_set_mailbox(glue, MTK_ID_GROUND);
+	else
+		mtk_musb_set_mailbox(glue, MTK_ID_FLOAT);
+
+	return NOTIFY_DONE;
+}
+
+static int mtk_musb_vbus_notifier(struct notifier_block *nb,
+				  unsigned long event, void *ptr)
+{
+	struct mtk_glue *glue = container_of(nb, struct mtk_glue, vbus_nb);
+
+	if (event)
+		mtk_musb_set_mailbox(glue, MTK_VBUS_VALID);
+	else
+		mtk_musb_set_mailbox(glue, MTK_VBUS_OFF);
+
+	return NOTIFY_DONE;
+}
+
+static void mtk_otg_switch_init(struct mtk_glue *glue)
+{
+	int ret;
+
+	/* extcon is optional */
+	if (!glue->edev)
+		return;
+
+	glue->vbus_nb.notifier_call = mtk_musb_vbus_notifier;
+	ret = devm_extcon_register_notifier(glue->dev, glue->edev, EXTCON_USB,
+					    &glue->vbus_nb);
+	if (ret < 0)
+		dev_err(glue->dev, "failed to register notifier for USB\n");
+
+	glue->id_nb.notifier_call = mtk_musb_id_notifier;
+	ret = devm_extcon_register_notifier(glue->dev, glue->edev,
+					    EXTCON_USB_HOST, &glue->id_nb);
+	if (ret < 0)
+		dev_err(glue->dev, "failed to register notifier for USB-HOST\n");
+
+	dev_dbg(glue->dev, "EXTCON_USB: %d, EXTCON_USB_HOST: %d\n",
+		extcon_get_state(glue->edev, EXTCON_USB),
+		extcon_get_state(glue->edev, EXTCON_USB_HOST));
+
+	/* default as host, switch to device mode if needed */
+	if (extcon_get_state(glue->edev, EXTCON_USB_HOST) == false)
+		mtk_musb_set_mailbox(glue, MTK_ID_FLOAT);
+	if (extcon_get_state(glue->edev, EXTCON_USB) == true)
+		mtk_musb_set_mailbox(glue, MTK_VBUS_VALID);
+}
+
+static irqreturn_t generic_interrupt(int irq, void *__hci)
+{
+	unsigned long flags;
+	irqreturn_t retval = IRQ_NONE;
+	struct musb *musb = __hci;
+
+	spin_lock_irqsave(&musb->lock, flags);
+	musb->int_usb = musb_clearb(musb->mregs, MUSB_INTRUSB);
+	musb->int_rx = musb_clearw(musb->mregs, MUSB_INTRRX);
+	musb->int_tx = musb_clearw(musb->mregs, MUSB_INTRTX);
+
+	if (musb->int_usb || musb->int_tx || musb->int_rx)
+		retval = musb_interrupt(musb);
+
+	spin_unlock_irqrestore(&musb->lock, flags);
+
+	return retval;
+}
+
+static irqreturn_t mtk_musb_interrupt(int irq, void *dev_id)
+{
+	irqreturn_t retval = IRQ_NONE;
+	struct musb *musb = (struct musb *)dev_id;
+	u32 l1_ints;
+
+	l1_ints = musb_readl(musb->mregs, USB_L1INTS) &
+			musb_readl(musb->mregs, USB_L1INTM);
+
+	if (l1_ints & (TX_INT_STATUS | RX_INT_STATUS | USBCOM_INT_STATUS))
+		retval = generic_interrupt(irq, musb);
+
+#if defined(CONFIG_USB_INVENTRA_DMA)
+	if (l1_ints & DMA_INT_STATUS)
+		retval = dma_controller_irq(irq, musb->dma_controller);
+#endif
+	return retval;
+}
+
+static u32 mtk_musb_busctl_offset(u8 epnum, u16 offset)
+{
+	return MTK_MUSB_TXFUNCADDR + offset + 8 * epnum;
+}
+
+static u8 mtk_musb_clearb(void __iomem *addr, unsigned int offset)
+{
+	u8 data;
+
+	/* W1C */
+	data = musb_readb(addr, offset);
+	musb_writeb(addr, offset, data);
+	return data;
+}
+
+static u16 mtk_musb_clearw(void __iomem *addr, unsigned int offset)
+{
+	u16 data;
+
+	/* W1C */
+	data = musb_readw(addr, offset);
+	musb_writew(addr, offset, data);
+	return data;
+}
+
+static int mtk_musb_init(struct musb *musb)
+{
+	struct device *dev = musb->controller;
+	struct mtk_glue *glue = dev_get_drvdata(dev->parent);
+	int ret;
+
+	glue->musb = musb;
+	musb->phy = glue->phy;
+	musb->xceiv = glue->xceiv;
+	musb->is_host = false;
+	musb->isr = mtk_musb_interrupt;
+	ret = phy_init(glue->phy);
+	if (ret)
+		return ret;
+
+	ret = phy_power_on(glue->phy);
+	if (ret) {
+		phy_exit(glue->phy);
+		return ret;
+	}
+
+	phy_set_mode(glue->phy, glue->phy_mode);
+
+#if defined(CONFIG_USB_INVENTRA_DMA)
+	musb_writel(musb->mregs, MUSB_HSDMA_INTR,
+		    DMA_INTR_STATUS_MSK | DMA_INTR_UNMASK_SET_MSK);
+#endif
+	musb_writel(musb->mregs, USB_L1INTM, TX_INT_STATUS | RX_INT_STATUS |
+		    USBCOM_INT_STATUS | DMA_INT_STATUS);
+	return 0;
+}
+
+static u16 mtk_musb_get_toggle(struct musb_qh *qh, int is_out)
+{
+	struct musb *musb = qh->hw_ep->musb;
+	u8 epnum = qh->hw_ep->epnum;
+	u16 toggle;
+
+	if (is_out)
+		toggle = musb_readw(musb->mregs, MUSB_TXTOG);
+	else
+		toggle = musb_readw(musb->mregs, MUSB_RXTOG);
+
+	return toggle & (1 << epnum);
+}
+
+static u16 mtk_musb_set_toggle(struct musb_qh *qh, int is_out, struct urb *urb)
+{
+	struct musb *musb = qh->hw_ep->musb;
+	u8 epnum = qh->hw_ep->epnum;
+	u16 toggle;
+
+	toggle = usb_gettoggle(urb->dev, qh->epnum, is_out);
+
+	if (is_out) {
+		musb_writew(musb->mregs, MUSB_TXTOGEN, (1 << epnum));
+		musb_writew(musb->mregs, MUSB_TXTOG, (toggle << epnum));
+	} else {
+		musb_writew(musb->mregs, MUSB_RXTOGEN, (1 << epnum));
+		musb_writew(musb->mregs, MUSB_RXTOG, (toggle << epnum));
+	}
+
+	return 0;
+}
+
+static int mtk_musb_set_mode(struct musb *musb, u8 mode)
+{
+	struct device *dev = musb->controller;
+	struct mtk_glue *glue = dev_get_drvdata(dev->parent);
+	enum phy_mode new_mode;
+
+	switch (mode) {
+	case MUSB_HOST:
+		new_mode = PHY_MODE_USB_HOST;
+		mtk_musb_set_vbus(musb, 1);
+		break;
+	case MUSB_PERIPHERAL:
+		new_mode = PHY_MODE_USB_DEVICE;
+		break;
+	case MUSB_OTG:
+		new_mode = PHY_MODE_USB_HOST;
+		break;
+	default:
+		dev_err(musb->controller->parent,
+			"Error requested mode not supported by this kernel\n");
+		return -EINVAL;
+	}
+	if (glue->phy_mode == new_mode)
+		return 0;
+
+	mtk_musb_set_mailbox(glue, MTK_ID_GROUND);
+	return 0;
+}
+
+static int mtk_musb_exit(struct musb *musb)
+{
+	struct device *dev = musb->controller;
+	struct mtk_glue *glue = dev_get_drvdata(dev->parent);
+
+	phy_power_off(glue->phy);
+	phy_exit(glue->phy);
+	mtk_musb_clks_disable(glue);
+
+	pm_runtime_put_sync(dev);
+	pm_runtime_disable(dev);
+	return 0;
+}
+
+static const struct musb_platform_ops mtk_musb_ops = {
+	.quirks = MUSB_DMA_INVENTRA,
+	.init = mtk_musb_init,
+	.get_toggle = mtk_musb_get_toggle,
+	.set_toggle = mtk_musb_set_toggle,
+	.exit = mtk_musb_exit,
+#ifdef CONFIG_USB_INVENTRA_DMA
+	.dma_init = musbhs_dma_controller_create_noirq,
+	.dma_exit = musbhs_dma_controller_destroy,
+#endif
+	.clearb = mtk_musb_clearb,
+	.clearw = mtk_musb_clearw,
+	.busctl_offset = mtk_musb_busctl_offset,
+	.set_mode = mtk_musb_set_mode,
+	.set_vbus = mtk_musb_set_vbus,
+};
+
+#define MTK_MUSB_MAX_EP_NUM	8
+#define MTK_MUSB_RAM_BITS	11
+
+static struct musb_fifo_cfg mtk_musb_mode_cfg[] = {
+	{ .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, },
+	{ .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, },
+	{ .hw_ep_num = 2, .style = FIFO_TX, .maxpacket = 512, },
+	{ .hw_ep_num = 2, .style = FIFO_RX, .maxpacket = 512, },
+	{ .hw_ep_num = 3, .style = FIFO_TX, .maxpacket = 512, },
+	{ .hw_ep_num = 3, .style = FIFO_RX, .maxpacket = 512, },
+	{ .hw_ep_num = 4, .style = FIFO_TX, .maxpacket = 512, },
+	{ .hw_ep_num = 4, .style = FIFO_RX, .maxpacket = 512, },
+	{ .hw_ep_num = 5, .style = FIFO_TX, .maxpacket = 512, },
+	{ .hw_ep_num = 5, .style = FIFO_RX, .maxpacket = 512, },
+	{ .hw_ep_num = 6, .style = FIFO_TX, .maxpacket = 1024, },
+	{ .hw_ep_num = 6, .style = FIFO_RX, .maxpacket = 1024, },
+	{ .hw_ep_num = 7, .style = FIFO_TX, .maxpacket = 512, },
+	{ .hw_ep_num = 7, .style = FIFO_RX, .maxpacket = 64, },
+};
+
+static const struct musb_hdrc_config mtk_musb_hdrc_config = {
+	.fifo_cfg = mtk_musb_mode_cfg,
+	.fifo_cfg_size = ARRAY_SIZE(mtk_musb_mode_cfg),
+	.multipoint = true,
+	.dyn_fifo = true,
+	.num_eps = MTK_MUSB_MAX_EP_NUM,
+	.ram_bits = MTK_MUSB_RAM_BITS,
+};
+
+static const struct platform_device_info mtk_dev_info = {
+	.name = "musb-hdrc",
+	.id = PLATFORM_DEVID_AUTO,
+	.dma_mask = DMA_BIT_MASK(32),
+};
+
+static int mtk_musb_probe(struct platform_device *pdev)
+{
+	struct musb_hdrc_platform_data *pdata;
+	struct mtk_glue *glue;
+	struct platform_device_info pinfo;
+	struct device *dev = &pdev->dev;
+	struct device_node *np = dev->of_node;
+	struct device_node *child, *extcon_node;
+	int ret = -ENOMEM;
+
+	glue = devm_kzalloc(dev, sizeof(*glue), GFP_KERNEL);
+	if (!glue)
+		return -ENOMEM;
+
+	glue->dev = dev;
+	pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+	if (!pdata)
+		return -ENOMEM;
+
+	ret = mtk_musb_clks_get(glue);
+	if (ret)
+		return ret;
+
+	pdata->config = &mtk_musb_hdrc_config;
+	pdata->platform_ops = &mtk_musb_ops;
+
+	glue->vbus = devm_regulator_get(dev, "vbus");
+	if (IS_ERR(glue->vbus)) {
+		dev_err(dev, "fail to get vbus\n");
+		return PTR_ERR(glue->vbus);
+	}
+
+	child = of_get_child_by_name(np, "connector");
+	if (!child) {
+		dev_err(dev, "failed to find usb connector node\n");
+		return ERR_PTR(-ENODEV);
+	}
+
+	extcon_node = of_parse_phandle(child, "extcon", 0);
+	if (!extcon_node) {
+		dev_err(dev, "failed to get extcon phandle");
+		return ERR_PTR(-ENODEV);
+	}
+
+	glue->edev = extcon_find_edev_by_node(extcon_node);
+	if (IS_ERR(glue->edev)) {
+		dev_err(dev, "fail to get extcon\n");
+		return PTR_ERR(glue->edev);
+	}
+
+	pdata->mode = usb_get_dr_mode(dev);
+	switch (pdata->mode) {
+	case USB_DR_MODE_HOST:
+		glue->phy_mode = PHY_MODE_USB_HOST;
+		break;
+	case USB_DR_MODE_PERIPHERAL:
+		glue->phy_mode = PHY_MODE_USB_DEVICE;
+		break;
+	default:
+		pdata->mode = USB_DR_MODE_OTG;
+		/* FALL THROUGH */
+	case USB_DR_MODE_OTG:
+		glue->phy_mode = PHY_MODE_USB_OTG;
+		break;
+	}
+
+	glue->phy = devm_of_phy_get_by_index(dev, np, 0);
+	if (IS_ERR(glue->phy)) {
+		dev_err(dev, "fail to getting phy %ld\n",
+			PTR_ERR(glue->phy));
+		return PTR_ERR(glue->phy);
+	}
+
+	glue->usb_phy = usb_phy_generic_register();
+	if (IS_ERR(glue->usb_phy)) {
+		dev_err(dev, "fail to registering usb-phy %ld\n",
+			PTR_ERR(glue->usb_phy));
+		return PTR_ERR(glue->usb_phy);
+	}
+
+	glue->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+	if (IS_ERR(glue->xceiv)) {
+		dev_err(dev, "fail to getting usb-phy %d\n", ret);
+		ret = PTR_ERR(glue->xceiv);
+		goto err_unregister_usb_phy;
+	}
+
+	platform_set_drvdata(pdev, glue);
+	pm_runtime_enable(dev);
+	pm_runtime_get_sync(dev);
+
+	ret = mtk_musb_clks_enable(glue);
+	if (ret)
+		goto err_enable_clk;
+
+	pinfo = mtk_dev_info;
+	pinfo.parent = dev;
+	pinfo.res = pdev->resource;
+	pinfo.num_res = pdev->num_resources;
+	pinfo.data = pdata;
+	pinfo.size_data = sizeof(*pdata);
+
+	glue->musb_pdev = platform_device_register_full(&pinfo);
+	if (IS_ERR(glue->musb_pdev)) {
+		ret = PTR_ERR(glue->musb_pdev);
+		dev_err(dev, "failed to register musb device: %d\n", ret);
+		goto err_device_register;
+	}
+
+	if (pdata->mode == USB_DR_MODE_OTG)
+		mtk_otg_switch_init(glue);
+
+	return 0;
+
+err_device_register:
+	mtk_musb_clks_disable(glue);
+err_enable_clk:
+	pm_runtime_put_sync(dev);
+	pm_runtime_disable(dev);
+err_unregister_usb_phy:
+	usb_phy_generic_unregister(glue->usb_phy);
+	return ret;
+}
+
+static int mtk_musb_remove(struct platform_device *pdev)
+{
+	struct mtk_glue *glue = platform_get_drvdata(pdev);
+	struct platform_device *usb_phy = glue->usb_phy;
+
+	platform_device_unregister(glue->musb_pdev);
+	usb_phy_generic_unregister(usb_phy);
+
+	return 0;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id mtk_musb_match[] = {
+	{.compatible = "mediatek,mtk-musb",},
+	{},
+};
+MODULE_DEVICE_TABLE(of, mtk_musb_match);
+#endif
+
+static struct platform_driver mtk_musb_driver = {
+	.probe = mtk_musb_probe,
+	.remove = mtk_musb_remove,
+	.driver = {
+		   .name = "musb-mtk",
+		   .of_match_table = of_match_ptr(mtk_musb_match),
+	},
+};
+
+module_platform_driver(mtk_musb_driver);
+
+MODULE_DESCRIPTION("MediaTek MUSB Glue Layer");
+MODULE_AUTHOR("Min Guo <min.guo@mediatek.com>");
+MODULE_LICENSE("GPL v2");
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH v5 1/6] dt-bindings: usb: musb: Add support for MediaTek musb controller
  2019-02-19  7:36 ` [PATCH v5 1/6] dt-bindings: usb: musb: Add support for MediaTek musb controller min.guo
@ 2019-02-22 16:49   ` Rob Herring
  2019-02-25  1:36     ` Min Guo
  0 siblings, 1 reply; 13+ messages in thread
From: Rob Herring @ 2019-02-22 16:49 UTC (permalink / raw)
  To: min.guo
  Cc: Bin Liu, Greg Kroah-Hartman, Mark Rutland, Matthias Brugger,
	Alan Stern, chunfeng.yun, linux-usb, devicetree, linux-kernel,
	linux-arm-kernel, linux-mediatek, tony, hdegoede

On Tue, Feb 19, 2019 at 03:36:30PM +0800, min.guo@mediatek.com wrote:
> From: Min Guo <min.guo@mediatek.com>
> 
> This adds support for MediaTek musb controller in
> host, peripheral and otg mode.
> 
> Signed-off-by: Min Guo <min.guo@mediatek.com>
> ---
> changes in v5:
> suggested by Rob:
> 1. Modify compatible as 
> - compatible : should be one of:
>                "mediatek,mt-2701"
>                ...
>                followed by "mediatek,mtk-musb"
> 2. Add usb connector child node
> 
> changes in v4:
> suggested by Sergei:
> 1. String alignment
> 
> changes in v3:
> 1. no changes
> 
> changes in v2:
> suggested by Bin:
> 1. Modify DRC to DRD
> suggested by Rob:
> 2. Drop the "<soc-model>-musb" in compatible
> 3. Remove phy-names
> 4. Add space after comma in clock-names
> ---
>  .../devicetree/bindings/usb/mediatek,musb.txt      | 54 ++++++++++++++++++++++
>  1 file changed, 54 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.txt
> 
> diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.txt b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
> new file mode 100644
> index 0000000..0632e6e
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
> @@ -0,0 +1,54 @@
> +MediaTek musb DRD/OTG controller
> +-------------------------------------------
> +
> +Required properties:
> + - compatible      : should be one of:
> +                     "mediatek,mt-2701"

That looks like a top-level SoC compatible and doesn't match the 
example.

> +                     ...
> +                     followed by "mediatek,mtk-musb"
> + - reg             : specifies physical base address and size of
> +                     the registers
> + - interrupts      : interrupt used by musb controller
> + - interrupt-names : must be "mc"

Not much point in a name when there is only 1.

> + - phys            : PHY specifier for the OTG phy
> + - dr_mode         : should be one of "host", "peripheral" or "otg",
> +                     refer to usb/generic.txt
> + - clocks          : a list of phandle + clock-specifier pairs, one for
> +                     each entry in clock-names
> + - clock-names     : must contain "main", "mcu", "univpll"
> +                     for clocks of controller
> +
> +Optional properties:
> + - power-domains   : a phandle to USB power domain node to control USB's
> +                     MTCMOS
> +
> +Required child nodes:
> + usb connector node as defined in bindings/connector/usb-connector.txt
> + - extcon          : for VBUS and ID pin changes detection, needed when
> +                     supports dual-role mode
> + - vbus-supply     : reference to the VBUS regulator, needed when supports
> +                     dual-role mode
> +
> +Example:
> +
> +usb2: usb@11200000 {
> +	compatible = "mediatek,mt2701-musb",
> +		     "mediatek,mtk-musb";
> +	reg = <0 0x11200000 0 0x1000>;
> +	interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
> +	interrupt-names = "mc";
> +	phys = <&u2port2 PHY_TYPE_USB2>;
> +	dr_mode = "otg";
> +	clocks = <&pericfg CLK_PERI_USB0>,
> +		 <&pericfg CLK_PERI_USB0_MCU>,
> +		 <&pericfg CLK_PERI_USB_SLV>;
> +	clock-names = "main","mcu","univpll";
> +	power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
> +	usb_con: connector{
> +		compatible = "usb-b-connector";
> +		label = "micro-USB";
> +		type = "micro";
> +		extcon = <&extcon_usb>;

The connector node should replace 'extcon'. Add what you need here 
directly (e.g. id-gpios). What you add needs to be defined in 
usb-connector.txt.

> +		vbus-supply = <&usb_vbus>;
> +	};
> +};
> -- 
> 1.9.1
> 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v5 1/6] dt-bindings: usb: musb: Add support for MediaTek musb controller
  2019-02-22 16:49   ` Rob Herring
@ 2019-02-25  1:36     ` Min Guo
  2019-03-04 17:42       ` Rob Herring
  0 siblings, 1 reply; 13+ messages in thread
From: Min Guo @ 2019-02-25  1:36 UTC (permalink / raw)
  To: Rob Herring
  Cc: Bin Liu, Greg Kroah-Hartman, Mark Rutland, Matthias Brugger,
	Alan Stern, chunfeng.yun, linux-usb, devicetree, linux-kernel,
	linux-arm-kernel, linux-mediatek, tony, hdegoede

Hi Rob,
On Fri, 2019-02-22 at 10:49 -0600, Rob Herring wrote:
> On Tue, Feb 19, 2019 at 03:36:30PM +0800, min.guo@mediatek.com wrote:
> > From: Min Guo <min.guo@mediatek.com>
> > 
> > This adds support for MediaTek musb controller in
> > host, peripheral and otg mode.
> > 
> > Signed-off-by: Min Guo <min.guo@mediatek.com>
> > ---
> > changes in v5:
> > suggested by Rob:
> > 1. Modify compatible as 
> > - compatible : should be one of:
> >                "mediatek,mt-2701"
> >                ...
> >                followed by "mediatek,mtk-musb"
> > 2. Add usb connector child node
> > 
> > changes in v4:
> > suggested by Sergei:
> > 1. String alignment
> > 
> > changes in v3:
> > 1. no changes
> > 
> > changes in v2:
> > suggested by Bin:
> > 1. Modify DRC to DRD
> > suggested by Rob:
> > 2. Drop the "<soc-model>-musb" in compatible
> > 3. Remove phy-names
> > 4. Add space after comma in clock-names
> > ---
> >  .../devicetree/bindings/usb/mediatek,musb.txt      | 54 ++++++++++++++++++++++
> >  1 file changed, 54 insertions(+)
> >  create mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.txt
> > 
> > diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.txt b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
> > new file mode 100644
> > index 0000000..0632e6e
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
> > @@ -0,0 +1,54 @@
> > +MediaTek musb DRD/OTG controller
> > +-------------------------------------------
> > +
> > +Required properties:
> > + - compatible      : should be one of:
> > +                     "mediatek,mt-2701"
> 
> That looks like a top-level SoC compatible and doesn't match the 
> example.
"mediatek,mt-2701" is an example, just to describe a specific SOC.
May I modify compatibel like:
compatible : should be "mediatek,mtk-musb"

> > +                     ...
> > +                     followed by "mediatek,mtk-musb"
> > + - reg             : specifies physical base address and size of
> > +                     the registers
> > + - interrupts      : interrupt used by musb controller
> > + - interrupt-names : must be "mc"
> 
> Not much point in a name when there is only 1.
The MUSB core driver has two interrupts, one is for MAC, another for
DMA, but on MTK platform, there is only a MAC interrupt, musb core
driver uses platform_get_irq_byname(pdev, "mc") to get this interrupt
number.

> > + - phys            : PHY specifier for the OTG phy
> > + - dr_mode         : should be one of "host", "peripheral" or "otg",
> > +                     refer to usb/generic.txt
> > + - clocks          : a list of phandle + clock-specifier pairs, one for
> > +                     each entry in clock-names
> > + - clock-names     : must contain "main", "mcu", "univpll"
> > +                     for clocks of controller
> > +
> > +Optional properties:
> > + - power-domains   : a phandle to USB power domain node to control USB's
> > +                     MTCMOS
> > +
> > +Required child nodes:
> > + usb connector node as defined in bindings/connector/usb-connector.txt
> > + - extcon          : for VBUS and ID pin changes detection, needed when
> > +                     supports dual-role mode
> > + - vbus-supply     : reference to the VBUS regulator, needed when supports
> > +                     dual-role mode
> > +
> > +Example:
> > +
> > +usb2: usb@11200000 {
> > +	compatible = "mediatek,mt2701-musb",
> > +		     "mediatek,mtk-musb";
> > +	reg = <0 0x11200000 0 0x1000>;
> > +	interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>;
> > +	interrupt-names = "mc";
> > +	phys = <&u2port2 PHY_TYPE_USB2>;
> > +	dr_mode = "otg";
> > +	clocks = <&pericfg CLK_PERI_USB0>,
> > +		 <&pericfg CLK_PERI_USB0_MCU>,
> > +		 <&pericfg CLK_PERI_USB_SLV>;
> > +	clock-names = "main","mcu","univpll";
> > +	power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
> > +	usb_con: connector{
> > +		compatible = "usb-b-connector";
> > +		label = "micro-USB";
> > +		type = "micro";
> > +		extcon = <&extcon_usb>;
> 
> The connector node should replace 'extcon'. Add what you need here 
> directly (e.g. id-gpios). What you add needs to be defined in 
> usb-connector.txt.
OK.

> > +		vbus-supply = <&usb_vbus>;
> > +	};
> > +};
> > -- 
> > 1.9.1
> > 

Regards,
Min.




^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v5 1/6] dt-bindings: usb: musb: Add support for MediaTek musb controller
  2019-02-25  1:36     ` Min Guo
@ 2019-03-04 17:42       ` Rob Herring
  2019-03-05  1:19         ` Min Guo
  0 siblings, 1 reply; 13+ messages in thread
From: Rob Herring @ 2019-03-04 17:42 UTC (permalink / raw)
  To: Min Guo
  Cc: Bin Liu, Greg Kroah-Hartman, Mark Rutland, Matthias Brugger,
	Alan Stern, Chunfeng Yun, Linux USB List, devicetree,
	linux-kernel,
	moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
	moderated list:ARM/Mediatek SoC support, Tony Lindgren,
	Hans de Goede

On Sun, Feb 24, 2019 at 7:36 PM Min Guo <min.guo@mediatek.com> wrote:
>
> Hi Rob,
> On Fri, 2019-02-22 at 10:49 -0600, Rob Herring wrote:
> > On Tue, Feb 19, 2019 at 03:36:30PM +0800, min.guo@mediatek.com wrote:
> > > From: Min Guo <min.guo@mediatek.com>
> > >
> > > This adds support for MediaTek musb controller in
> > > host, peripheral and otg mode.
> > >
> > > Signed-off-by: Min Guo <min.guo@mediatek.com>
> > > ---
> > > changes in v5:
> > > suggested by Rob:
> > > 1. Modify compatible as
> > > - compatible : should be one of:
> > >                "mediatek,mt-2701"
> > >                ...
> > >                followed by "mediatek,mtk-musb"
> > > 2. Add usb connector child node
> > >
> > > changes in v4:
> > > suggested by Sergei:
> > > 1. String alignment
> > >
> > > changes in v3:
> > > 1. no changes
> > >
> > > changes in v2:
> > > suggested by Bin:
> > > 1. Modify DRC to DRD
> > > suggested by Rob:
> > > 2. Drop the "<soc-model>-musb" in compatible
> > > 3. Remove phy-names
> > > 4. Add space after comma in clock-names
> > > ---
> > >  .../devicetree/bindings/usb/mediatek,musb.txt      | 54 ++++++++++++++++++++++
> > >  1 file changed, 54 insertions(+)
> > >  create mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.txt
> > >
> > > diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.txt b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
> > > new file mode 100644
> > > index 0000000..0632e6e
> > > --- /dev/null
> > > +++ b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
> > > @@ -0,0 +1,54 @@
> > > +MediaTek musb DRD/OTG controller
> > > +-------------------------------------------
> > > +
> > > +Required properties:
> > > + - compatible      : should be one of:
> > > +                     "mediatek,mt-2701"
> >
> > That looks like a top-level SoC compatible and doesn't match the
> > example.
> "mediatek,mt-2701" is an example, just to describe a specific SOC.
> May I modify compatibel like:
> compatible : should be "mediatek,mtk-musb"

No, you should fix the example adding "mediatek,mtk-musb".

Rob

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v5 1/6] dt-bindings: usb: musb: Add support for MediaTek musb controller
  2019-03-04 17:42       ` Rob Herring
@ 2019-03-05  1:19         ` Min Guo
  0 siblings, 0 replies; 13+ messages in thread
From: Min Guo @ 2019-03-05  1:19 UTC (permalink / raw)
  To: Rob Herring
  Cc: Bin Liu, Greg Kroah-Hartman, Mark Rutland, Matthias Brugger,
	Alan Stern, Chunfeng Yun, Linux USB List, devicetree,
	linux-kernel,
	moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE,
	moderated list:ARM/Mediatek SoC support, Tony Lindgren,
	Hans de Goede

Hi Rob,

On Mon, 2019-03-04 at 11:42 -0600, Rob Herring wrote:
> On Sun, Feb 24, 2019 at 7:36 PM Min Guo <min.guo@mediatek.com> wrote:
> >
> > Hi Rob,
> > On Fri, 2019-02-22 at 10:49 -0600, Rob Herring wrote:
> > > On Tue, Feb 19, 2019 at 03:36:30PM +0800, min.guo@mediatek.com wrote:
> > > > From: Min Guo <min.guo@mediatek.com>
> > > >
> > > > This adds support for MediaTek musb controller in
> > > > host, peripheral and otg mode.
> > > >
> > > > Signed-off-by: Min Guo <min.guo@mediatek.com>
> > > > ---
> > > > changes in v5:
> > > > suggested by Rob:
> > > > 1. Modify compatible as
> > > > - compatible : should be one of:
> > > >                "mediatek,mt-2701"
> > > >                ...
> > > >                followed by "mediatek,mtk-musb"
> > > > 2. Add usb connector child node
> > > >
> > > > changes in v4:
> > > > suggested by Sergei:
> > > > 1. String alignment
> > > >
> > > > changes in v3:
> > > > 1. no changes
> > > >
> > > > changes in v2:
> > > > suggested by Bin:
> > > > 1. Modify DRC to DRD
> > > > suggested by Rob:
> > > > 2. Drop the "<soc-model>-musb" in compatible
> > > > 3. Remove phy-names
> > > > 4. Add space after comma in clock-names
> > > > ---
> > > >  .../devicetree/bindings/usb/mediatek,musb.txt      | 54 ++++++++++++++++++++++
> > > >  1 file changed, 54 insertions(+)
> > > >  create mode 100644 Documentation/devicetree/bindings/usb/mediatek,musb.txt
> > > >
> > > > diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.txt b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
> > > > new file mode 100644
> > > > index 0000000..0632e6e
> > > > --- /dev/null
> > > > +++ b/Documentation/devicetree/bindings/usb/mediatek,musb.txt
> > > > @@ -0,0 +1,54 @@
> > > > +MediaTek musb DRD/OTG controller
> > > > +-------------------------------------------
> > > > +
> > > > +Required properties:
> > > > + - compatible      : should be one of:
> > > > +                     "mediatek,mt-2701"
> > >
> > > That looks like a top-level SoC compatible and doesn't match the
> > > example.
> > "mediatek,mt-2701" is an example, just to describe a specific SOC.
> > May I modify compatibel like:
> > compatible : should be "mediatek,mtk-musb"
> 
> No, you should fix the example adding "mediatek,mtk-musb".
OK.

> Rob

Regards,
Min.




^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v5 6/6] usb: musb: Add support for MediaTek musb controller
  2019-02-19  7:36 ` [PATCH v5 6/6] usb: musb: Add support for MediaTek musb controller min.guo
@ 2019-03-30  8:52   ` Fabien Parent
  2019-04-01  5:35     ` Min Guo
  0 siblings, 1 reply; 13+ messages in thread
From: Fabien Parent @ 2019-03-30  8:52 UTC (permalink / raw)
  To: min.guo
  Cc: Bin Liu, Rob Herring, Mark Rutland, devicetree, Yonglong Wu,
	hdegoede, tony, Greg Kroah-Hartman, linux-usb, linux-kernel,
	Matthias Brugger, Alan Stern, chunfeng.yun, linux-mediatek,
	linux-arm-kernel

Hi Min Guo,

On Tue, Feb 19, 2019 at 8:39 AM <min.guo@mediatek.com> wrote:
>
> From: Min Guo <min.guo@mediatek.com>
>
> This adds support for MediaTek musb controller in
> host, peripheral and otg mode.
> There are some quirk of MediaTek musb controller, such as:
>  -W1C interrupt status registers
>  -Private data toggle registers
>  -No dedicated DMA interrupt line
>
> Signed-off-by: Min Guo <min.guo@mediatek.com>
> Signed-off-by: Yonglong Wu <yonglong.wu@mediatek.com>
> ---
> changes in v5:
> 1. Replace musb_readb() with musb_clearb() to clear common/tx/rx pending interrupts
> 2. Make musb_clearb/w() return the value of musb_readb/w()
> 3. Add driver to get child nodes of usb connector and extcon device
>
> changes in v4:
> 1. no changes
>
> changes in v3:
> suggested by Bin:
> 1. Remove 'u8/u16 data' parameter in clearb/w() hooks
> 2. Replace musb_readb/w() with musb_clearb/w() to clear interrupts status
>
> changes in v2:
> suggested by Bin:
> 1. Add summarize of MediaTek musb controller differences in the commit log
> 2. Add "|| COMPILE_TEST" in Kconfig
> 3. Move MediaTek's private toggle registers from musb_regs.h to mediatek.c
> 4. Replace musb_readl() with musb_readw() to read 16bit toggle register
> ---
>  drivers/usb/musb/Kconfig    |   8 +-
>  drivers/usb/musb/Makefile   |   1 +
>  drivers/usb/musb/mediatek.c | 629 ++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 637 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/usb/musb/mediatek.c
>
> diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
> index ad08895..b72b7c1 100644
> --- a/drivers/usb/musb/Kconfig
> +++ b/drivers/usb/musb/Kconfig
> @@ -115,6 +115,12 @@ config USB_MUSB_JZ4740
>         depends on USB_MUSB_GADGET
>         depends on USB_OTG_BLACKLIST_HUB
>
> +config USB_MUSB_MEDIATEK
> +       tristate "MediaTek platforms"
> +       depends on ARCH_MEDIATEK || COMPILE_TEST
> +       depends on NOP_USB_XCEIV
> +       depends on GENERIC_PHY
> +
>  config USB_MUSB_AM335X_CHILD
>         tristate
>
> @@ -141,7 +147,7 @@ config USB_UX500_DMA
>
>  config USB_INVENTRA_DMA
>         bool 'Inventra'
> -       depends on USB_MUSB_OMAP2PLUS
> +       depends on USB_MUSB_OMAP2PLUS || USB_MUSB_MEDIATEK
>         help
>           Enable DMA transfers using Mentor's engine.
>
> diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
> index 3a88c79..63d82d0 100644
> --- a/drivers/usb/musb/Makefile
> +++ b/drivers/usb/musb/Makefile
> @@ -24,6 +24,7 @@ obj-$(CONFIG_USB_MUSB_DA8XX)                  += da8xx.o
>  obj-$(CONFIG_USB_MUSB_UX500)                   += ux500.o
>  obj-$(CONFIG_USB_MUSB_JZ4740)                  += jz4740.o
>  obj-$(CONFIG_USB_MUSB_SUNXI)                   += sunxi.o
> +obj-$(CONFIG_USB_MUSB_MEDIATEK)                += mediatek.o
>
>
>  obj-$(CONFIG_USB_MUSB_AM335X_CHILD)            += musb_am335x.o
> diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c
> new file mode 100644
> index 0000000..946b453
> --- /dev/null
> +++ b/drivers/usb/musb/mediatek.c
> @@ -0,0 +1,629 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2018 MediaTek Inc.
> + *
> + * Author:
> + *  Min Guo <min.guo@mediatek.com>
> + *  Yonglong Wu <yonglong.wu@mediatek.com>
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/dma-mapping.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/usb/usb_phy_generic.h>
> +#include "musb_core.h"
> +#include "musb_dma.h"
> +
> +#define USB_L1INTS     0x00a0
> +#define USB_L1INTM     0x00a4
> +#define MTK_MUSB_TXFUNCADDR    0x0480
> +
> +/* MediaTek controller toggle enable and status reg */
> +#define MUSB_RXTOG             0x80
> +#define MUSB_RXTOGEN           0x82
> +#define MUSB_TXTOG             0x84
> +#define MUSB_TXTOGEN           0x86
> +
> +#define TX_INT_STATUS          BIT(0)
> +#define RX_INT_STATUS          BIT(1)
> +#define USBCOM_INT_STATUS              BIT(2)
> +#define DMA_INT_STATUS         BIT(3)
> +
> +#define DMA_INTR_STATUS_MSK            GENMASK(7, 0)
> +#define DMA_INTR_UNMASK_SET_MSK        GENMASK(31, 24)
> +
> +enum mtk_vbus_id_state {
> +       MTK_ID_FLOAT = 1,
> +       MTK_ID_GROUND,
> +       MTK_VBUS_OFF,
> +       MTK_VBUS_VALID,
> +};
> +
> +struct mtk_glue {
> +       struct device *dev;
> +       struct musb *musb;
> +       struct platform_device *musb_pdev;
> +       struct platform_device *usb_phy;
> +       struct phy *phy;
> +       struct usb_phy *xceiv;
> +       enum phy_mode phy_mode;
> +       struct clk *main;
> +       struct clk *mcu;
> +       struct clk *univpll;
> +       struct regulator *vbus;
> +       struct extcon_dev *edev;
> +       struct notifier_block vbus_nb;
> +       struct notifier_block id_nb;
> +};
> +
> +static int mtk_musb_clks_get(struct mtk_glue *glue)
> +{
> +       struct device *dev = glue->dev;
> +
> +       glue->main = devm_clk_get(dev, "main");
> +       if (IS_ERR(glue->main)) {
> +               dev_err(dev, "fail to get main clock\n");
> +               return PTR_ERR(glue->main);
> +       }
> +
> +       glue->mcu = devm_clk_get(dev, "mcu");
> +       if (IS_ERR(glue->mcu)) {
> +               dev_err(dev, "fail to get mcu clock\n");
> +               return PTR_ERR(glue->mcu);
> +       }
> +
> +       glue->univpll = devm_clk_get(dev, "univpll");
> +       if (IS_ERR(glue->univpll)) {
> +               dev_err(dev, "fail to get univpll clock\n");
> +               return PTR_ERR(glue->univpll);
> +       }
> +
> +       return 0;
> +}
> +
> +static int mtk_musb_clks_enable(struct mtk_glue *glue)
> +{
> +       int ret;
> +
> +       ret = clk_prepare_enable(glue->main);
> +       if (ret) {
> +               dev_err(glue->dev, "failed to enable main clock\n");
> +               goto err_main_clk;
> +       }
> +
> +       ret = clk_prepare_enable(glue->mcu);
> +       if (ret) {
> +               dev_err(glue->dev, "failed to enable mcu clock\n");
> +               goto err_mcu_clk;
> +       }
> +
> +       ret = clk_prepare_enable(glue->univpll);
> +       if (ret) {
> +               dev_err(glue->dev, "failed to enable univpll clock\n");
> +               goto err_univpll_clk;
> +       }
> +
> +       return 0;
> +
> +err_univpll_clk:
> +       clk_disable_unprepare(glue->mcu);
> +err_mcu_clk:
> +       clk_disable_unprepare(glue->main);
> +err_main_clk:
> +       return ret;
> +}
> +
> +static void mtk_musb_clks_disable(struct mtk_glue *glue)
> +{
> +       clk_disable_unprepare(glue->univpll);
> +       clk_disable_unprepare(glue->mcu);
> +       clk_disable_unprepare(glue->main);
> +}
> +
> +static void mtk_musb_set_vbus(struct musb *musb, int is_on)
> +{
> +       struct device *dev = musb->controller;
> +       struct mtk_glue *glue = dev_get_drvdata(dev->parent);
> +       int ret;
> +
> +       /* vbus is optional */
> +       if (!glue->vbus)
> +               return;
> +
> +       dev_dbg(musb->controller, "%s, is_on=%d\r\n", __func__, is_on);
> +       if (is_on) {
> +               ret = regulator_enable(glue->vbus);
> +               if (ret) {
> +                       dev_err(glue->dev, "fail to enable vbus regulator\n");
> +                       return;
> +               }
> +       } else {
> +               regulator_disable(glue->vbus);
> +       }
> +}
> +
> +/*
> + * switch to host: -> MTK_VBUS_OFF --> MTK_ID_GROUND
> + * switch to device: -> MTK_ID_FLOAT --> MTK_VBUS_VALID
> + */
> +static void mtk_musb_set_mailbox(struct mtk_glue *glue,
> +                                enum mtk_vbus_id_state status)
> +{
> +       struct musb *musb = glue->musb;
> +       u8 devctl = 0;
> +
> +       dev_dbg(glue->dev, "mailbox state(%d)\n", status);
> +       switch (status) {
> +       case MTK_ID_GROUND:
> +               phy_power_on(glue->phy);
> +               devctl = readb(musb->mregs + MUSB_DEVCTL);
> +               musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
> +               mtk_musb_set_vbus(musb, 1);
> +               glue->phy_mode = PHY_MODE_USB_HOST;
> +               phy_set_mode(glue->phy, glue->phy_mode);
> +               devctl |= MUSB_DEVCTL_SESSION;
> +               musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
> +               MUSB_HST_MODE(musb);
> +               break;
> +       /*
> +        * MTK_ID_FLOAT process is the same as MTK_VBUS_VALID
> +        * except that turn off VBUS
> +        */
> +       case MTK_ID_FLOAT:
> +               mtk_musb_set_vbus(musb, 0);
> +               /* fall through */
> +       case MTK_VBUS_OFF:
> +               musb->xceiv->otg->state = OTG_STATE_B_IDLE;
> +               devctl &= ~MUSB_DEVCTL_SESSION;
> +               musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
> +               phy_power_off(glue->phy);
> +               break;
> +       case MTK_VBUS_VALID:
> +               phy_power_on(glue->phy);
> +               glue->phy_mode = PHY_MODE_USB_DEVICE;
> +               phy_set_mode(glue->phy, glue->phy_mode);
> +               MUSB_DEV_MODE(musb);
> +               break;
> +       default:
> +               dev_err(glue->dev, "invalid state\n");
> +       }
> +}
> +
> +static int mtk_musb_id_notifier(struct notifier_block *nb,
> +                               unsigned long event, void *ptr)
> +{
> +       struct mtk_glue *glue = container_of(nb, struct mtk_glue, id_nb);
> +
> +       if (event)
> +               mtk_musb_set_mailbox(glue, MTK_ID_GROUND);
> +       else
> +               mtk_musb_set_mailbox(glue, MTK_ID_FLOAT);
> +
> +       return NOTIFY_DONE;
> +}
> +
> +static int mtk_musb_vbus_notifier(struct notifier_block *nb,
> +                                 unsigned long event, void *ptr)
> +{
> +       struct mtk_glue *glue = container_of(nb, struct mtk_glue, vbus_nb);
> +
> +       if (event)
> +               mtk_musb_set_mailbox(glue, MTK_VBUS_VALID);
> +       else
> +               mtk_musb_set_mailbox(glue, MTK_VBUS_OFF);
> +
> +       return NOTIFY_DONE;
> +}
> +
> +static void mtk_otg_switch_init(struct mtk_glue *glue)
> +{
> +       int ret;
> +
> +       /* extcon is optional */
> +       if (!glue->edev)
> +               return;
> +
> +       glue->vbus_nb.notifier_call = mtk_musb_vbus_notifier;
> +       ret = devm_extcon_register_notifier(glue->dev, glue->edev, EXTCON_USB,
> +                                           &glue->vbus_nb);
> +       if (ret < 0)
> +               dev_err(glue->dev, "failed to register notifier for USB\n");
> +
> +       glue->id_nb.notifier_call = mtk_musb_id_notifier;
> +       ret = devm_extcon_register_notifier(glue->dev, glue->edev,
> +                                           EXTCON_USB_HOST, &glue->id_nb);
> +       if (ret < 0)
> +               dev_err(glue->dev, "failed to register notifier for USB-HOST\n");
> +
> +       dev_dbg(glue->dev, "EXTCON_USB: %d, EXTCON_USB_HOST: %d\n",
> +               extcon_get_state(glue->edev, EXTCON_USB),
> +               extcon_get_state(glue->edev, EXTCON_USB_HOST));
> +
> +       /* default as host, switch to device mode if needed */
> +       if (extcon_get_state(glue->edev, EXTCON_USB_HOST) == false)
> +               mtk_musb_set_mailbox(glue, MTK_ID_FLOAT);
> +       if (extcon_get_state(glue->edev, EXTCON_USB) == true)
> +               mtk_musb_set_mailbox(glue, MTK_VBUS_VALID);
> +}
> +
> +static irqreturn_t generic_interrupt(int irq, void *__hci)
> +{
> +       unsigned long flags;
> +       irqreturn_t retval = IRQ_NONE;
> +       struct musb *musb = __hci;
> +
> +       spin_lock_irqsave(&musb->lock, flags);
> +       musb->int_usb = musb_clearb(musb->mregs, MUSB_INTRUSB);
> +       musb->int_rx = musb_clearw(musb->mregs, MUSB_INTRRX);
> +       musb->int_tx = musb_clearw(musb->mregs, MUSB_INTRTX);
> +
> +       if (musb->int_usb || musb->int_tx || musb->int_rx)
> +               retval = musb_interrupt(musb);
> +
> +       spin_unlock_irqrestore(&musb->lock, flags);
> +
> +       return retval;
> +}
> +
> +static irqreturn_t mtk_musb_interrupt(int irq, void *dev_id)
> +{
> +       irqreturn_t retval = IRQ_NONE;
> +       struct musb *musb = (struct musb *)dev_id;
> +       u32 l1_ints;
> +
> +       l1_ints = musb_readl(musb->mregs, USB_L1INTS) &
> +                       musb_readl(musb->mregs, USB_L1INTM);
> +
> +       if (l1_ints & (TX_INT_STATUS | RX_INT_STATUS | USBCOM_INT_STATUS))
> +               retval = generic_interrupt(irq, musb);
> +
> +#if defined(CONFIG_USB_INVENTRA_DMA)
> +       if (l1_ints & DMA_INT_STATUS)
> +               retval = dma_controller_irq(irq, musb->dma_controller);
> +#endif
> +       return retval;
> +}
> +
> +static u32 mtk_musb_busctl_offset(u8 epnum, u16 offset)
> +{
> +       return MTK_MUSB_TXFUNCADDR + offset + 8 * epnum;
> +}
> +
> +static u8 mtk_musb_clearb(void __iomem *addr, unsigned int offset)
> +{
> +       u8 data;
> +
> +       /* W1C */
> +       data = musb_readb(addr, offset);
> +       musb_writeb(addr, offset, data);
> +       return data;
> +}
> +
> +static u16 mtk_musb_clearw(void __iomem *addr, unsigned int offset)
> +{
> +       u16 data;
> +
> +       /* W1C */
> +       data = musb_readw(addr, offset);
> +       musb_writew(addr, offset, data);
> +       return data;
> +}
> +
> +static int mtk_musb_init(struct musb *musb)
> +{
> +       struct device *dev = musb->controller;
> +       struct mtk_glue *glue = dev_get_drvdata(dev->parent);
> +       int ret;
> +
> +       glue->musb = musb;
> +       musb->phy = glue->phy;
> +       musb->xceiv = glue->xceiv;
> +       musb->is_host = false;
> +       musb->isr = mtk_musb_interrupt;
> +       ret = phy_init(glue->phy);
> +       if (ret)
> +               return ret;
> +
> +       ret = phy_power_on(glue->phy);
> +       if (ret) {
> +               phy_exit(glue->phy);
> +               return ret;
> +       }
> +
> +       phy_set_mode(glue->phy, glue->phy_mode);
> +
> +#if defined(CONFIG_USB_INVENTRA_DMA)
> +       musb_writel(musb->mregs, MUSB_HSDMA_INTR,
> +                   DMA_INTR_STATUS_MSK | DMA_INTR_UNMASK_SET_MSK);
> +#endif
> +       musb_writel(musb->mregs, USB_L1INTM, TX_INT_STATUS | RX_INT_STATUS |
> +                   USBCOM_INT_STATUS | DMA_INT_STATUS);
> +       return 0;
> +}
> +
> +static u16 mtk_musb_get_toggle(struct musb_qh *qh, int is_out)
> +{
> +       struct musb *musb = qh->hw_ep->musb;
> +       u8 epnum = qh->hw_ep->epnum;
> +       u16 toggle;
> +
> +       if (is_out)
> +               toggle = musb_readw(musb->mregs, MUSB_TXTOG);
> +       else
> +               toggle = musb_readw(musb->mregs, MUSB_RXTOG);
> +
> +       return toggle & (1 << epnum);
> +}
> +
> +static u16 mtk_musb_set_toggle(struct musb_qh *qh, int is_out, struct urb *urb)
> +{
> +       struct musb *musb = qh->hw_ep->musb;
> +       u8 epnum = qh->hw_ep->epnum;
> +       u16 toggle;
> +
> +       toggle = usb_gettoggle(urb->dev, qh->epnum, is_out);
> +
> +       if (is_out) {
> +               musb_writew(musb->mregs, MUSB_TXTOGEN, (1 << epnum));
> +               musb_writew(musb->mregs, MUSB_TXTOG, (toggle << epnum));
> +       } else {
> +               musb_writew(musb->mregs, MUSB_RXTOGEN, (1 << epnum));
> +               musb_writew(musb->mregs, MUSB_RXTOG, (toggle << epnum));
> +       }
> +
> +       return 0;
> +}
> +
> +static int mtk_musb_set_mode(struct musb *musb, u8 mode)
> +{
> +       struct device *dev = musb->controller;
> +       struct mtk_glue *glue = dev_get_drvdata(dev->parent);
> +       enum phy_mode new_mode;
> +
> +       switch (mode) {
> +       case MUSB_HOST:
> +               new_mode = PHY_MODE_USB_HOST;
> +               mtk_musb_set_vbus(musb, 1);
> +               break;
> +       case MUSB_PERIPHERAL:
> +               new_mode = PHY_MODE_USB_DEVICE;
> +               break;
> +       case MUSB_OTG:
> +               new_mode = PHY_MODE_USB_HOST;
> +               break;
> +       default:
> +               dev_err(musb->controller->parent,
> +                       "Error requested mode not supported by this kernel\n");
> +               return -EINVAL;
> +       }
> +       if (glue->phy_mode == new_mode)
> +               return 0;
> +
> +       mtk_musb_set_mailbox(glue, MTK_ID_GROUND);
> +       return 0;
> +}
> +
> +static int mtk_musb_exit(struct musb *musb)
> +{
> +       struct device *dev = musb->controller;
> +       struct mtk_glue *glue = dev_get_drvdata(dev->parent);
> +
> +       phy_power_off(glue->phy);
> +       phy_exit(glue->phy);
> +       mtk_musb_clks_disable(glue);
> +
> +       pm_runtime_put_sync(dev);
> +       pm_runtime_disable(dev);
> +       return 0;
> +}
> +
> +static const struct musb_platform_ops mtk_musb_ops = {
> +       .quirks = MUSB_DMA_INVENTRA,
> +       .init = mtk_musb_init,
> +       .get_toggle = mtk_musb_get_toggle,
> +       .set_toggle = mtk_musb_set_toggle,
> +       .exit = mtk_musb_exit,
> +#ifdef CONFIG_USB_INVENTRA_DMA
> +       .dma_init = musbhs_dma_controller_create_noirq,
> +       .dma_exit = musbhs_dma_controller_destroy,
> +#endif
> +       .clearb = mtk_musb_clearb,
> +       .clearw = mtk_musb_clearw,
> +       .busctl_offset = mtk_musb_busctl_offset,
> +       .set_mode = mtk_musb_set_mode,
> +       .set_vbus = mtk_musb_set_vbus,
> +};
> +
> +#define MTK_MUSB_MAX_EP_NUM    8
> +#define MTK_MUSB_RAM_BITS      11
> +
> +static struct musb_fifo_cfg mtk_musb_mode_cfg[] = {
> +       { .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, },
> +       { .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, },
> +       { .hw_ep_num = 2, .style = FIFO_TX, .maxpacket = 512, },
> +       { .hw_ep_num = 2, .style = FIFO_RX, .maxpacket = 512, },
> +       { .hw_ep_num = 3, .style = FIFO_TX, .maxpacket = 512, },
> +       { .hw_ep_num = 3, .style = FIFO_RX, .maxpacket = 512, },
> +       { .hw_ep_num = 4, .style = FIFO_TX, .maxpacket = 512, },
> +       { .hw_ep_num = 4, .style = FIFO_RX, .maxpacket = 512, },
> +       { .hw_ep_num = 5, .style = FIFO_TX, .maxpacket = 512, },
> +       { .hw_ep_num = 5, .style = FIFO_RX, .maxpacket = 512, },
> +       { .hw_ep_num = 6, .style = FIFO_TX, .maxpacket = 1024, },
> +       { .hw_ep_num = 6, .style = FIFO_RX, .maxpacket = 1024, },
> +       { .hw_ep_num = 7, .style = FIFO_TX, .maxpacket = 512, },
> +       { .hw_ep_num = 7, .style = FIFO_RX, .maxpacket = 64, },
> +};
> +
> +static const struct musb_hdrc_config mtk_musb_hdrc_config = {
> +       .fifo_cfg = mtk_musb_mode_cfg,
> +       .fifo_cfg_size = ARRAY_SIZE(mtk_musb_mode_cfg),
> +       .multipoint = true,
> +       .dyn_fifo = true,
> +       .num_eps = MTK_MUSB_MAX_EP_NUM,
> +       .ram_bits = MTK_MUSB_RAM_BITS,
> +};
> +
> +static const struct platform_device_info mtk_dev_info = {
> +       .name = "musb-hdrc",
> +       .id = PLATFORM_DEVID_AUTO,
> +       .dma_mask = DMA_BIT_MASK(32),
> +};
> +
> +static int mtk_musb_probe(struct platform_device *pdev)
> +{
> +       struct musb_hdrc_platform_data *pdata;
> +       struct mtk_glue *glue;
> +       struct platform_device_info pinfo;
> +       struct device *dev = &pdev->dev;
> +       struct device_node *np = dev->of_node;
> +       struct device_node *child, *extcon_node;
> +       int ret = -ENOMEM;
> +
> +       glue = devm_kzalloc(dev, sizeof(*glue), GFP_KERNEL);
> +       if (!glue)
> +               return -ENOMEM;
> +
> +       glue->dev = dev;
> +       pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
> +       if (!pdata)
> +               return -ENOMEM;
> +
> +       ret = mtk_musb_clks_get(glue);
> +       if (ret)
> +               return ret;
> +
> +       pdata->config = &mtk_musb_hdrc_config;
> +       pdata->platform_ops = &mtk_musb_ops;
> +
> +       glue->vbus = devm_regulator_get(dev, "vbus");
> +       if (IS_ERR(glue->vbus)) {
> +               dev_err(dev, "fail to get vbus\n");
> +               return PTR_ERR(glue->vbus);
> +       }
> +
> +       child = of_get_child_by_name(np, "connector");
> +       if (!child) {
> +               dev_err(dev, "failed to find usb connector node\n");
> +               return ERR_PTR(-ENODEV);

The 'probe' function is returning an 'int' and not a pointer. This
line should trigger a warning.

> +       }
> +
> +       extcon_node = of_parse_phandle(child, "extcon", 0);
> +       if (!extcon_node) {
> +               dev_err(dev, "failed to get extcon phandle");
> +               return ERR_PTR(-ENODEV);

Same here

> +       }
> +
> +       glue->edev = extcon_find_edev_by_node(extcon_node);
> +       if (IS_ERR(glue->edev)) {
> +               dev_err(dev, "fail to get extcon\n");
> +               return PTR_ERR(glue->edev);
> +       }
> +
> +       pdata->mode = usb_get_dr_mode(dev);
> +       switch (pdata->mode) {
> +       case USB_DR_MODE_HOST:
> +               glue->phy_mode = PHY_MODE_USB_HOST;
> +               break;
> +       case USB_DR_MODE_PERIPHERAL:
> +               glue->phy_mode = PHY_MODE_USB_DEVICE;
> +               break;
> +       default:
> +               pdata->mode = USB_DR_MODE_OTG;
> +               /* FALL THROUGH */
> +       case USB_DR_MODE_OTG:
> +               glue->phy_mode = PHY_MODE_USB_OTG;
> +               break;
> +       }
> +
> +       glue->phy = devm_of_phy_get_by_index(dev, np, 0);
> +       if (IS_ERR(glue->phy)) {
> +               dev_err(dev, "fail to getting phy %ld\n",
> +                       PTR_ERR(glue->phy));
> +               return PTR_ERR(glue->phy);
> +       }
> +
> +       glue->usb_phy = usb_phy_generic_register();
> +       if (IS_ERR(glue->usb_phy)) {
> +               dev_err(dev, "fail to registering usb-phy %ld\n",
> +                       PTR_ERR(glue->usb_phy));
> +               return PTR_ERR(glue->usb_phy);
> +       }
> +
> +       glue->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
> +       if (IS_ERR(glue->xceiv)) {
> +               dev_err(dev, "fail to getting usb-phy %d\n", ret);
> +               ret = PTR_ERR(glue->xceiv);
> +               goto err_unregister_usb_phy;
> +       }
> +
> +       platform_set_drvdata(pdev, glue);
> +       pm_runtime_enable(dev);
> +       pm_runtime_get_sync(dev);
> +
> +       ret = mtk_musb_clks_enable(glue);
> +       if (ret)
> +               goto err_enable_clk;
> +
> +       pinfo = mtk_dev_info;
> +       pinfo.parent = dev;
> +       pinfo.res = pdev->resource;
> +       pinfo.num_res = pdev->num_resources;
> +       pinfo.data = pdata;
> +       pinfo.size_data = sizeof(*pdata);
> +
> +       glue->musb_pdev = platform_device_register_full(&pinfo);
> +       if (IS_ERR(glue->musb_pdev)) {
> +               ret = PTR_ERR(glue->musb_pdev);
> +               dev_err(dev, "failed to register musb device: %d\n", ret);
> +               goto err_device_register;
> +       }
> +
> +       if (pdata->mode == USB_DR_MODE_OTG)
> +               mtk_otg_switch_init(glue);
> +
> +       return 0;
> +
> +err_device_register:
> +       mtk_musb_clks_disable(glue);
> +err_enable_clk:
> +       pm_runtime_put_sync(dev);
> +       pm_runtime_disable(dev);
> +err_unregister_usb_phy:
> +       usb_phy_generic_unregister(glue->usb_phy);
> +       return ret;
> +}
> +
> +static int mtk_musb_remove(struct platform_device *pdev)
> +{
> +       struct mtk_glue *glue = platform_get_drvdata(pdev);
> +       struct platform_device *usb_phy = glue->usb_phy;
> +
> +       platform_device_unregister(glue->musb_pdev);
> +       usb_phy_generic_unregister(usb_phy);
> +
> +       return 0;
> +}
> +
> +#ifdef CONFIG_OF
> +static const struct of_device_id mtk_musb_match[] = {
> +       {.compatible = "mediatek,mtk-musb",},
> +       {},
> +};
> +MODULE_DEVICE_TABLE(of, mtk_musb_match);
> +#endif
> +
> +static struct platform_driver mtk_musb_driver = {
> +       .probe = mtk_musb_probe,
> +       .remove = mtk_musb_remove,
> +       .driver = {
> +                  .name = "musb-mtk",
> +                  .of_match_table = of_match_ptr(mtk_musb_match),
> +       },
> +};
> +
> +module_platform_driver(mtk_musb_driver);
> +
> +MODULE_DESCRIPTION("MediaTek MUSB Glue Layer");
> +MODULE_AUTHOR("Min Guo <min.guo@mediatek.com>");
> +MODULE_LICENSE("GPL v2");
> --
> 1.9.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH v5 6/6] usb: musb: Add support for MediaTek musb controller
  2019-03-30  8:52   ` Fabien Parent
@ 2019-04-01  5:35     ` Min Guo
  0 siblings, 0 replies; 13+ messages in thread
From: Min Guo @ 2019-04-01  5:35 UTC (permalink / raw)
  To: Fabien Parent
  Cc: Bin Liu, Rob Herring, Mark Rutland, devicetree, Yonglong Wu,
	hdegoede, tony, Greg Kroah-Hartman, linux-usb, linux-kernel,
	Matthias Brugger, Alan Stern, chunfeng.yun, linux-mediatek,
	linux-arm-kernel

Hi Fabien Parent,

On Sat, 2019-03-30 at 09:52 +0100, Fabien Parent wrote:
> Hi Min Guo,
> 
> On Tue, Feb 19, 2019 at 8:39 AM <min.guo@mediatek.com> wrote:
> >
> > From: Min Guo <min.guo@mediatek.com>
> >
> > This adds support for MediaTek musb controller in
> > host, peripheral and otg mode.
> > There are some quirk of MediaTek musb controller, such as:
> >  -W1C interrupt status registers
> >  -Private data toggle registers
> >  -No dedicated DMA interrupt line
> >
> > Signed-off-by: Min Guo <min.guo@mediatek.com>
> > Signed-off-by: Yonglong Wu <yonglong.wu@mediatek.com>
> > ---
> > changes in v5:
> > 1. Replace musb_readb() with musb_clearb() to clear common/tx/rx pending interrupts
> > 2. Make musb_clearb/w() return the value of musb_readb/w()
> > 3. Add driver to get child nodes of usb connector and extcon device
> >
> > changes in v4:
> > 1. no changes
> >
> > changes in v3:
> > suggested by Bin:
> > 1. Remove 'u8/u16 data' parameter in clearb/w() hooks
> > 2. Replace musb_readb/w() with musb_clearb/w() to clear interrupts status
> >
> > changes in v2:
> > suggested by Bin:
> > 1. Add summarize of MediaTek musb controller differences in the commit log
> > 2. Add "|| COMPILE_TEST" in Kconfig
> > 3. Move MediaTek's private toggle registers from musb_regs.h to mediatek.c
> > 4. Replace musb_readl() with musb_readw() to read 16bit toggle register
> > ---
> >  drivers/usb/musb/Kconfig    |   8 +-
> >  drivers/usb/musb/Makefile   |   1 +
> >  drivers/usb/musb/mediatek.c | 629 ++++++++++++++++++++++++++++++++++++++++++++
> >  3 files changed, 637 insertions(+), 1 deletion(-)
> >  create mode 100644 drivers/usb/musb/mediatek.c
> >
> > diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
> > index ad08895..b72b7c1 100644
> > --- a/drivers/usb/musb/Kconfig
> > +++ b/drivers/usb/musb/Kconfig
> > @@ -115,6 +115,12 @@ config USB_MUSB_JZ4740
> >         depends on USB_MUSB_GADGET
> >         depends on USB_OTG_BLACKLIST_HUB
> >
> > +config USB_MUSB_MEDIATEK
> > +       tristate "MediaTek platforms"
> > +       depends on ARCH_MEDIATEK || COMPILE_TEST
> > +       depends on NOP_USB_XCEIV
> > +       depends on GENERIC_PHY
> > +
> >  config USB_MUSB_AM335X_CHILD
> >         tristate
> >
> > @@ -141,7 +147,7 @@ config USB_UX500_DMA
> >
> >  config USB_INVENTRA_DMA
> >         bool 'Inventra'
> > -       depends on USB_MUSB_OMAP2PLUS
> > +       depends on USB_MUSB_OMAP2PLUS || USB_MUSB_MEDIATEK
> >         help
> >           Enable DMA transfers using Mentor's engine.
> >
> > diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
> > index 3a88c79..63d82d0 100644
> > --- a/drivers/usb/musb/Makefile
> > +++ b/drivers/usb/musb/Makefile
> > @@ -24,6 +24,7 @@ obj-$(CONFIG_USB_MUSB_DA8XX)                  += da8xx.o
> >  obj-$(CONFIG_USB_MUSB_UX500)                   += ux500.o
> >  obj-$(CONFIG_USB_MUSB_JZ4740)                  += jz4740.o
> >  obj-$(CONFIG_USB_MUSB_SUNXI)                   += sunxi.o
> > +obj-$(CONFIG_USB_MUSB_MEDIATEK)                += mediatek.o
> >
> >
> >  obj-$(CONFIG_USB_MUSB_AM335X_CHILD)            += musb_am335x.o
> > diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c
> > new file mode 100644
> > index 0000000..946b453
> > --- /dev/null
> > +++ b/drivers/usb/musb/mediatek.c
> > @@ -0,0 +1,629 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright (C) 2018 MediaTek Inc.
> > + *
> > + * Author:
> > + *  Min Guo <min.guo@mediatek.com>
> > + *  Yonglong Wu <yonglong.wu@mediatek.com>
> > + */
> > +
> > +#include <linux/clk.h>
> > +#include <linux/dma-mapping.h>
> > +#include <linux/module.h>
> > +#include <linux/platform_device.h>
> > +#include <linux/usb/usb_phy_generic.h>
> > +#include "musb_core.h"
> > +#include "musb_dma.h"
> > +
> > +#define USB_L1INTS     0x00a0
> > +#define USB_L1INTM     0x00a4
> > +#define MTK_MUSB_TXFUNCADDR    0x0480
> > +
> > +/* MediaTek controller toggle enable and status reg */
> > +#define MUSB_RXTOG             0x80
> > +#define MUSB_RXTOGEN           0x82
> > +#define MUSB_TXTOG             0x84
> > +#define MUSB_TXTOGEN           0x86
> > +
> > +#define TX_INT_STATUS          BIT(0)
> > +#define RX_INT_STATUS          BIT(1)
> > +#define USBCOM_INT_STATUS              BIT(2)
> > +#define DMA_INT_STATUS         BIT(3)
> > +
> > +#define DMA_INTR_STATUS_MSK            GENMASK(7, 0)
> > +#define DMA_INTR_UNMASK_SET_MSK        GENMASK(31, 24)
> > +
> > +enum mtk_vbus_id_state {
> > +       MTK_ID_FLOAT = 1,
> > +       MTK_ID_GROUND,
> > +       MTK_VBUS_OFF,
> > +       MTK_VBUS_VALID,
> > +};
> > +
> > +struct mtk_glue {
> > +       struct device *dev;
> > +       struct musb *musb;
> > +       struct platform_device *musb_pdev;
> > +       struct platform_device *usb_phy;
> > +       struct phy *phy;
> > +       struct usb_phy *xceiv;
> > +       enum phy_mode phy_mode;
> > +       struct clk *main;
> > +       struct clk *mcu;
> > +       struct clk *univpll;
> > +       struct regulator *vbus;
> > +       struct extcon_dev *edev;
> > +       struct notifier_block vbus_nb;
> > +       struct notifier_block id_nb;
> > +};
> > +
> > +static int mtk_musb_clks_get(struct mtk_glue *glue)
> > +{
> > +       struct device *dev = glue->dev;
> > +
> > +       glue->main = devm_clk_get(dev, "main");
> > +       if (IS_ERR(glue->main)) {
> > +               dev_err(dev, "fail to get main clock\n");
> > +               return PTR_ERR(glue->main);
> > +       }
> > +
> > +       glue->mcu = devm_clk_get(dev, "mcu");
> > +       if (IS_ERR(glue->mcu)) {
> > +               dev_err(dev, "fail to get mcu clock\n");
> > +               return PTR_ERR(glue->mcu);
> > +       }
> > +
> > +       glue->univpll = devm_clk_get(dev, "univpll");
> > +       if (IS_ERR(glue->univpll)) {
> > +               dev_err(dev, "fail to get univpll clock\n");
> > +               return PTR_ERR(glue->univpll);
> > +       }
> > +
> > +       return 0;
> > +}
> > +
> > +static int mtk_musb_clks_enable(struct mtk_glue *glue)
> > +{
> > +       int ret;
> > +
> > +       ret = clk_prepare_enable(glue->main);
> > +       if (ret) {
> > +               dev_err(glue->dev, "failed to enable main clock\n");
> > +               goto err_main_clk;
> > +       }
> > +
> > +       ret = clk_prepare_enable(glue->mcu);
> > +       if (ret) {
> > +               dev_err(glue->dev, "failed to enable mcu clock\n");
> > +               goto err_mcu_clk;
> > +       }
> > +
> > +       ret = clk_prepare_enable(glue->univpll);
> > +       if (ret) {
> > +               dev_err(glue->dev, "failed to enable univpll clock\n");
> > +               goto err_univpll_clk;
> > +       }
> > +
> > +       return 0;
> > +
> > +err_univpll_clk:
> > +       clk_disable_unprepare(glue->mcu);
> > +err_mcu_clk:
> > +       clk_disable_unprepare(glue->main);
> > +err_main_clk:
> > +       return ret;
> > +}
> > +
> > +static void mtk_musb_clks_disable(struct mtk_glue *glue)
> > +{
> > +       clk_disable_unprepare(glue->univpll);
> > +       clk_disable_unprepare(glue->mcu);
> > +       clk_disable_unprepare(glue->main);
> > +}
> > +
> > +static void mtk_musb_set_vbus(struct musb *musb, int is_on)
> > +{
> > +       struct device *dev = musb->controller;
> > +       struct mtk_glue *glue = dev_get_drvdata(dev->parent);
> > +       int ret;
> > +
> > +       /* vbus is optional */
> > +       if (!glue->vbus)
> > +               return;
> > +
> > +       dev_dbg(musb->controller, "%s, is_on=%d\r\n", __func__, is_on);
> > +       if (is_on) {
> > +               ret = regulator_enable(glue->vbus);
> > +               if (ret) {
> > +                       dev_err(glue->dev, "fail to enable vbus regulator\n");
> > +                       return;
> > +               }
> > +       } else {
> > +               regulator_disable(glue->vbus);
> > +       }
> > +}
> > +
> > +/*
> > + * switch to host: -> MTK_VBUS_OFF --> MTK_ID_GROUND
> > + * switch to device: -> MTK_ID_FLOAT --> MTK_VBUS_VALID
> > + */
> > +static void mtk_musb_set_mailbox(struct mtk_glue *glue,
> > +                                enum mtk_vbus_id_state status)
> > +{
> > +       struct musb *musb = glue->musb;
> > +       u8 devctl = 0;
> > +
> > +       dev_dbg(glue->dev, "mailbox state(%d)\n", status);
> > +       switch (status) {
> > +       case MTK_ID_GROUND:
> > +               phy_power_on(glue->phy);
> > +               devctl = readb(musb->mregs + MUSB_DEVCTL);
> > +               musb->xceiv->otg->state = OTG_STATE_A_WAIT_VRISE;
> > +               mtk_musb_set_vbus(musb, 1);
> > +               glue->phy_mode = PHY_MODE_USB_HOST;
> > +               phy_set_mode(glue->phy, glue->phy_mode);
> > +               devctl |= MUSB_DEVCTL_SESSION;
> > +               musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
> > +               MUSB_HST_MODE(musb);
> > +               break;
> > +       /*
> > +        * MTK_ID_FLOAT process is the same as MTK_VBUS_VALID
> > +        * except that turn off VBUS
> > +        */
> > +       case MTK_ID_FLOAT:
> > +               mtk_musb_set_vbus(musb, 0);
> > +               /* fall through */
> > +       case MTK_VBUS_OFF:
> > +               musb->xceiv->otg->state = OTG_STATE_B_IDLE;
> > +               devctl &= ~MUSB_DEVCTL_SESSION;
> > +               musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
> > +               phy_power_off(glue->phy);
> > +               break;
> > +       case MTK_VBUS_VALID:
> > +               phy_power_on(glue->phy);
> > +               glue->phy_mode = PHY_MODE_USB_DEVICE;
> > +               phy_set_mode(glue->phy, glue->phy_mode);
> > +               MUSB_DEV_MODE(musb);
> > +               break;
> > +       default:
> > +               dev_err(glue->dev, "invalid state\n");
> > +       }
> > +}
> > +
> > +static int mtk_musb_id_notifier(struct notifier_block *nb,
> > +                               unsigned long event, void *ptr)
> > +{
> > +       struct mtk_glue *glue = container_of(nb, struct mtk_glue, id_nb);
> > +
> > +       if (event)
> > +               mtk_musb_set_mailbox(glue, MTK_ID_GROUND);
> > +       else
> > +               mtk_musb_set_mailbox(glue, MTK_ID_FLOAT);
> > +
> > +       return NOTIFY_DONE;
> > +}
> > +
> > +static int mtk_musb_vbus_notifier(struct notifier_block *nb,
> > +                                 unsigned long event, void *ptr)
> > +{
> > +       struct mtk_glue *glue = container_of(nb, struct mtk_glue, vbus_nb);
> > +
> > +       if (event)
> > +               mtk_musb_set_mailbox(glue, MTK_VBUS_VALID);
> > +       else
> > +               mtk_musb_set_mailbox(glue, MTK_VBUS_OFF);
> > +
> > +       return NOTIFY_DONE;
> > +}
> > +
> > +static void mtk_otg_switch_init(struct mtk_glue *glue)
> > +{
> > +       int ret;
> > +
> > +       /* extcon is optional */
> > +       if (!glue->edev)
> > +               return;
> > +
> > +       glue->vbus_nb.notifier_call = mtk_musb_vbus_notifier;
> > +       ret = devm_extcon_register_notifier(glue->dev, glue->edev, EXTCON_USB,
> > +                                           &glue->vbus_nb);
> > +       if (ret < 0)
> > +               dev_err(glue->dev, "failed to register notifier for USB\n");
> > +
> > +       glue->id_nb.notifier_call = mtk_musb_id_notifier;
> > +       ret = devm_extcon_register_notifier(glue->dev, glue->edev,
> > +                                           EXTCON_USB_HOST, &glue->id_nb);
> > +       if (ret < 0)
> > +               dev_err(glue->dev, "failed to register notifier for USB-HOST\n");
> > +
> > +       dev_dbg(glue->dev, "EXTCON_USB: %d, EXTCON_USB_HOST: %d\n",
> > +               extcon_get_state(glue->edev, EXTCON_USB),
> > +               extcon_get_state(glue->edev, EXTCON_USB_HOST));
> > +
> > +       /* default as host, switch to device mode if needed */
> > +       if (extcon_get_state(glue->edev, EXTCON_USB_HOST) == false)
> > +               mtk_musb_set_mailbox(glue, MTK_ID_FLOAT);
> > +       if (extcon_get_state(glue->edev, EXTCON_USB) == true)
> > +               mtk_musb_set_mailbox(glue, MTK_VBUS_VALID);
> > +}
> > +
> > +static irqreturn_t generic_interrupt(int irq, void *__hci)
> > +{
> > +       unsigned long flags;
> > +       irqreturn_t retval = IRQ_NONE;
> > +       struct musb *musb = __hci;
> > +
> > +       spin_lock_irqsave(&musb->lock, flags);
> > +       musb->int_usb = musb_clearb(musb->mregs, MUSB_INTRUSB);
> > +       musb->int_rx = musb_clearw(musb->mregs, MUSB_INTRRX);
> > +       musb->int_tx = musb_clearw(musb->mregs, MUSB_INTRTX);
> > +
> > +       if (musb->int_usb || musb->int_tx || musb->int_rx)
> > +               retval = musb_interrupt(musb);
> > +
> > +       spin_unlock_irqrestore(&musb->lock, flags);
> > +
> > +       return retval;
> > +}
> > +
> > +static irqreturn_t mtk_musb_interrupt(int irq, void *dev_id)
> > +{
> > +       irqreturn_t retval = IRQ_NONE;
> > +       struct musb *musb = (struct musb *)dev_id;
> > +       u32 l1_ints;
> > +
> > +       l1_ints = musb_readl(musb->mregs, USB_L1INTS) &
> > +                       musb_readl(musb->mregs, USB_L1INTM);
> > +
> > +       if (l1_ints & (TX_INT_STATUS | RX_INT_STATUS | USBCOM_INT_STATUS))
> > +               retval = generic_interrupt(irq, musb);
> > +
> > +#if defined(CONFIG_USB_INVENTRA_DMA)
> > +       if (l1_ints & DMA_INT_STATUS)
> > +               retval = dma_controller_irq(irq, musb->dma_controller);
> > +#endif
> > +       return retval;
> > +}
> > +
> > +static u32 mtk_musb_busctl_offset(u8 epnum, u16 offset)
> > +{
> > +       return MTK_MUSB_TXFUNCADDR + offset + 8 * epnum;
> > +}
> > +
> > +static u8 mtk_musb_clearb(void __iomem *addr, unsigned int offset)
> > +{
> > +       u8 data;
> > +
> > +       /* W1C */
> > +       data = musb_readb(addr, offset);
> > +       musb_writeb(addr, offset, data);
> > +       return data;
> > +}
> > +
> > +static u16 mtk_musb_clearw(void __iomem *addr, unsigned int offset)
> > +{
> > +       u16 data;
> > +
> > +       /* W1C */
> > +       data = musb_readw(addr, offset);
> > +       musb_writew(addr, offset, data);
> > +       return data;
> > +}
> > +
> > +static int mtk_musb_init(struct musb *musb)
> > +{
> > +       struct device *dev = musb->controller;
> > +       struct mtk_glue *glue = dev_get_drvdata(dev->parent);
> > +       int ret;
> > +
> > +       glue->musb = musb;
> > +       musb->phy = glue->phy;
> > +       musb->xceiv = glue->xceiv;
> > +       musb->is_host = false;
> > +       musb->isr = mtk_musb_interrupt;
> > +       ret = phy_init(glue->phy);
> > +       if (ret)
> > +               return ret;
> > +
> > +       ret = phy_power_on(glue->phy);
> > +       if (ret) {
> > +               phy_exit(glue->phy);
> > +               return ret;
> > +       }
> > +
> > +       phy_set_mode(glue->phy, glue->phy_mode);
> > +
> > +#if defined(CONFIG_USB_INVENTRA_DMA)
> > +       musb_writel(musb->mregs, MUSB_HSDMA_INTR,
> > +                   DMA_INTR_STATUS_MSK | DMA_INTR_UNMASK_SET_MSK);
> > +#endif
> > +       musb_writel(musb->mregs, USB_L1INTM, TX_INT_STATUS | RX_INT_STATUS |
> > +                   USBCOM_INT_STATUS | DMA_INT_STATUS);
> > +       return 0;
> > +}
> > +
> > +static u16 mtk_musb_get_toggle(struct musb_qh *qh, int is_out)
> > +{
> > +       struct musb *musb = qh->hw_ep->musb;
> > +       u8 epnum = qh->hw_ep->epnum;
> > +       u16 toggle;
> > +
> > +       if (is_out)
> > +               toggle = musb_readw(musb->mregs, MUSB_TXTOG);
> > +       else
> > +               toggle = musb_readw(musb->mregs, MUSB_RXTOG);
> > +
> > +       return toggle & (1 << epnum);
> > +}
> > +
> > +static u16 mtk_musb_set_toggle(struct musb_qh *qh, int is_out, struct urb *urb)
> > +{
> > +       struct musb *musb = qh->hw_ep->musb;
> > +       u8 epnum = qh->hw_ep->epnum;
> > +       u16 toggle;
> > +
> > +       toggle = usb_gettoggle(urb->dev, qh->epnum, is_out);
> > +
> > +       if (is_out) {
> > +               musb_writew(musb->mregs, MUSB_TXTOGEN, (1 << epnum));
> > +               musb_writew(musb->mregs, MUSB_TXTOG, (toggle << epnum));
> > +       } else {
> > +               musb_writew(musb->mregs, MUSB_RXTOGEN, (1 << epnum));
> > +               musb_writew(musb->mregs, MUSB_RXTOG, (toggle << epnum));
> > +       }
> > +
> > +       return 0;
> > +}
> > +
> > +static int mtk_musb_set_mode(struct musb *musb, u8 mode)
> > +{
> > +       struct device *dev = musb->controller;
> > +       struct mtk_glue *glue = dev_get_drvdata(dev->parent);
> > +       enum phy_mode new_mode;
> > +
> > +       switch (mode) {
> > +       case MUSB_HOST:
> > +               new_mode = PHY_MODE_USB_HOST;
> > +               mtk_musb_set_vbus(musb, 1);
> > +               break;
> > +       case MUSB_PERIPHERAL:
> > +               new_mode = PHY_MODE_USB_DEVICE;
> > +               break;
> > +       case MUSB_OTG:
> > +               new_mode = PHY_MODE_USB_HOST;
> > +               break;
> > +       default:
> > +               dev_err(musb->controller->parent,
> > +                       "Error requested mode not supported by this kernel\n");
> > +               return -EINVAL;
> > +       }
> > +       if (glue->phy_mode == new_mode)
> > +               return 0;
> > +
> > +       mtk_musb_set_mailbox(glue, MTK_ID_GROUND);
> > +       return 0;
> > +}
> > +
> > +static int mtk_musb_exit(struct musb *musb)
> > +{
> > +       struct device *dev = musb->controller;
> > +       struct mtk_glue *glue = dev_get_drvdata(dev->parent);
> > +
> > +       phy_power_off(glue->phy);
> > +       phy_exit(glue->phy);
> > +       mtk_musb_clks_disable(glue);
> > +
> > +       pm_runtime_put_sync(dev);
> > +       pm_runtime_disable(dev);
> > +       return 0;
> > +}
> > +
> > +static const struct musb_platform_ops mtk_musb_ops = {
> > +       .quirks = MUSB_DMA_INVENTRA,
> > +       .init = mtk_musb_init,
> > +       .get_toggle = mtk_musb_get_toggle,
> > +       .set_toggle = mtk_musb_set_toggle,
> > +       .exit = mtk_musb_exit,
> > +#ifdef CONFIG_USB_INVENTRA_DMA
> > +       .dma_init = musbhs_dma_controller_create_noirq,
> > +       .dma_exit = musbhs_dma_controller_destroy,
> > +#endif
> > +       .clearb = mtk_musb_clearb,
> > +       .clearw = mtk_musb_clearw,
> > +       .busctl_offset = mtk_musb_busctl_offset,
> > +       .set_mode = mtk_musb_set_mode,
> > +       .set_vbus = mtk_musb_set_vbus,
> > +};
> > +
> > +#define MTK_MUSB_MAX_EP_NUM    8
> > +#define MTK_MUSB_RAM_BITS      11
> > +
> > +static struct musb_fifo_cfg mtk_musb_mode_cfg[] = {
> > +       { .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, },
> > +       { .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, },
> > +       { .hw_ep_num = 2, .style = FIFO_TX, .maxpacket = 512, },
> > +       { .hw_ep_num = 2, .style = FIFO_RX, .maxpacket = 512, },
> > +       { .hw_ep_num = 3, .style = FIFO_TX, .maxpacket = 512, },
> > +       { .hw_ep_num = 3, .style = FIFO_RX, .maxpacket = 512, },
> > +       { .hw_ep_num = 4, .style = FIFO_TX, .maxpacket = 512, },
> > +       { .hw_ep_num = 4, .style = FIFO_RX, .maxpacket = 512, },
> > +       { .hw_ep_num = 5, .style = FIFO_TX, .maxpacket = 512, },
> > +       { .hw_ep_num = 5, .style = FIFO_RX, .maxpacket = 512, },
> > +       { .hw_ep_num = 6, .style = FIFO_TX, .maxpacket = 1024, },
> > +       { .hw_ep_num = 6, .style = FIFO_RX, .maxpacket = 1024, },
> > +       { .hw_ep_num = 7, .style = FIFO_TX, .maxpacket = 512, },
> > +       { .hw_ep_num = 7, .style = FIFO_RX, .maxpacket = 64, },
> > +};
> > +
> > +static const struct musb_hdrc_config mtk_musb_hdrc_config = {
> > +       .fifo_cfg = mtk_musb_mode_cfg,
> > +       .fifo_cfg_size = ARRAY_SIZE(mtk_musb_mode_cfg),
> > +       .multipoint = true,
> > +       .dyn_fifo = true,
> > +       .num_eps = MTK_MUSB_MAX_EP_NUM,
> > +       .ram_bits = MTK_MUSB_RAM_BITS,
> > +};
> > +
> > +static const struct platform_device_info mtk_dev_info = {
> > +       .name = "musb-hdrc",
> > +       .id = PLATFORM_DEVID_AUTO,
> > +       .dma_mask = DMA_BIT_MASK(32),
> > +};
> > +
> > +static int mtk_musb_probe(struct platform_device *pdev)
> > +{
> > +       struct musb_hdrc_platform_data *pdata;
> > +       struct mtk_glue *glue;
> > +       struct platform_device_info pinfo;
> > +       struct device *dev = &pdev->dev;
> > +       struct device_node *np = dev->of_node;
> > +       struct device_node *child, *extcon_node;
> > +       int ret = -ENOMEM;
> > +
> > +       glue = devm_kzalloc(dev, sizeof(*glue), GFP_KERNEL);
> > +       if (!glue)
> > +               return -ENOMEM;
> > +
> > +       glue->dev = dev;
> > +       pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
> > +       if (!pdata)
> > +               return -ENOMEM;
> > +
> > +       ret = mtk_musb_clks_get(glue);
> > +       if (ret)
> > +               return ret;
> > +
> > +       pdata->config = &mtk_musb_hdrc_config;
> > +       pdata->platform_ops = &mtk_musb_ops;
> > +
> > +       glue->vbus = devm_regulator_get(dev, "vbus");
> > +       if (IS_ERR(glue->vbus)) {
> > +               dev_err(dev, "fail to get vbus\n");
> > +               return PTR_ERR(glue->vbus);
> > +       }
> > +
> > +       child = of_get_child_by_name(np, "connector");
> > +       if (!child) {
> > +               dev_err(dev, "failed to find usb connector node\n");
> > +               return ERR_PTR(-ENODEV);
> 
> The 'probe' function is returning an 'int' and not a pointer. This
> line should trigger a warning.
OK, thanks. 

> > +       }
> > +
> > +       extcon_node = of_parse_phandle(child, "extcon", 0);
> > +       if (!extcon_node) {
> > +               dev_err(dev, "failed to get extcon phandle");
> > +               return ERR_PTR(-ENODEV);
> 
> Same here
OK, thanks. 

> > +       }
> > +
> > +       glue->edev = extcon_find_edev_by_node(extcon_node);
> > +       if (IS_ERR(glue->edev)) {
> > +               dev_err(dev, "fail to get extcon\n");
> > +               return PTR_ERR(glue->edev);
> > +       }
> > +
> > +       pdata->mode = usb_get_dr_mode(dev);
> > +       switch (pdata->mode) {
> > +       case USB_DR_MODE_HOST:
> > +               glue->phy_mode = PHY_MODE_USB_HOST;
> > +               break;
> > +       case USB_DR_MODE_PERIPHERAL:
> > +               glue->phy_mode = PHY_MODE_USB_DEVICE;
> > +               break;
> > +       default:
> > +               pdata->mode = USB_DR_MODE_OTG;
> > +               /* FALL THROUGH */
> > +       case USB_DR_MODE_OTG:
> > +               glue->phy_mode = PHY_MODE_USB_OTG;
> > +               break;
> > +       }
> > +
> > +       glue->phy = devm_of_phy_get_by_index(dev, np, 0);
> > +       if (IS_ERR(glue->phy)) {
> > +               dev_err(dev, "fail to getting phy %ld\n",
> > +                       PTR_ERR(glue->phy));
> > +               return PTR_ERR(glue->phy);
> > +       }
> > +
> > +       glue->usb_phy = usb_phy_generic_register();
> > +       if (IS_ERR(glue->usb_phy)) {
> > +               dev_err(dev, "fail to registering usb-phy %ld\n",
> > +                       PTR_ERR(glue->usb_phy));
> > +               return PTR_ERR(glue->usb_phy);
> > +       }
> > +
> > +       glue->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
> > +       if (IS_ERR(glue->xceiv)) {
> > +               dev_err(dev, "fail to getting usb-phy %d\n", ret);
> > +               ret = PTR_ERR(glue->xceiv);
> > +               goto err_unregister_usb_phy;
> > +       }
> > +
> > +       platform_set_drvdata(pdev, glue);
> > +       pm_runtime_enable(dev);
> > +       pm_runtime_get_sync(dev);
> > +
> > +       ret = mtk_musb_clks_enable(glue);
> > +       if (ret)
> > +               goto err_enable_clk;
> > +
> > +       pinfo = mtk_dev_info;
> > +       pinfo.parent = dev;
> > +       pinfo.res = pdev->resource;
> > +       pinfo.num_res = pdev->num_resources;
> > +       pinfo.data = pdata;
> > +       pinfo.size_data = sizeof(*pdata);
> > +
> > +       glue->musb_pdev = platform_device_register_full(&pinfo);
> > +       if (IS_ERR(glue->musb_pdev)) {
> > +               ret = PTR_ERR(glue->musb_pdev);
> > +               dev_err(dev, "failed to register musb device: %d\n", ret);
> > +               goto err_device_register;
> > +       }
> > +
> > +       if (pdata->mode == USB_DR_MODE_OTG)
> > +               mtk_otg_switch_init(glue);
> > +
> > +       return 0;
> > +
> > +err_device_register:
> > +       mtk_musb_clks_disable(glue);
> > +err_enable_clk:
> > +       pm_runtime_put_sync(dev);
> > +       pm_runtime_disable(dev);
> > +err_unregister_usb_phy:
> > +       usb_phy_generic_unregister(glue->usb_phy);
> > +       return ret;
> > +}
> > +
> > +static int mtk_musb_remove(struct platform_device *pdev)
> > +{
> > +       struct mtk_glue *glue = platform_get_drvdata(pdev);
> > +       struct platform_device *usb_phy = glue->usb_phy;
> > +
> > +       platform_device_unregister(glue->musb_pdev);
> > +       usb_phy_generic_unregister(usb_phy);
> > +
> > +       return 0;
> > +}
> > +
> > +#ifdef CONFIG_OF
> > +static const struct of_device_id mtk_musb_match[] = {
> > +       {.compatible = "mediatek,mtk-musb",},
> > +       {},
> > +};
> > +MODULE_DEVICE_TABLE(of, mtk_musb_match);
> > +#endif
> > +
> > +static struct platform_driver mtk_musb_driver = {
> > +       .probe = mtk_musb_probe,
> > +       .remove = mtk_musb_remove,
> > +       .driver = {
> > +                  .name = "musb-mtk",
> > +                  .of_match_table = of_match_ptr(mtk_musb_match),
> > +       },
> > +};
> > +
> > +module_platform_driver(mtk_musb_driver);
> > +
> > +MODULE_DESCRIPTION("MediaTek MUSB Glue Layer");
> > +MODULE_AUTHOR("Min Guo <min.guo@mediatek.com>");
> > +MODULE_LICENSE("GPL v2");
> > --
> > 1.9.1
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel



^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2019-04-01  5:35 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-19  7:36 [PATCH v5 0/6] Add MediaTek MUSB Controller Driver min.guo
2019-02-19  7:36 ` [PATCH v5 1/6] dt-bindings: usb: musb: Add support for MediaTek musb controller min.guo
2019-02-22 16:49   ` Rob Herring
2019-02-25  1:36     ` Min Guo
2019-03-04 17:42       ` Rob Herring
2019-03-05  1:19         ` Min Guo
2019-02-19  7:36 ` [PATCH v5 2/6] arm: dts: mt2701: Add usb2 device nodes min.guo
2019-02-19  7:36 ` [PATCH v5 3/6] usb: musb: Add get/set toggle hooks min.guo
2019-02-19  7:36 ` [PATCH v5 4/6] usb: musb: Add noirq type of dma create interface min.guo
2019-02-19  7:36 ` [PATCH v5 5/6] usb: musb: Add musb_clearb/w() interface min.guo
2019-02-19  7:36 ` [PATCH v5 6/6] usb: musb: Add support for MediaTek musb controller min.guo
2019-03-30  8:52   ` Fabien Parent
2019-04-01  5:35     ` Min Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).