Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cd27ffb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: ci13xxx_msm: Clear ULPI_SERIAL_EN for remote wakeup workaround"

parents 0b1955ff c178b5e4

drivers/usb/gadget/ci13xxx_msm.c

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -154,6 +154,7 @@ static void ci13xxx_msm_reset(void) 
	/* workaround for rx buffer collision issue */

	temp = readl_relaxed(USB_GENCONFIG);

	temp &= ~GENCONFIG_TXFIFO_IDLE_FORCE_DISABLE;

	temp &= ~GENCONFIG_ULPI_SERIAL_EN;

	writel_relaxed(temp, USB_GENCONFIG);



	if (udc->gadget.l1_supported)

include/linux/usb/msm_hsusb_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 


#define GENCONFIG_BAM_DISABLE (1 << 13)

#define GENCONFIG_TXFIFO_IDLE_FORCE_DISABLE (1 << 4)

#define GENCONFIG_ULPI_SERIAL_EN (1 << 5)



/* synopsys 28nm phy registers */

#define ULPI_PWR_CLK_MNG_REG	0x88