diff options
Diffstat (limited to 'arch/mips/include/asm/octeon')
| -rw-r--r-- | arch/mips/include/asm/octeon/cvmx-helper-board.h | 9 | ||||
| -rw-r--r-- | arch/mips/include/asm/octeon/cvmx-pip.h | 4 | ||||
| -rw-r--r-- | arch/mips/include/asm/octeon/octeon.h | 1 | 
3 files changed, 11 insertions, 3 deletions
diff --git a/arch/mips/include/asm/octeon/cvmx-helper-board.h b/arch/mips/include/asm/octeon/cvmx-helper-board.h index 41785dd0ddd..893320375ae 100644 --- a/arch/mips/include/asm/octeon/cvmx-helper-board.h +++ b/arch/mips/include/asm/octeon/cvmx-helper-board.h @@ -36,6 +36,13 @@  #include <asm/octeon/cvmx-helper.h> +enum cvmx_helper_board_usb_clock_types { +	USB_CLOCK_TYPE_REF_12, +	USB_CLOCK_TYPE_REF_24, +	USB_CLOCK_TYPE_REF_48, +	USB_CLOCK_TYPE_CRYSTAL_12, +}; +  typedef enum {  	set_phy_link_flags_autoneg = 0x1,  	set_phy_link_flags_flow_control_dont_touch = 0x0 << 1, @@ -154,4 +161,6 @@ extern int __cvmx_helper_board_interface_probe(int interface,   */  extern int __cvmx_helper_board_hardware_enable(int interface); +enum cvmx_helper_board_usb_clock_types __cvmx_helper_board_usb_get_clock_type(void); +  #endif /* __CVMX_HELPER_BOARD_H__ */ diff --git a/arch/mips/include/asm/octeon/cvmx-pip.h b/arch/mips/include/asm/octeon/cvmx-pip.h index a76fe5a57a9..df69bfd2b00 100644 --- a/arch/mips/include/asm/octeon/cvmx-pip.h +++ b/arch/mips/include/asm/octeon/cvmx-pip.h @@ -192,13 +192,13 @@ typedef struct {  	/* Number of packets processed by PIP */  	uint32_t packets;  	/* -	 * Number of indentified L2 multicast packets.	Does not +	 * Number of identified L2 multicast packets.	Does not  	 * include broadcast packets.  Only includes packets whose  	 * parse mode is SKIP_TO_L2  	 */  	uint32_t multicast_packets;  	/* -	 * Number of indentified L2 broadcast packets.	Does not +	 * Number of identified L2 broadcast packets.	Does not  	 * include multicast packets.  Only includes packets whose  	 * parse mode is SKIP_TO_L2  	 */ diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h index f5d77b91537..d781f9e6688 100644 --- a/arch/mips/include/asm/octeon/octeon.h +++ b/arch/mips/include/asm/octeon/octeon.h @@ -211,7 +211,6 @@ union octeon_cvmemctl {  extern void octeon_write_lcd(const char *s);  extern void octeon_check_cpu_bist(void); -extern int octeon_get_boot_debug_flag(void);  extern int octeon_get_boot_uart(void);  struct uart_port;  | 
