Skip to content

Commit

Permalink
staging: octeon: Remove USB code
Browse files Browse the repository at this point in the history
Remove functions and definitions that refer to USB since the driver
doesn't support USB and it's not planned to add USB support to that
driver. So the code is just dead code which can be removed.

Cc: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Bernhard Walle <walle@corscience.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bernhard Walle authored and Greg Kroah-Hartman committed Oct 14, 2010
1 parent 310bad0 commit 6566961
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 48 deletions.
19 changes: 0 additions & 19 deletions drivers/staging/octeon/cvmx-helper-board.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
29 changes: 0 additions & 29 deletions drivers/staging/octeon/cvmx-helper-board.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,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,
Expand Down Expand Up @@ -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__ */

0 comments on commit 6566961

Please sign in to comment.