linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ulrich Hecht <ulrich.hecht@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH 6/9] pci: rcar-gen2: enable clock
Date: Wed, 20 Nov 2013 17:38:03 +0000	[thread overview]
Message-ID: <1384969086-8920-7-git-send-email-ulrich.hecht@gmail.com> (raw)

Makes the PCI host controllers come alive.

Signed-off-by: Ulrich Hecht <ulrich.hecht@gmail.com>
---
 drivers/pci/host/pci-rcar-gen2.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c
index cbaa5c4..568ff8e 100644
--- a/drivers/pci/host/pci-rcar-gen2.c
+++ b/drivers/pci/host/pci-rcar-gen2.c
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -77,6 +78,7 @@
 #define RCAR_PCI_NR_CONTROLLERS		3
 
 struct rcar_pci_priv {
+	struct clk *clk;
 	void __iomem *reg;
 	struct resource io_res;
 	struct resource mem_res;
@@ -169,6 +171,9 @@ static int __init rcar_pci_setup(int nr, struct pci_sys_data *sys)
 	void __iomem *reg = priv->reg;
 	u32 val;
 
+	clk_prepare_enable(priv->clk);
+	udelay(4);
+
 	val = ioread32(reg + RCAR_PCI_UNIT_REV_REG);
 	pr_info("PCI: bus%u revision %x\n", sys->busnr, val);
 
@@ -273,6 +278,7 @@ static int __init rcar_pci_probe(struct platform_device *pdev)
 	struct resource *cfg_res, *mem_res;
 	struct rcar_pci_priv *priv;
 	void __iomem *reg;
+	struct clk *clk;
 
 	cfg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	reg = devm_ioremap_resource(&pdev->dev, cfg_res);
@@ -288,6 +294,12 @@ static int __init rcar_pci_probe(struct platform_device *pdev)
 	if (!priv)
 		return -ENOMEM;
 
+	clk = devm_clk_get(&pdev->dev, "usbpci");
+	if (IS_ERR(clk)) {
+		dev_err(&pdev->dev, "Can't get clock\n");
+		return PTR_ERR(clk);
+	}
+
 	priv->mem_res = *mem_res;
 	/*
 	 * The controller does not support/use port I/O,
@@ -302,6 +314,8 @@ static int __init rcar_pci_probe(struct platform_device *pdev)
 	priv->irq = platform_get_irq(pdev, 0);
 	priv->reg = reg;
 
+	priv->clk = clk;
+
 	return rcar_pci_add_controller(priv);
 }
 
-- 
1.8.4


             reply	other threads:[~2013-11-20 17:38 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-20 17:38 Ulrich Hecht [this message]
2013-11-20 21:09 ` [PATCH 6/9] pci: rcar-gen2: enable clock Valentine

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=1384969086-8920-7-git-send-email-ulrich.hecht@gmail.com \
    --to=ulrich.hecht@gmail.com \
    --cc=linux-sh@vger.kernel.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).