Author: ian
Date: Fri Mar 29 18:47:08 2013
New Revision: 248909
URL: http://svnweb.freebsd.org/changeset/base/248909
Log:
Call soc_info.soc_data->soc_clock_init() before at91_pmc_init_clock(), so
that the latter correctly fills in the clock data structures based on
proper hardware-specific shift and mask values from the soc_data structure.
Modified:
head/sys/arm/at91/at91_machdep.c
Modified: head/sys/arm/at91/at91_machdep.c
==============================================================================
--- head/sys/arm/at91/at91_machdep.c Fri Mar 29 18:46:13 2013
(r248908)
+++ head/sys/arm/at91/at91_machdep.c Fri Mar 29 18:47:08 2013
(r248909)
@@ -574,8 +574,17 @@ initarm(struct arm_boot_params *abp)
at91_soc_id();
- /* Initialize all the clocks, so that the console can work */
- at91_pmc_init_clock();
+ /*
+ * Initialize all the clocks, so that the console can work. We can only
+ * do this if at91_soc_id() was able to fill in the support data. Even
+ * if we can't init the clocks, still try to do a console init so we can
+ * try to print the error message about missing soc support. There's a
+ * chance the printf will work if the bootloader set up the DBGU.
+ */
+ if (soc_info.soc_data != NULL) {
+ soc_info.soc_data->soc_clock_init();
+ at91_pmc_init_clock();
+ }
cninit();
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
