]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: octeon-usb: use correct board type for EdgeRouter Lite
authorAaro Koskinen <aaro.koskinen@iki.fi>
Mon, 29 Jul 2013 17:07:42 +0000 (20:07 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jul 2013 18:41:27 +0000 (11:41 -0700)
Use CVMX_BOARD_TYPE_UBNT_E100 for EdgeRouter Lite.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/octeon-usb/cvmx-usb.c

index bf366495fdd1796ce31daba22d0ea455ae05b62d..6c7bcf33ee3421272f95521c3442da164c0639b8 100644 (file)
@@ -280,14 +280,9 @@ static int octeon_usb_get_clock_type(void)
        case CVMX_BOARD_TYPE_LANAI2_A:
        case CVMX_BOARD_TYPE_LANAI2_U:
        case CVMX_BOARD_TYPE_LANAI2_G:
+       case CVMX_BOARD_TYPE_UBNT_E100:
                return USB_CLOCK_TYPE_CRYSTAL_12;
        }
-
-       /* FIXME: This should use CVMX_BOARD_TYPE_UBNT_E100 */
-       if (OCTEON_IS_MODEL(OCTEON_CN50XX) &&
-           cvmx_sysinfo_get()->board_type == 20002)
-               return USB_CLOCK_TYPE_CRYSTAL_12;
-
        return USB_CLOCK_TYPE_REF_48;
 }