| Message ID | 1427183322-25911-1-git-send-email-ying.zhang@freescale.com |
|---|---|
| State | Changes Requested |
| Delegated to: | York Sun |
| Headers | show |
On 03/24/2015 12:48 AM, ying.zhang@freescale.com wrote: > From: Ying Zhang <b40530@freescale.com> > > Because the function ft_board_setup() delete the USB2 device node, it > leads to can't find the device node and hung up. > > In fact only P1020RDB needs to delete the USB2 node, this patch fixes > this issue. > > Signed-off-by: Ying Zhang <b40530@freescale.com> > --- > board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c > index 3f47cfb..0c60fc3 100644 > --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c > +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c > @@ -428,8 +428,10 @@ int ft_board_setup(void *blob, bd_t *bd) > { > phys_addr_t base; > phys_size_t size; > +#if defined(CONFIG_P1020RDB_PD) || defined(CONFIG_P1020RDB_PC) > const char *soc_usb_compat = "fsl-usb2-dr"; > int err, usb1_off, usb2_off; > +#endif "err" is used elsewhere. Your change causes compiling error on these boards P1025RDB_SDCARD P2020RDB-PC_36BIT_SPIFLASH P1021RDB-PC_36BIT_SPIFLASH P2020RDB-PC_SPIFLASH P1020MBG-PC_36BIT_SDCARD P1024RDB_SPIFLASH P1021RDB-PC_SPIFLASH P1020MBG-PC_SDCARD P2020RDB-PC_36BIT_SDCARD P1021RDB-PC_SDCARD P2020RDB-PC_SDCARD P1024RDB_SDCARD P1025RDB_SPIFLASH P1020UTM-PC_36BIT_SDCARD P1021RDB-PC_36BIT_SDCARD P1020UTM-PC_SDCARD York
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index 3f47cfb..0c60fc3 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -428,8 +428,10 @@ int ft_board_setup(void *blob, bd_t *bd) { phys_addr_t base; phys_size_t size; +#if defined(CONFIG_P1020RDB_PD) || defined(CONFIG_P1020RDB_PC) const char *soc_usb_compat = "fsl-usb2-dr"; int err, usb1_off, usb2_off; +#endif ft_cpu_setup(blob, bd); @@ -473,6 +475,7 @@ int ft_board_setup(void *blob, bd_t *bd) } #endif +#if defined(CONFIG_P1020RDB_PD) || defined(CONFIG_P1020RDB_PC) /* Delete USB2 node as it is muxed with eLBC */ usb1_off = fdt_node_offset_by_compatible(blob, -1, soc_usb_compat); @@ -494,6 +497,7 @@ int ft_board_setup(void *blob, bd_t *bd) return err; } +#endif return 0; } #endif