On Mon, Mar 31, 2014 at 05:07:07PM -0500, tthayer@xxxxxxxxxx wrote: > From: Thor Thayer <tthayer@xxxxxxxxxx> > > 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@xxxxxxxxxx> > To: Rob Herring <rob.herring@xxxxxxxxxxx> > To: Pawel Moll <pawel.moll@xxxxxxx> > To: Mark Rutland <mark.rutland@xxxxxxx> > To: Ian Campbell <ijc+devicetree@xxxxxxxxxxxxxx> > To: Kumar Gala <galak@xxxxxxxxxxxxxx> > To: Rob Landley <rob@xxxxxxxxxxx> > To: Russell King <linux@xxxxxxxxxxxxxxxx> > To: Dinh Nguyen <dinguyen@xxxxxxxxxx> > Cc: devicetree@xxxxxxxxxxxxxxx > Cc: linux-doc@xxxxxxxxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > --- > 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; > Can't we get rid of all these global pointers instead of adding to them? > @@ -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 > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html