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

Commit a7776ec6 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

ARM: at91: add ram controller DT support 



We can now drop the call to ioremap_registers() as we have the binding for the
SDRAM/DDR Controller.

Drop ioremap_registers() for sam9x5 too.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent c8082d34

Documentation/devicetree/bindings/arm/atmel-at91.txt

+19 −0
Original line number Diff line number Diff line
@@ -42,3 +42,22 @@ Example: 
		compatible = "atmel,at91sam9260-rstc";

		reg = <0xfffffd00 0x10>;

	};



RAMC SDRAM/DDR Controller required properties:

- compatible: Should be "atmel,at91sam9260-sdramc",

			"atmel,at91sam9g45-ddramc",

- reg: Should contain registers location and length

  For at91sam9263 and at91sam9g45 you must specify 2 entries.



Examples:



	ramc0: ramc@ffffe800 {

		compatible = "atmel,at91sam9g45-ddramc";

		reg = <0xffffe800 0x200>;

	};



	ramc0: ramc@ffffe400 {

		compatible = "atmel,at91sam9g45-ddramc";

		reg = <0xffffe400 0x200

		       0xffffe600 0x200>;

	};

arch/arm/boot/dts/at91sam9g20.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ 
				reg = <0xfffff000 0x200>;

			};



			ramc0: ramc@ffffea00 {

				compatible = "atmel,at91sam9260-sdramc";

				reg = <0xffffea00 0x200>;

			};



			pmc: pmc@fffffc00 {

				compatible = "atmel,at91rm9200-pmc";

				reg = <0xfffffc00 0x100>;

arch/arm/boot/dts/at91sam9g45.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ 
				reg = <0xfffff000 0x200>;

			};



			ramc0: ramc@ffffe400 {

				compatible = "atmel,at91sam9g45-ddramc";

				reg = <0xffffe400 0x200

				       0xffffe600 0x200>;

			};



			pmc: pmc@fffffc00 {

				compatible = "atmel,at91rm9200-pmc";

				reg = <0xfffffc00 0x100>;

arch/arm/boot/dts/at91sam9x5.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -58,6 +58,11 @@ 
				reg = <0xfffff000 0x200>;

			};



			ramc0: ramc@ffffe800 {

				compatible = "atmel,at91sam9g45-ddramc";

				reg = <0xffffe800 0x200>;

			};



			pmc: pmc@fffffc00 {

				compatible = "atmel,at91rm9200-pmc";

				reg = <0xfffffc00 0x100>;

arch/arm/mach-at91/at91sam9x5.c

+0 −6
Original line number Diff line number Diff line
@@ -299,11 +299,6 @@ static void __init at91sam9x5_map_io(void) 
	at91_init_sram(0, AT91SAM9X5_SRAM_BASE, AT91SAM9X5_SRAM_SIZE);

}



static void __init at91sam9x5_ioremap_registers(void)

{

	at91_ioremap_ramc(0, AT91SAM9X5_BASE_DDRSDRC0, 512);

}



void __init at91sam9x5_initialize(void)

{

	at91_extern_irq = (1 << AT91SAM9X5_ID_IRQ0);
@@ -356,7 +351,6 @@ static unsigned int at91sam9x5_default_irq_priority[NR_AIC_IRQS] __initdata = { 
struct at91_init_soc __initdata at91sam9x5_soc = {

	.map_io = at91sam9x5_map_io,

	.default_irq_priority = at91sam9x5_default_irq_priority,

	.ioremap_registers = at91sam9x5_ioremap_registers,

	.register_clocks = at91sam9x5_register_clocks,

	.init = at91sam9x5_initialize,

};