From c4661224359a99c4f973162b5424cb6a3d448022 Mon Sep 17 00:00:00 2001
From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Fri, 17 May 2013 10:52:55 +0200
Subject: [PATCH] --- yaml --- r: 376047 b: refs/heads/master c:
 642f2ecc092f4d2d5a9b7219090531508017c324 h: refs/heads/master i:   376045:
 829d7c95389af429fdbf689d5f9e571dddcdae82   376043:
 8cde99bdf516d174bfd3bcf9af349f8392c272eb   376039:
 7dc425be518800ae6755a1fc24e0a16c09e7b475   376031:
 4ab531131536329db82b85057267ef6cafb8241a v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/dwc2/platform.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 86cf90e58b98..9d6b1f547ac5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91ec61f8f01cf32868e2ed2fa96a299e77964055
+refs/heads/master: 642f2ecc092f4d2d5a9b7219090531508017c324
diff --git a/trunk/drivers/staging/dwc2/platform.c b/trunk/drivers/staging/dwc2/platform.c
index 1f3d581a1078..afc515bd8233 100644
--- a/trunk/drivers/staging/dwc2/platform.c
+++ b/trunk/drivers/staging/dwc2/platform.c
@@ -95,6 +95,14 @@ static int dwc2_driver_probe(struct platform_device *dev)
 
 	hsotg->dev = &dev->dev;
 
+	/*
+	 * Use reasonable defaults so platforms don't have to provide these.
+	 */
+	if (!dev->dev.dma_mask)
+		dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
+	if (!dev->dev.coherent_dma_mask)
+		dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+
 	irq = platform_get_irq(dev, 0);
 	if (irq < 0) {
 		dev_err(&dev->dev, "missing IRQ resource\n");