PERFORCE change 174268 for review

[Rafal Jaworowski]

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

Change 174268 by raj at raj_fdt on 2010/02/03 20:43:48

	Say good bye to unused entities..
	
	We are now working almost entirely off of FDT on Marvell ARM!
	Actually, this is for the 88F6281 for now, but other variations are
	mostly only a matter of a proper DTS config file.

Affected files ...

.. //depot/projects/fdt/sys/arm/mv/files.mv#3 edit
.. //depot/projects/fdt/sys/arm/mv/kirkwood/kirkwood.c#7 edit
.. //depot/projects/fdt/sys/arm/mv/mvvar.h#4 edit
.. //depot/projects/fdt/sys/arm/mv/obio.c#2 delete
.. //depot/projects/fdt/sys/dev/uart/uart_bus_mbus.c#2 delete

Differences ...

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

@@ -25,12 +25,10 @@
 arm/mv/mv_machdep.c		standard
 arm/mv/mv_pci.c			optional	pci
 arm/mv/mv_sata.c		optional	ata | atamvsata
-arm/mv/obio.c			standard
 arm/mv/timer.c			standard
 arm/mv/twsi.c			optional	iicbus
 
 dev/mge/if_mge.c		optional	mge
-dev/uart/uart_bus_mbus.c	optional	uart
 dev/uart/uart_cpu_mv.c		optional	uart
 dev/uart/uart_dev_ns8250.c	optional	uart
 dev/usb/controller/ehci_mv.c	optional	ehci

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

@@ -42,46 +42,6 @@
 #include <arm/mv/mvvar.h>
 #include <arm/mv/mvwin.h>
 
-struct obio_device obio_devices[] = {
-	{ "ic", MV_IC_BASE, MV_IC_SIZE,
-		{ -1 },
-		{ -1 },
-		CPU_PM_CTRL_NONE
-	},
-	{ "timer", MV_TIMERS_BASE, MV_TIMERS_SIZE,
-		{ MV_INT_BRIDGE, -1 },
-		{ -1 },
-		CPU_PM_CTRL_NONE
-	},
-	{ "gpio", MV_GPIO_BASE, MV_GPIO_SIZE,
-		{ MV_INT_GPIO7_0, MV_INT_GPIO15_8,
-		  MV_INT_GPIO23_16, MV_INT_GPIO31_24, 
-		  MV_INT_GPIOHI7_0, MV_INT_GPIOHI15_8,
-		  MV_INT_GPIOHI23_16, -1 },
-		{ -1 },
-		CPU_PM_CTRL_NONE
-	},
-	{ "uart", MV_UART0_BASE, MV_UART_SIZE,
-		{ MV_INT_UART0, -1 },
-		{ -1 },
-		CPU_PM_CTRL_NONE
-	},
-	{ "uart", MV_UART1_BASE, MV_UART_SIZE,
-		{ MV_INT_UART1, -1 },
-		{ -1 },
-		CPU_PM_CTRL_NONE
-	},
-	{ "xor", MV_XOR_BASE, MV_XOR_SIZE,
-		{ MV_INT_XOR0_CHAN0, MV_INT_XOR0_CHAN1,
-		  MV_INT_XOR1_CHAN0, MV_INT_XOR1_CHAN1,
-		  MV_INT_XOR0_ERR, MV_INT_XOR1_ERR,
-		  -1 },
-		{ -1 },
-		CPU_PM_CTRL_XOR0 | CPU_PM_CTRL_XOR1
-	},
-	{ NULL, 0, 0, { 0 }, { 0 }, 0 }
-};
-
 const struct obio_pci mv_pci_info[] = {
 	{ MV_TYPE_PCIE,
 		MV_PCIE_BASE, MV_PCIE_SIZE,

==== //depot/projects/fdt/sys/arm/mv/mvvar.h#4 (text+ko) ====

@@ -57,16 +57,6 @@
 	struct rman	obio_gpio;
 };
 
-struct obio_device {
-	const char	*od_name;
-	u_long		od_base;
-	u_long		od_size;
-	u_int		od_irqs[7 + 1];	/* keep additional entry for -1 sentinel */
-	u_int		od_gpio[2 + 1]; /* as above for IRQ */
-	u_int		od_pwr_mask;
-	struct resource_list od_resources;
-};
-
 struct obio_pci_irq_map {
 	int		opim_slot;
 	int		opim_pin;
@@ -112,7 +102,6 @@
 extern const struct obio_pci mv_pci_info[];
 extern const struct gpio_config mv_gpio_config[];
 extern bus_space_tag_t obio_tag;
-extern struct obio_device obio_devices[];
 extern const struct decode_win *idma_wins;
 extern const struct decode_win *xor_wins;
 extern int idma_wins_no;