From patchwork Mon Mar 31 22:07:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tthayer@altera.com X-Patchwork-Id: 3918091 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2F62CBF540 for ; Mon, 31 Mar 2014 22:04:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 54624203AF for ; Mon, 31 Mar 2014 22:04:46 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4F6FC202D1 for ; Mon, 31 Mar 2014 22:04:45 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUkJp-0005IY-OA; Mon, 31 Mar 2014 22:04:37 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUkJl-0000ae-2N; Mon, 31 Mar 2014 22:04:33 +0000 Received: from mail-by2on0725.outbound.protection.outlook.com ([2a01:111:f400:fc0c::725] helo=na01-by2-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WUkJg-0000a5-7S for linux-arm-kernel@lists.infradead.org; Mon, 31 Mar 2014 22:04:31 +0000 Received: from BL2FFO11FD007.protection.gbl (10.173.160.30) by BL2FFO11HUB062.protection.gbl (10.173.161.162) with Microsoft SMTP Server (TLS) id 15.0.908.10; Mon, 31 Mar 2014 22:04:05 +0000 Received: from SJ-ITEXEDGE02.altera.priv.altera.com (66.35.236.232) by BL2FFO11FD007.mail.protection.outlook.com (10.173.161.3) with Microsoft SMTP Server (TLS) id 15.0.908.10 via Frontend Transport; Mon, 31 Mar 2014 22:04:04 +0000 Received: from sj-mail01.altera.com (137.57.1.6) by SJ-ITEXEDGE02.altera.priv.altera.com (66.35.236.232) with Microsoft SMTP Server id 8.3.348.2; Mon, 31 Mar 2014 14:50:58 -0700 Received: from dinh-ubuntu ([137.57.188.25]) by sj-mail01.altera.com (8.13.7+Sun/8.13.7) with SMTP id s2VM3AwB002018; Mon, 31 Mar 2014 15:03:10 -0700 (PDT) Received: by dinh-ubuntu (sSMTP sendmail emulation); Mon, 31 Mar 2014 17:09:00 -0500 From: To: , , , , , , , Subject: [PATCH 2/2] arm: socfpga: Add support for Altera SoC SDRAM controller Date: Mon, 31 Mar 2014 17:07:07 -0500 Message-ID: <1396303627-29198-3-git-send-email-tthayer@altera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396303627-29198-1-git-send-email-tthayer@altera.com> References: <1396303627-29198-1-git-send-email-tthayer@altera.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: =?us-ascii?Q?CIP:66.35.236.232; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(1001?= =?us-ascii?Q?9001)(6009001)(458001)(189002)(199002)(87266001)(83072002)(8?= =?us-ascii?Q?7286001)(84676001)(89996001)(50226001)(33646001)(4396001)(49?= =?us-ascii?Q?866001)(95666003)(47976001)(83322001)(81816001)(6806004)(477?= =?us-ascii?Q?36001)(74366001)(44976005)(85852003)(19580405001)(69226001)(?= =?us-ascii?Q?85306002)(50986001)(81542001)(90146001)(88136002)(97336001)(?= =?us-ascii?Q?56816005)(87936001)(51856001)(46102001)(16796002)(97186001)(?= =?us-ascii?Q?98676001)(31966008)(74662001)(48376002)(19580395003)(8134200?= =?us-ascii?Q?1)(47446002)(56776001)(54316002)(74502001)(76482001)(9431600?= =?us-ascii?Q?2)(79102001)(50466002)(59766001)(74706001)(77982001)(2077600?= =?us-ascii?Q?3)(94946001)(47776003)(93516002)(63696002)(93916002)(7715600?= =?us-ascii?Q?1)(80976001)(62966002)(92726001)(76786001)(36756003)(9541600?= =?us-ascii?Q?1)(93136001)(76796001)(97736001)(2009001)(77096001)(80022001?= =?us-ascii?Q?)(2201001)(86362001)(42186004)(74876001)(92566001)(86152002)?= =?us-ascii?Q?(81686001)(53806001)(65816001); DIR:OUT; SFP:1102; SCL:1; SRVR:B?= =?us-ascii?Q?L2FFO11HUB062; H:SJ-ITEXEDGE02.altera.priv.altera.com; FPR:F3C?= =?us-ascii?Q?DC76A.A0D3A42A.F6F31F47.5BE0CAF9.2023F; MLV:sfv; PTR:InfoDomai?= =?us-ascii?Q?nNonexistent;MX:1;A:1;LANG:en;?= X-OriginatorOrg: altera.onmicrosoft.com X-Forefront-PRVS: 0167DB5752 Received-SPF: SoftFail (: domain of transitioning altera.com discourages use of 66.35.236.232 as permitted sender) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140331_180430_866916_E2B08CE0 X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: devicetree@vger.kernel.org, Thor Thayer , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thor Thayer 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 To: Rob Herring To: Pawel Moll To: Mark Rutland To: Ian Campbell To: Kumar Gala To: Rob Landley To: Russell King To: Dinh Nguyen 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)