Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c869eda authored by Andrew Lunn's avatar Andrew Lunn Committed by Mike Turquette
Browse files

ARM: Orion: EHCI: Add support for enabling clocks 



Not all platforms support gating the clock, so it is not an error if
the clock does not exist. However, if it does exist, we should
enable/disable it as appropriate.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarJamie Lentin <jm@lentin.co.uk>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent eee98990

arch/arm/mach-kirkwood/common.c

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void __init kirkwood_clk_init(void) 
	ge1 = kirkwood_register_gate("ge1",    CGC_BIT_GE1);

	sata0 = kirkwood_register_gate("sata0",  CGC_BIT_SATA0);

	sata1 = kirkwood_register_gate("sata1",  CGC_BIT_SATA1);

	kirkwood_register_gate("usb0",   CGC_BIT_USB0);

	usb0 = kirkwood_register_gate("usb0",   CGC_BIT_USB0);

	kirkwood_register_gate("sdio",   CGC_BIT_SDIO);

	kirkwood_register_gate("crypto", CGC_BIT_CRYPTO);

	kirkwood_register_gate("xor0",   CGC_BIT_XOR0);
@@ -115,6 +115,7 @@ void __init kirkwood_clk_init(void) 
	orion_clkdev_add(NULL, "orion_wdt", tclk);

	orion_clkdev_add("0", "sata_mv.0", sata0);

	orion_clkdev_add("1", "sata_mv.0", sata1);

	orion_clkdev_add(NULL, "orion-ehci.0", usb0);

}



/*****************************************************************************

drivers/usb/host/ehci-orion.c

+16 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/mbus.h>

#include <linux/clk.h>

#include <plat/ehci-orion.h>



#define rdl(off)	__raw_readl(hcd->regs + (off))
@@ -198,6 +199,7 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev) 
	struct resource *res;

	struct usb_hcd *hcd;

	struct ehci_hcd *ehci;

	struct clk *clk;

	void __iomem *regs;

	int irq, err;
@@ -238,6 +240,14 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev) 
		goto err2;

	}



	/* Not all platforms can gate the clock, so it is not

	   an error if the clock does not exists. */

	clk = clk_get(&pdev->dev, NULL);

	if (!IS_ERR(clk)) {

		clk_prepare_enable(clk);

		clk_put(clk);

	}



	hcd = usb_create_hcd(&ehci_orion_hc_driver,

			&pdev->dev, dev_name(&pdev->dev));

	if (!hcd) {
@@ -301,12 +311,18 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev) 
static int __exit ehci_orion_drv_remove(struct platform_device *pdev)

{

	struct usb_hcd *hcd = platform_get_drvdata(pdev);

	struct clk *clk;



	usb_remove_hcd(hcd);

	iounmap(hcd->regs);

	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);

	usb_put_hcd(hcd);



	clk = clk_get(&pdev->dev, NULL);

	if (!IS_ERR(clk)) {

		clk_disable_unprepare(clk);

		clk_put(clk);

	}

	return 0;

}