From patchwork Wed Aug 6 17:03:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 4687291 Return-Path: X-Original-To: patchwork-linux-arm@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 72C509F37E for ; Wed, 6 Aug 2014 17:05:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92D34200DB for ; Wed, 6 Aug 2014 17:05:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B22A200D7 for ; Wed, 6 Aug 2014 17:05:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XF4cr-0003hh-LK; Wed, 06 Aug 2014 17:03:45 +0000 Received: from mail-we0-f176.google.com ([74.125.82.176]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XF4co-0003de-VW for linux-arm-kernel@lists.infradead.org; Wed, 06 Aug 2014 17:03:43 +0000 Received: by mail-we0-f176.google.com with SMTP id q58so2941892wes.7 for ; Wed, 06 Aug 2014 10:03:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=0sm+IIcNUbkZZR20gq2Qi793oDvCh1OZR9cOATD8oUw=; b=RL5LE6bw3dXw7gfP9wwXSlEwMPgfKKS9fGv25WJwqhBssERvmHxB6jtPHPZydV5jVI 89pXBJFBJDpSa8R2F+dM+88hVXpcMTtvKpHYOS1Xh1at2R025WMXghld/eI4EtOQVsUT d9yKGCcJXq/qbxDcwvnBtNq7cVaLpppcQDwa5QnJ8FuuvS2i2UVN1MSenbVKJnRdte8r fKQl1yj5RiSJ0gwRJ4IXjVkKivwEfk9ooGJf9BSHetWaXSqgp8CKqDCH/q5Bvk1+b564 Nz4ColbG/3V5nEf9ymaHqKMtMlHuZ+bM+7SYu7go/6SX4IW/bN1Ny7gvY96kZPsGvwLD 1eIw== X-Gm-Message-State: ALoCoQn3vDvo+ubam7SRaWBLXzXKFL+Y2noXk3THBbIu46gtDdPYbfMp3aI4uLWiCsI9YlNgdEXj X-Received: by 10.180.221.172 with SMTP id qf12mr17668799wic.18.1407344600913; Wed, 06 Aug 2014 10:03:20 -0700 (PDT) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id f6sm3712805wja.25.2014.08.06.10.03.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 10:03:20 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, stern@rowland.harvard.edu, srinivas.kandagatla@gmail.com, maxime.coquelin@st.com, patrice.chotard@st.com, arnd@arndb.de Subject: [PATCH v3 1/6] usb: host: usb-st-common: Add common code required by ohci-st and ehci-st Date: Wed, 6 Aug 2014 18:03:04 +0100 Message-Id: <1407344589-24863-2-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407344589-24863-1-git-send-email-peter.griffin@linaro.org> References: <1407344589-24863-1-git-send-email-peter.griffin@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140806_100343_161296_FE62027D X-CRM114-Status: GOOD ( 15.71 ) X-Spam-Score: -0.7 (/) Cc: peter.griffin@linaro.org, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, lee.jones@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 This patch abstracts out some common code required by both the ehci-st and ohci-st drivers. Signed-off-by: Peter Griffin --- drivers/usb/host/usb-st-common.c | 99 ++++++++++++++++++++++++++++++++++++++++ drivers/usb/host/usb-st-common.h | 34 ++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 drivers/usb/host/usb-st-common.c create mode 100644 drivers/usb/host/usb-st-common.h diff --git a/drivers/usb/host/usb-st-common.c b/drivers/usb/host/usb-st-common.c new file mode 100644 index 0000000..ddfdbf6 --- /dev/null +++ b/drivers/usb/host/usb-st-common.c @@ -0,0 +1,99 @@ +/* + * Common code shared between ehci-st.c and ohci-st.c + * + * Copyright (C) 2014 STMicroelectronics – All Rights Reserved + * + * Author: Peter Griffin + * + * Derived from ohci-platform.c and ehci-platform.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include + +#include "usb-st-common.h" + +int st_usb_platform_power_on(struct st_platform_priv *priv) +{ + int clk, ret; + + if (priv->pwr) { + ret = reset_control_deassert(priv->pwr); + if (ret) + return ret; + } + + if (priv->rst) { + ret = reset_control_deassert(priv->rst); + if (ret) + goto err_assert_power; + } + + /* some SoCs don't have a dedicated 48Mhz clock, but those that do + need the rate to be explicitly set */ + if (priv->clk48) { + ret = clk_set_rate(priv->clk48, 48000000); + if (ret) + goto err_assert_reset; + } + + for (clk = 0; clk < USB_MAX_CLKS && priv->clks[clk]; clk++) { + ret = clk_prepare_enable(priv->clks[clk]); + if (ret) + goto err_disable_clks; + } + + if (priv->phy) { + ret = phy_init(priv->phy); + if (ret) + goto err_disable_clks; + + ret = phy_power_on(priv->phy); + if (ret) + goto err_exit_phy; + } + + return 0; + +err_exit_phy: + phy_exit(priv->phy); +err_disable_clks: + while (--clk >= 0) + clk_disable_unprepare(priv->clks[clk]); +err_assert_reset: + if (priv->rst) + ret = reset_control_assert(priv->rst); +err_assert_power: + if (priv->pwr) + ret = reset_control_assert(priv->pwr); + + return ret; +} +EXPORT_SYMBOL(st_usb_platform_power_on); + +void st_usb_platform_power_off(struct st_platform_priv *priv) +{ + int clk; + + if (priv->pwr) + reset_control_assert(priv->pwr); + + if (priv->rst) + reset_control_assert(priv->rst); + + if (priv->phy) { + phy_power_off(priv->phy); + phy_exit(priv->phy); + } + + for (clk = USB_MAX_CLKS - 1; clk >= 0; clk--) + if (priv->clks[clk]) + clk_disable_unprepare(priv->clks[clk]); + +} +EXPORT_SYMBOL(st_usb_platform_power_off); diff --git a/drivers/usb/host/usb-st-common.h b/drivers/usb/host/usb-st-common.h new file mode 100644 index 0000000..5ee7fb0 --- /dev/null +++ b/drivers/usb/host/usb-st-common.h @@ -0,0 +1,34 @@ +/* + * ST ehci / ohci common header file + * + * Copyright (C) 2014 STMicroelectronics – All Rights Reserved + * + * Author: Peter Griffin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#ifndef __USB_ST_COMMON_H +#define __USB_ST_COMMON_H + +#include +#include +#include + +#define USB_MAX_CLKS 3 + +struct st_platform_priv { + struct clk *clks[USB_MAX_CLKS]; + struct clk *clk48; + struct reset_control *rst; + struct reset_control *pwr; + struct phy *phy; +}; + +int st_usb_platform_power_on(struct st_platform_priv *priv); +void st_usb_platform_power_off(struct st_platform_priv *priv); + +#endif /* __USB_ST_COMMON_H */