From patchwork Mon Nov 25 19:39:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 3234071 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8B4799F3A0 for ; Mon, 25 Nov 2013 19:40:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D31F4202DD for ; Mon, 25 Nov 2013 19:40:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FEC7202EA for ; Mon, 25 Nov 2013 19:40:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757455Ab3KYTkG (ORCPT ); Mon, 25 Nov 2013 14:40:06 -0500 Received: from mail-bk0-f52.google.com ([209.85.214.52]:42900 "EHLO mail-bk0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757424Ab3KYTkE (ORCPT ); Mon, 25 Nov 2013 14:40:04 -0500 Received: by mail-bk0-f52.google.com with SMTP id u14so2164311bkz.39 for ; Mon, 25 Nov 2013 11:40:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1d+wnymrnluJ6KmynyF09JnGguQGM8qJ1ZKnwNeOqsg=; b=fGPLqw4/8nbBAzIzEqulUEByjVH7K6JGuXNG7vUE2AD9Sbn8jEB4iXQudBgTgyJixV EdynpK+gTq2JujK6z9ktSB5ubTvmj6TfaGDWyWtxoijaGDhpQ663R8XKwd2oOczid5QR UqQYdURUauA2H6YXxCemI0Ys48a2RfKAnflWRQeyVM3hl0nYfwAJmpNNSGhdU3bFbp5l QSYp2hv4whtpRMRbF37SaHG7h1/VY94wSR8KZqXFU1YULfDJ07npCzQaqgZ8aTVPyJAN FJKkrPh+miYEQ+x1E3EL8nNJJ+9G3kSVQxBhAUk7CQ8w4/hzO5THU6aD5LeJfs6sD5Wg WvmQ== X-Received: by 10.204.118.67 with SMTP id u3mr2784510bkq.41.1385408403179; Mon, 25 Nov 2013 11:40:03 -0800 (PST) Received: from tamtam.fritz.box (p54AF4EE7.dip0.t-ipconnect.de. [84.175.78.231]) by mx.google.com with ESMTPSA id qe6sm47775520bkb.5.2013.11.25.11.40.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Nov 2013 11:40:02 -0800 (PST) From: Daniel Mack To: balbi@ti.com Cc: bigeasy@linutronix.de, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, neumann@teufel.de, Daniel Mack Subject: [PATCH 1/5] usb: musb: conditionally save and restore the context on suspend Date: Mon, 25 Nov 2013 20:39:49 +0100 Message-Id: <1385408393-19707-2-git-send-email-zonque@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1385408393-19707-1-git-send-email-zonque@gmail.com> References: <1385408393-19707-1-git-send-email-zonque@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It appears not all platforms featuring a musb core need to save the musb core registers at suspend time and restore them on resume. The dsps platform does, however. So add a bit in struct musb_hdrc_platform_data to let platforms specify their need of such action being taken. Signed-off-by: Daniel Mack --- drivers/usb/musb/musb_core.c | 17 ++++++++++++++++- include/linux/usb/musb.h | 3 +++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 0a43329..a8ded57 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2202,6 +2202,7 @@ static int musb_suspend(struct device *dev) { struct musb *musb = dev_to_musb(dev); unsigned long flags; + struct musb_hdrc_platform_data *plat = dev_get_platdata(dev); spin_lock_irqsave(&musb->lock, flags); @@ -2215,16 +2216,30 @@ static int musb_suspend(struct device *dev) */ } + if (plat->restore_after_suspend) + musb_save_context(musb); + spin_unlock_irqrestore(&musb->lock, flags); return 0; } static int musb_resume_noirq(struct device *dev) { - /* for static cmos like DaVinci, register values were preserved + struct musb *musb = dev_to_musb(dev); + struct musb_hdrc_platform_data *plat = dev_get_platdata(dev); + + /* + * For static cmos like DaVinci, register values were preserved * unless for some reason the whole soc powered down or the USB * module got reset through the PSC (vs just being disabled). + * + * The plaform data tells us about the necessity of saving and + * restoring the context across a suspend cycle. */ + + if (plat->restore_after_suspend) + musb_restore_context(musb); + return 0; } diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h index eb50525..e5a581c 100644 --- a/include/linux/usb/musb.h +++ b/include/linux/usb/musb.h @@ -99,6 +99,9 @@ struct musb_hdrc_platform_data { /* MUSB_HOST, MUSB_PERIPHERAL, or MUSB_OTG */ u8 mode; + /* should the musb core restore registers after suspend? */ + u8 restore_after_suspend:1; + /* for clk_get() */ const char *clock;