hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: gadget: udc: renesas_usb3: add USB ID signal monitoring 

This usb 3.0 peripheral controller has a register (USB_OTG_STA) to monitor
the USB ID signal. So, this patch adds the ID signal monitoring to change
the mode to host (A-Host) or peripheral (B-Peripheral).
This patch also removes hardcoded setting as B-Peripheral mode.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Yoshihiro Shimoda 2017-03-30 11:16:04 +09:00 committed by Felipe Balbi
parent e92634cd4d
commit 77172a1f88
1 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
drivers/usb/gadget/udc/renesas_usb3.c
View File

@ -37,6 +37,9 @@
#define USB3_USB_INT_ENA_2 0x22c #define USB3_USB_INT_ENA_2 0x22c
#define USB3_STUP_DAT_0 0x230 #define USB3_STUP_DAT_0 0x230
#define USB3_STUP_DAT_1 0x234 #define USB3_STUP_DAT_1 0x234
#define USB3_USB_OTG_STA 0x268
#define USB3_USB_OTG_INT_STA 0x26c
#define USB3_USB_OTG_INT_ENA 0x270
#define USB3_P0_MOD 0x280 #define USB3_P0_MOD 0x280
#define USB3_P0_CON 0x288 #define USB3_P0_CON 0x288
#define USB3_P0_STA 0x28c #define USB3_P0_STA 0x28c
@ -124,6 +127,9 @@
/* USB_INT_ENA_2 and USB_INT_STA_2 */ /* USB_INT_ENA_2 and USB_INT_STA_2 */
#define USB_INT_2_PIPE(n) BIT(n) #define USB_INT_2_PIPE(n) BIT(n)
/* USB_OTG_STA, USB_OTG_INT_STA and USB_OTG_INT_ENA */
#define USB_OTG_IDMON BIT(4)
/* P0_MOD */ /* P0_MOD */
#define P0_MOD_DIR BIT(6) #define P0_MOD_DIR BIT(6)
@ -362,10 +368,6 @@ static void usb3_init_axi_bridge(struct renesas_usb3 *usb3)
static void usb3_init_epc_registers(struct renesas_usb3 *usb3) static void usb3_init_epc_registers(struct renesas_usb3 *usb3)
{ {
/* FIXME: How to change host / peripheral mode as well? */
usb3_set_bit(usb3, DRD_CON_PERI_CON, USB3_DRD_CON);
usb3_clear_bit(usb3, DRD_CON_VBOUT, USB3_DRD_CON);
usb3_write(usb3, ~0, USB3_USB_INT_STA_1); usb3_write(usb3, ~0, USB3_USB_INT_STA_1);
usb3_enable_irq_1(usb3, USB_INT_1_VBUS_CNG); usb3_enable_irq_1(usb3, USB_INT_1_VBUS_CNG);
} }
@ -538,11 +540,49 @@ static void usb3_check_vbus(struct renesas_usb3 *usb3)
} }
} }
static void usb3_set_mode(struct renesas_usb3 *usb3, bool host)
{
if (host)
usb3_clear_bit(usb3, DRD_CON_PERI_CON, USB3_DRD_CON);
else
usb3_set_bit(usb3, DRD_CON_PERI_CON, USB3_DRD_CON);
}
static void usb3_vbus_out(struct renesas_usb3 *usb3, bool enable)
{
if (enable)
usb3_set_bit(usb3, DRD_CON_VBOUT, USB3_DRD_CON);
else
usb3_clear_bit(usb3, DRD_CON_VBOUT, USB3_DRD_CON);
}
static void usb3_mode_config(struct renesas_usb3 *usb3, bool host, bool a_dev)
{
usb3_set_mode(usb3, host);
usb3_vbus_out(usb3, a_dev);
}
static bool usb3_is_a_device(struct renesas_usb3 *usb3)
{
return !(usb3_read(usb3, USB3_USB_OTG_STA) & USB_OTG_IDMON);
}
static void usb3_check_id(struct renesas_usb3 *usb3)
{
if (usb3_is_a_device(usb3))
usb3_mode_config(usb3, true, true);
else
usb3_mode_config(usb3, false, false);
}
static void renesas_usb3_init_controller(struct renesas_usb3 *usb3) static void renesas_usb3_init_controller(struct renesas_usb3 *usb3)
{ {
usb3_init_axi_bridge(usb3); usb3_init_axi_bridge(usb3);
usb3_init_epc_registers(usb3); usb3_init_epc_registers(usb3);
usb3_write(usb3, USB_OTG_IDMON, USB3_USB_OTG_INT_STA);
usb3_write(usb3, USB_OTG_IDMON, USB3_USB_OTG_INT_ENA);
usb3_check_id(usb3);
usb3_check_vbus(usb3); usb3_check_vbus(usb3);
} }
@ -551,6 +591,7 @@ static void renesas_usb3_stop_controller(struct renesas_usb3 *usb3)
usb3_disconnect(usb3); usb3_disconnect(usb3);
usb3_write(usb3, 0, USB3_P0_INT_ENA); usb3_write(usb3, 0, USB3_P0_INT_ENA);
usb3_write(usb3, 0, USB3_PN_INT_ENA); usb3_write(usb3, 0, USB3_PN_INT_ENA);
usb3_write(usb3, 0, USB3_USB_OTG_INT_ENA);
usb3_write(usb3, 0, USB3_USB_INT_ENA_1); usb3_write(usb3, 0, USB3_USB_INT_ENA_1);
usb3_write(usb3, 0, USB3_USB_INT_ENA_2); usb3_write(usb3, 0, USB3_USB_INT_ENA_2);
usb3_write(usb3, 0, USB3_AXI_INT_ENA); usb3_write(usb3, 0, USB3_AXI_INT_ENA);
@ -1474,10 +1515,22 @@ static void usb3_irq_epc_int_2(struct renesas_usb3 *usb3, u32 int_sta_2)
} }
} }
static void usb3_irq_idmon_change(struct renesas_usb3 *usb3)
{
usb3_check_id(usb3);
}
static void usb3_irq_otg_int(struct renesas_usb3 *usb3, u32 otg_int_sta)
{
if (otg_int_sta & USB_OTG_IDMON)
usb3_irq_idmon_change(usb3);
}
static void usb3_irq_epc(struct renesas_usb3 *usb3) static void usb3_irq_epc(struct renesas_usb3 *usb3)
{ {
u32 int_sta_1 = usb3_read(usb3, USB3_USB_INT_STA_1); u32 int_sta_1 = usb3_read(usb3, USB3_USB_INT_STA_1);
u32 int_sta_2 = usb3_read(usb3, USB3_USB_INT_STA_2); u32 int_sta_2 = usb3_read(usb3, USB3_USB_INT_STA_2);
u32 otg_int_sta = usb3_read(usb3, USB3_USB_OTG_INT_STA);
int_sta_1 &= usb3_read(usb3, USB3_USB_INT_ENA_1); int_sta_1 &= usb3_read(usb3, USB3_USB_INT_ENA_1);
if (int_sta_1) { if (int_sta_1) {
@ -1488,6 +1541,12 @@ static void usb3_irq_epc(struct renesas_usb3 *usb3)
int_sta_2 &= usb3_read(usb3, USB3_USB_INT_ENA_2); int_sta_2 &= usb3_read(usb3, USB3_USB_INT_ENA_2);
if (int_sta_2) if (int_sta_2)
usb3_irq_epc_int_2(usb3, int_sta_2); usb3_irq_epc_int_2(usb3, int_sta_2);
otg_int_sta &= usb3_read(usb3, USB3_USB_OTG_INT_ENA);
if (otg_int_sta) {
usb3_write(usb3, otg_int_sta, USB3_USB_OTG_INT_STA);
usb3_irq_otg_int(usb3, otg_int_sta);
}
} }
static irqreturn_t renesas_usb3_irq(int irq, void *_usb3) static irqreturn_t renesas_usb3_irq(int irq, void *_usb3)