diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 16:44:56 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 16:44:56 (GMT) |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/octeon | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | linux-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.xz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/octeon')
-rw-r--r-- | drivers/staging/octeon/Makefile | 20 | ||||
-rw-r--r-- | drivers/staging/octeon/cvmx-fpa.c | 2 | ||||
-rw-r--r-- | drivers/staging/octeon/cvmx-fpa.h | 2 | ||||
-rw-r--r-- | drivers/staging/octeon/cvmx-helper-board.c | 19 | ||||
-rw-r--r-- | drivers/staging/octeon/cvmx-helper-board.h | 29 | ||||
-rw-r--r-- | drivers/staging/octeon/ethernet.c | 13 |
6 files changed, 17 insertions, 68 deletions
diff --git a/drivers/staging/octeon/Makefile b/drivers/staging/octeon/Makefile index 87447c1..fc850ba 100644 --- a/drivers/staging/octeon/Makefile +++ b/drivers/staging/octeon/Makefile @@ -11,16 +11,16 @@ obj-${CONFIG_OCTEON_ETHERNET} := octeon-ethernet.o -octeon-ethernet-objs := ethernet.o -octeon-ethernet-objs += ethernet-mdio.o -octeon-ethernet-objs += ethernet-mem.o -octeon-ethernet-objs += ethernet-rgmii.o -octeon-ethernet-objs += ethernet-rx.o -octeon-ethernet-objs += ethernet-sgmii.o -octeon-ethernet-objs += ethernet-spi.o -octeon-ethernet-objs += ethernet-tx.o -octeon-ethernet-objs += ethernet-xaui.o -octeon-ethernet-objs += cvmx-pko.o cvmx-spi.o cvmx-cmd-queue.o \ +octeon-ethernet-y := ethernet.o +octeon-ethernet-y += ethernet-mdio.o +octeon-ethernet-y += ethernet-mem.o +octeon-ethernet-y += ethernet-rgmii.o +octeon-ethernet-y += ethernet-rx.o +octeon-ethernet-y += ethernet-sgmii.o +octeon-ethernet-y += ethernet-spi.o +octeon-ethernet-y += ethernet-tx.o +octeon-ethernet-y += ethernet-xaui.o +octeon-ethernet-y += cvmx-pko.o cvmx-spi.o cvmx-cmd-queue.o \ cvmx-helper-board.o cvmx-helper.o cvmx-helper-xaui.o \ cvmx-helper-rgmii.o cvmx-helper-sgmii.o cvmx-helper-npi.o \ cvmx-helper-loop.o cvmx-helper-spi.o cvmx-helper-util.o \ diff --git a/drivers/staging/octeon/cvmx-fpa.c b/drivers/staging/octeon/cvmx-fpa.c index 55d9147..ad44b8b 100644 --- a/drivers/staging/octeon/cvmx-fpa.c +++ b/drivers/staging/octeon/cvmx-fpa.c @@ -53,7 +53,7 @@ CVMX_SHARED cvmx_fpa_pool_info_t cvmx_fpa_pool_info[CVMX_FPA_NUM_POOLS]; * @name: Constant character string to name this pool. * String is not copied. * @buffer: Pointer to the block of memory to use. This must be - * accessable by all processors and external hardware. + * accessible by all processors and external hardware. * @block_size: Size for each block controlled by the FPA * @num_blocks: Number of blocks * diff --git a/drivers/staging/octeon/cvmx-fpa.h b/drivers/staging/octeon/cvmx-fpa.h index 1d7788f..50a8c91 100644 --- a/drivers/staging/octeon/cvmx-fpa.h +++ b/drivers/staging/octeon/cvmx-fpa.h @@ -264,7 +264,7 @@ static inline void cvmx_fpa_free(void *ptr, uint64_t pool, * @name: Constant character string to name this pool. * String is not copied. * @buffer: Pointer to the block of memory to use. This must be - * accessable by all processors and external hardware. + * accessible by all processors and external hardware. * @block_size: Size for each block controlled by the FPA * @num_blocks: Number of blocks * diff --git a/drivers/staging/octeon/cvmx-helper-board.c b/drivers/staging/octeon/cvmx-helper-board.c index 00a555b..57d35dc 100644 --- a/drivers/staging/octeon/cvmx-helper-board.c +++ b/drivers/staging/octeon/cvmx-helper-board.c @@ -693,22 +693,3 @@ int __cvmx_helper_board_hardware_enable(int interface) } return 0; } - -cvmx_helper_board_usb_clock_types_t __cvmx_helper_board_usb_get_clock_type(void) -{ - switch (cvmx_sysinfo_get()->board_type) { - case CVMX_BOARD_TYPE_BBGW_REF: - return USB_CLOCK_TYPE_CRYSTAL_12; - } - return USB_CLOCK_TYPE_REF_48; -} - -int __cvmx_helper_board_usb_get_num_ports(int supported_ports) -{ - switch (cvmx_sysinfo_get()->board_type) { - case CVMX_BOARD_TYPE_NIC_XLE_4G: - return 0; - } - - return supported_ports; -} diff --git a/drivers/staging/octeon/cvmx-helper-board.h b/drivers/staging/octeon/cvmx-helper-board.h index dc20b01..611a8e0 100644 --- a/drivers/staging/octeon/cvmx-helper-board.h +++ b/drivers/staging/octeon/cvmx-helper-board.h @@ -37,13 +37,6 @@ #include "cvmx-helper.h" typedef enum { - USB_CLOCK_TYPE_REF_12, - USB_CLOCK_TYPE_REF_24, - USB_CLOCK_TYPE_REF_48, - USB_CLOCK_TYPE_CRYSTAL_12, -} cvmx_helper_board_usb_clock_types_t; - -typedef enum { set_phy_link_flags_autoneg = 0x1, set_phy_link_flags_flow_control_dont_touch = 0x0 << 1, set_phy_link_flags_flow_control_enable = 0x1 << 1, @@ -155,26 +148,4 @@ extern int __cvmx_helper_board_interface_probe(int interface, */ extern int __cvmx_helper_board_hardware_enable(int interface); -/** - * Gets the clock type used for the USB block based on board type. - * Used by the USB code for auto configuration of clock type. - * - * Returns USB clock type enumeration - */ -cvmx_helper_board_usb_clock_types_t -__cvmx_helper_board_usb_get_clock_type(void); - -/** - * Adjusts the number of available USB ports on Octeon based on board - * specifics. - * - * @supported_ports: expected number of ports based on chip type; - * - * - * Returns number of available usb ports, based on board specifics. - * Return value is supported_ports if function does not - * override. - */ -int __cvmx_helper_board_usb_get_num_ports(int supported_ports); - #endif /* __CVMX_HELPER_BOARD_H__ */ diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index e50a17d..a8f780e 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -465,10 +465,7 @@ int cvm_oct_common_init(struct net_device *dev) if (cvm_oct_mac_addr_offset >= octeon_bootinfo->mac_addr_count) printk(KERN_DEBUG "%s: Using MAC outside of the assigned range:" - " %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, - sa.sa_data[0] & 0xff, sa.sa_data[1] & 0xff, - sa.sa_data[2] & 0xff, sa.sa_data[3] & 0xff, - sa.sa_data[4] & 0xff, sa.sa_data[5] & 0xff); + " %pM\n", dev->name, sa.sa_data); cvm_oct_mac_addr_offset++; /* @@ -673,7 +670,7 @@ static int __init cvm_oct_init_module(void) if (register_netdev(dev) < 0) { pr_err("Failed to register ethernet device for POW\n"); - kfree(dev); + free_netdev(dev); } else { cvm_oct_device[CVMX_PIP_NUM_INPUT_PORTS] = dev; pr_info("%s: POW send group %d, receive group %d\n", @@ -759,12 +756,12 @@ static int __init cvm_oct_init_module(void) } if (!dev->netdev_ops) { - kfree(dev); + free_netdev(dev); } else if (register_netdev(dev) < 0) { pr_err("Failed to register ethernet device " "for interface %d, port %d\n", interface, priv->port); - kfree(dev); + free_netdev(dev); } else { cvm_oct_device[priv->port] = dev; fau -= @@ -818,7 +815,7 @@ static void __exit cvm_oct_cleanup_module(void) cvm_oct_tx_shutdown_dev(dev); unregister_netdev(dev); - kfree(dev); + free_netdev(dev); cvm_oct_device[port] = NULL; } } |