From: Florian Fainelli <florian@openwrt.org>
To: stern@rowland.harvard.edu
Cc: linux-usb@vger.kernel.org, Florian Fainelli <florian@openwrt.org>,
Anton Vorontsov <avorontsov@mvista.com>,
Russell King <linux@arm.linux.org.uk>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 09/24 v2] ARM: cns3xxx: use ehci platform driver
Date: Thu, 4 Oct 2012 17:17:37 +0200 [thread overview]
Message-ID: <1349363872-27004-10-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1349363872-27004-1-git-send-email-florian@openwrt.org>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
No change since v1
arch/arm/mach-cns3xxx/cns3420vb.c | 44 ++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c
index 2c5fb4c..906094c 100644
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
@@ -24,6 +24,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/partitions.h>
+#include <linux/usb/ehci_pdriver.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/hardware/gic.h>
@@ -32,6 +33,7 @@
#include <asm/mach/time.h>
#include <mach/cns3xxx.h>
#include <mach/irqs.h>
+#include <mach/pm.h>
#include "core.h"
#include "devices.h"
@@ -125,13 +127,53 @@ static struct resource cns3xxx_usb_ehci_resources[] = {
static u64 cns3xxx_usb_ehci_dma_mask = DMA_BIT_MASK(32);
+static int csn3xxx_usb_ehci_power_on(struct platform_device *pdev)
+{
+ /*
+ * EHCI and OHCI share the same clock and power,
+ * resetting twice would cause the 1st controller been reset.
+ * Therefore only do power up at the first up device, and
+ * power down at the last down device.
+ *
+ * Set USB AHB INCR length to 16
+ */
+ if (atomic_inc_return(&usb_pwr_ref) == 1) {
+ cns3xxx_pwr_power_up(1 << PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_USB);
+ cns3xxx_pwr_clk_en(1 << PM_CLK_GATE_REG_OFFSET_USB_HOST);
+ cns3xxx_pwr_soft_rst(1 << PM_SOFT_RST_REG_OFFST_USB_HOST);
+ __raw_writel((__raw_readl(MISC_CHIP_CONFIG_REG) | (0X2 << 24)),
+ MISC_CHIP_CONFIG_REG);
+ }
+
+ return 0;
+}
+
+static void csn3xxx_usb_ehci_power_off(struct platform_device *pdev)
+{
+ /*
+ * EHCI and OHCI share the same clock and power,
+ * resetting twice would cause the 1st controller been reset.
+ * Therefore only do power up at the first up device, and
+ * power down at the last down device.
+ */
+ if (atomic_dec_return(&usb_pwr_ref) == 0)
+ cns3xxx_pwr_clk_dis(1 << PM_CLK_GATE_REG_OFFSET_USB_HOST);
+}
+
+static struct usb_ehci_pdata cns3xxx_usb_ehci_pdata = {
+ .port_power_off = 1,
+ .power_on = csn3xxx_usb_ehci_power_on,
+ .power_off = csn3xxx_usb_ehci_power_off,
+};
+
static struct platform_device cns3xxx_usb_ehci_device = {
- .name = "cns3xxx-ehci",
+ .name = "ehci-platform",
.num_resources = ARRAY_SIZE(cns3xxx_usb_ehci_resources),
.resource = cns3xxx_usb_ehci_resources,
.dev = {
.dma_mask = &cns3xxx_usb_ehci_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32),
+ .platform_data = &cns3xxx_usb_ehci_pdata,
},
};
--
1.7.9.5
next prev parent reply other threads:[~2012-10-04 15:24 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1349363872-27004-1-git-send-email-florian@openwrt.org>
2012-10-04 15:17 ` [PATCH 01/24 v2] USB: EHCI: remove IXP4xx EHCI driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 02/24 v2] MIPS: Loongson 1B: use ehci-platform instead of ehci-ls1x Florian Fainelli
2012-10-04 15:17 ` [PATCH 03/24 v2] USB: EHCI: remove Loongson 1B EHCI driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 04/24 v2] MIPS: Netlogic: use ehci-platform driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 05/24 v2] USB: EHCI: remove Netlogic XLS EHCI driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 06/24 v2] USB: EHCI: add no_io_watchdog platform_data parameter to ehci-platform Florian Fainelli
2012-10-04 18:58 ` Alan Stern
2012-10-04 15:17 ` [PATCH 07/24 v2] MIPS: Alchemy: use the ehci platform driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 08/24 v2] USB: EHCI: remove Alchemy EHCI driver Florian Fainelli
2012-10-04 15:17 ` Florian Fainelli [this message]
2012-10-04 15:17 ` [PATCH 10/24 v2] USB: EHCI: remove CNS3xxx EHCI platform driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 11/24 v2] USB: ohci: allow platform driver to specify the number of ports Florian Fainelli
2012-10-04 15:17 ` [PATCH 12/24] USB: ohci: move ohci_pci_{suspend,resume} to ohci-hcd.c Florian Fainelli
2012-10-04 19:07 ` Alan Stern
2012-10-04 15:17 ` [PATCH 13/24] USB: ohci: remove check for RH already suspended in ohci_suspend Florian Fainelli
2012-10-04 15:17 ` [PATCH 14/24] USB: ohci: merge ohci_finish_controller_resume with ohci_resume Florian Fainelli
2012-10-05 1:38 ` Jingoo Han
2012-10-05 7:42 ` Nicolas Ferre
2012-10-04 15:17 ` [PATCH 15/24 v2] MIPS: PNX8550: use OHCI platform driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 16/24 v2] USB: OHCI: remove PNX8550 OHCI driver Florian Fainelli
2012-10-04 15:17 ` [PATCH 17/24 v2] ARM: cns3xxx: use OHCI platform driver Florian Fainelli
2012-10-04 19:19 ` Alan Stern
2012-10-04 15:17 ` [PATCH 18/24 v2] USB: OHCI: remove CNS3xxx " Florian Fainelli
2012-10-04 15:17 ` [PATCH 19/24 v2] MIPS: Netlogic: convert to use " Florian Fainelli
2012-10-04 15:17 ` [PATCH 20/24 v2] USB: OHCI: remove Netlogic XLS " Florian Fainelli
2012-10-04 15:17 ` [PATCH 21/24 v2] sh: convert boards to use the " Florian Fainelli
2012-10-04 15:17 ` [PATCH 22/24 v2] USB: OHCI: remove OHCI SH " Florian Fainelli
2012-10-04 15:17 ` [PATCH 23/24 v2] MIPS: Alchemy: use the OHCI " Florian Fainelli
2012-10-04 15:17 ` [PATCH 24/24 v2] USB: OHCI: remove Alchemy " Florian Fainelli
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=1349363872-27004-10-git-send-email-florian@openwrt.org \
--to=florian@openwrt.org \
--cc=avorontsov@mvista.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=stern@rowland.harvard.edu \
/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
all inboxes | Powered by JetHome®