From owner-p4-projects@FreeBSD.ORG Wed Feb 3 20:44:10 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B34A1065694; Wed, 3 Feb 2010 20:44:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA9641065670 for ; Wed, 3 Feb 2010 20:44:09 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 916558FC1D for ; Wed, 3 Feb 2010 20:44:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o13Ki9Nk008285 for ; Wed, 3 Feb 2010 20:44:09 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o13Ki9V2008283 for perforce@freebsd.org; Wed, 3 Feb 2010 20:44:09 GMT (envelope-from raj@freebsd.org) Date: Wed, 3 Feb 2010 20:44:09 GMT Message-Id: <201002032044.o13Ki9V2008283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2010 20:44:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=174268 Change 174268 by raj@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 #include -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;