On Mon, Nov 24, 2014 at 09:25:26AM -0800, David Daney wrote: > On 11/24/2014 05:51 AM, James Cowgill wrote: > >From: Markos Chandras <markos.chandras@xxxxxxxxxx> > > > >Add support for the UBNT E200 board (EdgeRouter/EdgeRouter Pro 8 port). > > > >Signed-off-by: Markos Chandras <markos.chandras@xxxxxxxxxx> > >Signed-off-by: James Cowgill <James.Cowgill@xxxxxxxxxx> > > NACK. > > As far as I know, these boards have a boot loader that supplies a > correct device tree, there should be no need to hack up the kernel > like this. > > As far as I know, Andreas is running a kernel.org kernel on these > boards without anything like this. > > Andreas, can you confirm this? Yes, a device tree is supported and most stuff works with mainline and the USB patches posted recently. Andreas > Thanks, > David Daney > > >--- > > arch/mips/cavium-octeon/executive/cvmx-helper-board.c | 3 +++ > > arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 ++ > > 2 files changed, 5 insertions(+) > > > >diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c > >index 5dfef84..69ba6fb 100644 > >--- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c > >+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c > >@@ -186,6 +186,8 @@ int cvmx_helper_board_get_mii_address(int ipd_port) > > return 7 - ipd_port; > > else > > return -1; > >+ case CVMX_BOARD_TYPE_UBNT_E200: > >+ return -1; > > case CVMX_BOARD_TYPE_CUST_DSR1000N: > > /* > > * Port 2 connects to Broadcom PHY (B5081). Other ports (0-1) > >@@ -759,6 +761,7 @@ enum cvmx_helper_board_usb_clock_types __cvmx_helper_board_usb_get_clock_type(vo > > case CVMX_BOARD_TYPE_LANAI2_G: > > case CVMX_BOARD_TYPE_NIC10E_66: > > case CVMX_BOARD_TYPE_UBNT_E100: > >+ case CVMX_BOARD_TYPE_UBNT_E200: > > case CVMX_BOARD_TYPE_CUST_DSR1000N: > > return USB_CLOCK_TYPE_CRYSTAL_12; > > case CVMX_BOARD_TYPE_NIC10E: > >diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h > >index 2298199..0567847 100644 > >--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h > >+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h > >@@ -228,6 +228,7 @@ enum cvmx_board_types_enum { > > */ > > CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001, > > CVMX_BOARD_TYPE_UBNT_E100 = 20002, > >+ CVMX_BOARD_TYPE_UBNT_E200 = 20003, > > CVMX_BOARD_TYPE_CUST_DSR1000N = 20006, > > CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000, > > > >@@ -328,6 +329,7 @@ static inline const char *cvmx_board_type_to_string(enum > > /* Customer private range */ > > ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN) > > ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100) > >+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200) > > ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N) > > ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX) > > } > > >