devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <tthayer@altera.com>
To: dinguyen@altera.com, rob.herring@calxeda.com, pawel.moll@arm.com,
	mark.rutland@arm.com, devicetree@hellion.org.uk,
	galak@codeaurora.org, rob@landley.net, linux@arm.linux.org.uk
Cc: devicetree@vger.kernel.org, Thor Thayer <tthayer@altera.com>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org
Subject: [PATCH 2/2] arm: socfpga: Add support for Altera SoC SDRAM controller
Date: Mon, 31 Mar 2014 17:07:07 -0500	[thread overview]
Message-ID: <1396303627-29198-3-git-send-email-tthayer@altera.com> (raw)
In-Reply-To: <1396303627-29198-1-git-send-email-tthayer@altera.com>

From: Thor Thayer <tthayer@altera.com>

Addition of the Altera SDRAM controller registers to the
Altera SoC project. These registers are shared by future
drivers such as ECC and the FPGA bridge.

Signed-off-by: Thor Thayer <tthayer@altera.com>
To: Rob Herring <rob.herring@calxeda.com>
To: Pawel Moll <pawel.moll@arm.com>
To: Mark Rutland <mark.rutland@arm.com>
To: Ian Campbell <ijc+devicetree@hellion.org.uk>
To: Kumar Gala <galak@codeaurora.org>
To: Rob Landley <rob@landley.net>
To: Russell King <linux@arm.linux.org.uk>
To: Dinh Nguyen <dinguyen@altera.com>
Cc: devicetree@vger.kernel.org
Cc: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
---
 arch/arm/mach-socfpga/socfpga.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c
index 21d6026..d514e8a 100644
--- a/arch/arm/mach-socfpga/socfpga.c
+++ b/arch/arm/mach-socfpga/socfpga.c
@@ -32,6 +32,7 @@
 void __iomem *socfpga_scu_base_addr = ((void __iomem *)(SOCFPGA_SCU_VIRT_BASE));
 void __iomem *sys_manager_base_addr;
 void __iomem *rst_manager_base_addr;
+void __iomem *sdr_ctl_base_addr;
 void __iomem *clk_mgr_base_addr;
 unsigned long cpu1start_addr;
 
@@ -150,6 +151,15 @@ void __init socfpga_sysmgr_init(void)
 
 	np = of_find_compatible_node(NULL, NULL, "altr,clk-mgr");
 	clk_mgr_base_addr = of_iomap(np, 0);
+
+	np = of_find_compatible_node(NULL, NULL, "altr,sdr-ctl");
+	if (!np) {
+		pr_err("SOCFPGA: Unable to find sdr-ctl\n");
+		return;
+	}
+
+	sdr_ctl_base_addr = of_iomap(np, 0);
+	WARN_ON(!sdr_ctl_base_addr);
 }
 
 static void __init socfpga_init_irq(void)
-- 
1.7.9.5

  parent reply	other threads:[~2014-03-31 22:07 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1396303627-29198-1-git-send-email-tthayer@altera.com>
2014-03-31 22:07 ` [PATCH 1/2] dts: socfpga: Add bindings for Altera SoC SDRAM controller tthayer
2014-04-01  5:28   ` Steffen Trumtrar
2014-04-01 20:11     ` Thor Thayer - Sendmail
2014-04-01 22:19       ` Steffen Trumtrar
     [not found]         ` <20140401221913.GR5052-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-04-02 18:17           ` Thor Thayer - Sendmail
2014-03-31 22:07 ` tthayer [this message]
2014-04-01  5:33   ` [PATCH 2/2] arm: socfpga: Add support " Steffen Trumtrar
2014-04-01 20:05     ` Thor Thayer - Sendmail

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=1396303627-29198-3-git-send-email-tthayer@altera.com \
    --to=tthayer@altera.com \
    --cc=devicetree@hellion.org.uk \
    --cc=devicetree@vger.kernel.org \
    --cc=dinguyen@altera.com \
    --cc=galak@codeaurora.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=rob.herring@calxeda.com \
    --cc=rob@landley.net \
    /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).