PERFORCE change 163929 for review

[Sylvestre Gallon]

http://perforce.freebsd.org/chv.cgi?CH=163929

Change 163929 by syl at syl_atuin on 2009/06/09 20:30:56

	- Update Watchdog and PIT drivers to be SoC independant.
	- Add Watchdog and PIT accessors for base address.
	- Update cpu_devs.
	- Fix ident in config file.

Affected files ...

.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_pit.c#2 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_pmc.c#2 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_wdt.c#2 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91var.h#5 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#7 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_bus_at91usart.c#3 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_cpu_at91usart.c#2 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_dev_at91usart.c#3 edit
.. //depot/projects/soc2009/syl_usb/src/sys/arm/conf/AT91SAM9261EK#3 edit

Differences ...

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_pit.c#2 (text+ko) ====

@@ -42,7 +42,6 @@
 #include <machine/frame.h>
 #include <machine/intr.h>
 
-#include <arm/at91/at91sam9261reg.h>
 #include <arm/at91/at91var.h>
 #include <arm/at91/at91_pitreg.h>
 
@@ -87,8 +86,8 @@
 	pit_softc = device_get_softc(dev);
 	pit_softc->sc_st = sc->sc_st;
 	pit_softc->sc_dev = dev;
-	if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91SAM9261_PIT_BASE,
-	    AT91SAM9261_PIT_SIZE, &pit_softc->sc_sh) != 0)
+	if (bus_space_subregion(sc->sc_st, sc->sc_sh, at91_pit_base(),
+	    at91_pit_size(), &pit_softc->sc_sh) != 0)
 	       panic("couldn't subregion pit registers");
 
 	//Enable the PIT here.

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_pmc.c#2 (text) ====


==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91_wdt.c#2 (text+ko) ====

@@ -33,7 +33,6 @@
 #include <sys/watchdog.h>
 
 #include <machine/bus.h>
-#include <arm/at91/at91sam9261reg.h>
 #include <arm/at91/at91var.h>
 #include <arm/at91/at91_wdtreg.h>
 
@@ -66,8 +65,8 @@
 	wdt_softc = device_get_softc(dev);
 	wdt_softc->sc_st = sc->sc_st;
 	wdt_softc->sc_dev = dev;
-	if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91SAM9261_WDT_BASE,
-	    AT91SAM9261_WDT_SIZE, &wdt_softc->sc_sh) != 0)
+	if (bus_space_subregion(sc->sc_st, sc->sc_sh, at91_wdt_base(),
+	    at91_wdt_size(), &wdt_softc->sc_sh) != 0)
 		panic("couldn't subregion watchdog registers");
 
 	WR4(WDT_MR, WDT_WDV(0xfff)|WDT_WDRSTEN|WDT_WDD(0xfff)|

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/at91var.h#5 (text) ====

@@ -72,5 +72,9 @@
 uint32_t at91_sdramc_base(void);
 uint32_t at91_dbgu_base(void);
 uint32_t at91_usart0_base(void);
+uint32_t at91_wdt_base(void);
+uint32_t at91_wdt_size(void);
+uint32_t at91_pit_base(void);
+uint32_t at91_pit_size(void);
 
 #endif /* _AT91VAR_H_ */

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/soc_at91sam9261.c#7 (text+ko) ====

@@ -142,32 +142,27 @@
 		AT91SAM9261_IRQ_SYSTEM
 	},
 	{
-		"at91_udp", 0,
-		AT91SAM9261_BASE + AT91SAM9261_UDP_BASE, AT91SAM9261_UDP_SIZE,
-		AT91SAM9261_IRQ_UDP, AT91SAM9261_IRQ_PIOB
+		"at91_pmc", 0,
+		AT91SAM9261_BASE + AT91SAM9261_PMC_BASE, AT91SAM9261_PMC_SIZE,
+		AT91SAM9261_IRQ_SYSTEM
 	},
 	{
-		"ohci", 0,
-		AT91SAM9261_OHCI_BASE, AT91SAM9261_OHCI_SIZE,
-		AT91SAM9261_IRQ_UHP
-	},
-	{
-		"pio", 0,
+		"at91_pio", 0,
 		AT91SAM9261_BASE + AT91SAM9261_PIOA_BASE, AT91SAM9261_PIO_SIZE,
 		AT91SAM9261_IRQ_SYSTEM
 	},
 	{
-		"pio", 1,
+		"at91_pio", 1,
 		AT91SAM9261_BASE + AT91SAM9261_PIOB_BASE, AT91SAM9261_PIO_SIZE,
 		AT91SAM9261_IRQ_SYSTEM
 	},
 	{
-		"pio", 2,
+		"at91_pio", 2,
 		AT91SAM9261_BASE + AT91SAM9261_PIOC_BASE, AT91SAM9261_PIO_SIZE,
 		AT91SAM9261_IRQ_SYSTEM
 	},
 	{
-		"uart", 2,
+		"uart", 0,
 		AT91SAM9261_BASE + AT91SAM9261_DBGU_BASE, AT91SAM9261_DBGU_SIZE,
 		AT91SAM9261_IRQ_SYSTEM
 	},
@@ -236,3 +231,28 @@
 {
 	return (AT91SAM9261_DBGU_BASE);
 }
+
+uint32_t
+at91_wdt_base(void)
+{
+	return (AT91SAM9261_WDT_BASE);
+}
+
+uint32_t
+at91_wdt_size(void)
+{
+	return (AT91SAM9261_WDT_SIZE);
+}
+
+uint32_t 
+at91_pit_base(void)
+{
+	return (AT91SAM9261_PIT_BASE);
+}
+
+uint32_t
+at91_pit_size(void)
+{
+	return (AT91SAM9261_PIT_SIZE);
+}
+

==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_bus_at91usart.c#3 (text) ====


==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_cpu_at91usart.c#2 (text+ko) ====


==== //depot/projects/soc2009/syl_usb/src/sys/arm/at91/uart_dev_at91usart.c#3 (text) ====


==== //depot/projects/soc2009/syl_usb/src/sys/arm/conf/AT91SAM9261EK#3 (text+ko) ====

@@ -17,7 +17,7 @@
 #
 # $FreeBSD: src/sys/arm/conf/BWCT,v 1.11 2009/05/10 00:00:25 kuriyama Exp $
 
-ident		BWCT
+ident		AT91SAM9261EK
 
 options 	VERBOSE_INIT_ARM
 
@@ -99,9 +99,9 @@
 
 device		bpf		# Berkeley packet filter
 
-options USB_DEBUG
-device		scbus
-device		da
-device		ohci
-device		usb
-device		umass		# Disks/Mass storage - Requires scbus and da
+#options USB_DEBUG
+#device		scbus
+#device		da
+#device		ohci
+#device		usb
+#device		umass		# Disks/Mass storage - Requires scbus and da