ARM: at91: fix PM initialization for newer SoCs
authorNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 22 Jan 2015 15:54:50 +0000 (16:54 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Mon, 26 Jan 2015 12:43:33 +0000 (13:43 +0100)
Newer SoCs: at91sam9x5, at91sam9n12, sama5d3 and sama5d4 embed a DDR controller
and have a different PMC status register layout than the at91sam9g45. Create
another at91_sam9x5_pm_init() function to match this compatibility.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
arch/arm/mach-at91/board-dt-sam9.c
arch/arm/mach-at91/board-dt-sama5.c
arch/arm/mach-at91/generic.h
arch/arm/mach-at91/pm.c

index 0fe1ced608c58257a29301dac9152cca88c83c3a..c8252ddac6f0212774283727e024b63559225716 100644 (file)
@@ -61,3 +61,23 @@ DT_MACHINE_START(at91sam9g45_dt, "Atmel AT91SAM9G45")
        .init_machine   = sam9g45_dt_device_init,
        .dt_compat      = at91_9g45_board_compat,
 MACHINE_END
+
+static void __init sam9x5_dt_device_init(void)
+{
+       at91_sam9x5_pm_init();
+       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char *at91_9x5_board_compat[] __initconst = {
+       "atmel,at91sam9x5",
+       "atmel,at91sam9n12",
+       NULL
+};
+
+DT_MACHINE_START(at91sam9x5_dt, "Atmel AT91SAM9")
+       /* Maintainer: Atmel */
+       .map_io         = at91_map_io,
+       .init_early     = at91_dt_initialize,
+       .init_machine   = sam9x5_dt_device_init,
+       .dt_compat      = at91_9x5_board_compat,
+MACHINE_END
index 44d372a22a29d29ba0dbb0cafda7270545c4feca..b7338966c8ab6e8f79fef3cf5464c3925713d608 100644 (file)
@@ -28,7 +28,7 @@
 
 static void __init sama5_dt_device_init(void)
 {
-       at91_sam9260_pm_init();
+       at91_sam9x5_pm_init();
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
index 44fc725edcf1668e3c5a03cade7507363da3212a..a8ee83ef6cd416ddd068ee3bd19630f55395a517 100644 (file)
@@ -36,10 +36,12 @@ extern void at91_ioremap_matrix(u32 base_addr);
 extern void __init at91_rm9200_pm_init(void);
 extern void __init at91_sam9260_pm_init(void);
 extern void __init at91_sam9g45_pm_init(void);
+extern void __init at91_sam9x5_pm_init(void);
 #else
 void __init at91_rm9200_pm_init(void) { }
 void __init at91_sam9260_pm_init(void) { }
 void __init at91_sam9g45_pm_init(void) { }
+void __init at91_sam9x5_pm_init(void) { }
 #endif
 
 #endif /* _AT91_GENERIC_H */
index 81f2f12d3cc1546d669d66c2451fca01ae4123b2..87c1fd8aa1b6e13a7102a19f9f07cf4b48a10410 100644 (file)
@@ -306,3 +306,10 @@ void __init at91_sam9g45_pm_init(void)
        at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
        return at91_pm_init();
 }
+
+void __init at91_sam9x5_pm_init(void)
+{
+       at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;
+       at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
+       return at91_pm_init();
+}