PERFORCE change 174258 for review

[Rafal Jaworowski]

http://p4web.freebsd.org/chv.cgi?CH=174258

Change 174258 by raj at raj_fdt on 2010/02/03 20:14:21

	o Set up SATA decode window based on DT blob.
	
	o [Temporarily] deactivate PM state detection; this will be fixed
	  after some complementary code is in place.

Affected files ...

.. //depot/projects/fdt/sys/arm/mv/common.c#3 edit

Differences ...

==== //depot/projects/fdt/sys/arm/mv/common.c#3 (text+ko) ====

@@ -37,6 +37,7 @@
 #include <sys/bus.h>
 #include <sys/kernel.h>
 
+#include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
@@ -45,9 +46,6 @@
 #include <arm/mv/mvvar.h>
 #include <arm/mv/mvwin.h>
 
-#include "../../contrib/dtc/libfdt/libfdt_env.h"
-#include "../../../sys/dev/fdt/fdt_common.h"
-
 #define MAX_CPU_WIN	5
 
 #define DEBUG
@@ -93,6 +91,7 @@
 u_long cesa_base = 0;
 u_long usb0_base = 0;
 u_long eth0_base = 0;
+u_long sata0_base = 0;
 
 static const struct decode_win *cpu_wins = cpu_win_tbl;
 
@@ -105,6 +104,7 @@
 	{ "mrvl,cesa",		&cesa_base },
 	{ "mrvl,ge",		&eth0_base },
 	{ "mrvl,usb-ehci",	&usb0_base },
+	{ "mrvl,sata",		&sata0_base },
 	{ NULL, NULL },
 };
 
@@ -112,17 +112,22 @@
 pm_is_disabled(uint32_t mask)
 {
 
+#if 0
 	return (soc_power_ctrl_get(mask) == mask ? 0 : 1);
+#endif
+	return (1);
 }
 
 static __inline uint32_t
 obio_get_pm_mask(uint32_t base)
 {
+#if 0
 	struct obio_device *od;
 
 	for (od = obio_devices; od->od_name != NULL; od++)
 		if (od->od_base == base)
 			return (od->od_pwr_mask);
+#endif
 
 	return (CPU_PM_CTRL_NONE);
 }
@@ -391,10 +396,12 @@
 #undef MV_USB0_BASE
 #undef MV_CESA_BASE
 #undef MV_ETH0_BASE
+#undef MV_SATAHC_BASE
 
 #define MV_USB0_BASE	(MV_BASE + usb0_base)
 #define MV_CESA_BASE	(MV_BASE + cesa_base)
 #define MV_ETH0_BASE	(MV_BASE + eth0_base)
+#define MV_SATAHC_BASE	(MV_BASE + sata0_base)
 
 /**************************************************************************
  * Decode windows registers accessors