From: ahaslam@baylibre.com (ahaslam at baylibre.com)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH/RFT 04/12] USB: ohci-da8xx: Divide power up time in the ohci driver
Date: Fri, 7 Oct 2016 18:42:49 +0200 [thread overview]
Message-ID: <1475858577-10366-5-git-send-email-ahaslam@baylibre.com> (raw)
In-Reply-To: <1475858577-10366-1-git-send-email-ahaslam@baylibre.com>
From: Axel Haslam <ahaslam@baylibre.com>
Instead of requiring platform data to know that the effective time
should be diveded by two, Make that operation in the driver so that
users (platform board files/Device tree) dont have to worry about it.
Signed-off-by: Axel Haslam <ahaslam@baylibre.com>
---
arch/arm/mach-davinci/board-da830-evm.c | 2 +-
arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +-
drivers/usb/host/ohci-da8xx.c | 8 ++++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 18d2b10..8d126e4 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -94,7 +94,7 @@ static struct da8xx_ohci_platform_data da830_evm_usb11_pdata = {
.ocic_notify = da830_evm_usb_ocic_notify,
/* TPS2065 switch @ 5V */
- .potpgt = (3 + 1) / 2, /* 3 ms max */
+ .potpgt = 3, /* 3 ms max */
};
static irqreturn_t da830_evm_usb_ocic_irq(int irq, void *dev_id)
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index a2bf3eb..f9cd388 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -232,7 +232,7 @@ static struct da8xx_ohci_platform_data omapl138_hawk_usb11_pdata = {
.get_oci = hawk_usb_get_oci,
.ocic_notify = hawk_usb_ocic_notify,
/* TPS2087 switch @ 5V */
- .potpgt = (3 + 1) / 2, /* 3 ms max */
+ .potpgt = 3 /* 3 ms max */
};
static irqreturn_t omapl138_hawk_usb_ocic_irq(int irq, void *dev_id)
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index 8ed9a52..3c85d6c 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -115,8 +115,12 @@ static int ohci_da8xx_init(struct usb_hcd *hcd)
rh_a &= ~RH_A_NOCP;
rh_a |= RH_A_OCPM;
}
- rh_a &= ~RH_A_POTPGT;
- rh_a |= pdata->potpgt << 24;
+
+ if (pdata->potpgt) {
+ rh_a &= ~RH_A_POTPGT;
+ rh_a |= (DIV_ROUND_UP(pdata->potpgt, 2) << 24);
+ }
+
ohci_writel(ohci, rh_a, &ohci->regs->roothub.a);
return result;
--
2.7.1
next prev parent reply other threads:[~2016-10-07 16:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 16:42 [PATCH/RFT 00/12] Add DT support for ohci-da8xx ahaslam at baylibre.com
2016-10-07 16:42 ` [PATCH/RFT 01/12] ARM: davinci: da8xx: Enable the usb20 "per" clk on phy_clk_enable ahaslam at baylibre.com
2016-10-07 16:42 ` [PATCH/RFT 02/12] ARM: davinci: hawk: add full constraints for ohci plat boot ahaslam at baylibre.com
2016-10-07 16:42 ` [PATCH/RFT 03/12] ARM: davinci: rename root_hub to platform_data ahaslam at baylibre.com
2016-10-07 16:42 ` ahaslam at baylibre.com [this message]
2016-10-07 16:42 ` [PATCH/RFT 05/12] USB: ohci-da8xx: Fix probe for devices with no vbus/oci gpio ahaslam at baylibre.com
2016-10-07 16:42 ` [PATCH/RFT 06/12] ARM: davinci: hawk: Remove oci and vbus gpios ahaslam at baylibre.com
2016-10-07 16:42 ` [PATCH/RFT 07/12] USB: ohci-da8xx: Request gpios and handle interrupt in the driver ahaslam at baylibre.com
2016-10-10 23:18 ` David Lechner
2016-10-12 15:01 ` Axel Haslam
2016-10-12 23:31 ` David Lechner
2016-10-07 16:42 ` [PATCH/RFT 08/12] ARM: davinci: register the usb20_phy clock on the SoC file ahaslam at baylibre.com
2016-10-10 23:27 ` David Lechner
2016-10-07 16:42 ` [PATCH/RFT 09/12] usb: host: ohci-da8xx: Add devicetree bindings documentation ahaslam at baylibre.com
2016-10-10 21:35 ` Rob Herring
2016-10-10 23:33 ` David Lechner
2016-10-07 16:42 ` [PATCH/RFT 10/12] USB: ohci-da8xx: Add device tree support ahaslam at baylibre.com
2016-10-07 16:42 ` [PATCH/RFT 11/12] ARM: dts: da850: Add the usb ohci device node ahaslam at baylibre.com
2016-10-07 17:11 ` Sergei Shtylyov
2016-10-07 16:42 ` [PATCH/RFT 12/12] ARM: dts: da850-lcdk: enable ohci usb ahaslam at baylibre.com
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1475858577-10366-5-git-send-email-ahaslam@baylibre.com \
--to=ahaslam@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).