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

Commit 6594b2d7 authored by Jon Povey's avatar Jon Povey Committed by Felipe Balbi
Browse files

usb: musb: davinci: Fix build breakage 



This appears to have been broken by
commit 5cfb19ac
(ARM: davinci: streamline sysmod access)

For now, fix by hardcoding USB_PHY_CTRL and DM355_DEEPSLEEP

Tested on DM365 with defconfig changes.

Signed-off-by: default avatarJon Povey <jon.povey@racelogic.co.uk>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
CC: Felipe Balbi <balbi@ti.com>
Cc: <stable@vger.kernel.org> # v3.4.x
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 80e91fd5

drivers/usb/musb/davinci.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/dma-mapping.h>



#include <mach/cputype.h>

#include <mach/hardware.h>



#include <asm/mach-types.h>

drivers/usb/musb/davinci.h

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */



/* Integrated highspeed/otg PHY */

#define USBPHY_CTL_PADDR	(DAVINCI_SYSTEM_MODULE_BASE + 0x34)

#define USBPHY_CTL_PADDR	0x01c40034

#define USBPHY_DATAPOL		BIT(11)	/* (dm355) switch D+/D- */

#define USBPHY_PHYCLKGD		BIT(8)

#define USBPHY_SESNDEN		BIT(7)	/* v(sess_end) comparator */
@@ -27,7 +27,7 @@ 
#define USBPHY_OTGPDWN		BIT(1)

#define USBPHY_PHYPDWN		BIT(0)



#define DM355_DEEPSLEEP_PADDR	(DAVINCI_SYSTEM_MODULE_BASE + 0x48)

#define DM355_DEEPSLEEP_PADDR	0x01c40048

#define DRVVBUS_FORCE		BIT(2)

#define DRVVBUS_OVERRIDE	BIT(1)