usb: fsl: Rename fdt_fixup_dr_usb

The function fdt_fixup_dr_usb is specific to fsl/nxp. So,
make the function name explicit and rename fdt_fixup_dr_usb
into fsl_fdt_fixup_dr_usb.

Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
master
Sriram Dash 8 years ago committed by Marek Vasut
parent f7c81e2879
commit a5c289b9bc
  1. 2
      board/Arcturus/ucp1020/ucp1020.c
  2. 2
      board/freescale/b4860qds/b4860qds.c
  3. 2
      board/freescale/bsc9131rdb/bsc9131rdb.c
  4. 2
      board/freescale/bsc9132qds/bsc9132qds.c
  5. 2
      board/freescale/corenet_ds/corenet_ds.c
  6. 2
      board/freescale/ls2080aqds/ls2080aqds.c
  7. 2
      board/freescale/ls2080ardb/ls2080ardb.c
  8. 2
      board/freescale/mpc8308rdb/mpc8308rdb.c
  9. 2
      board/freescale/mpc8315erdb/mpc8315erdb.c
  10. 2
      board/freescale/mpc837xemds/mpc837xemds.c
  11. 2
      board/freescale/mpc837xerdb/mpc837xerdb.c
  12. 2
      board/freescale/mpc8536ds/mpc8536ds.c
  13. 2
      board/freescale/p1010rdb/p1010rdb.c
  14. 2
      board/freescale/p1022ds/p1022ds.c
  15. 2
      board/freescale/p1023rdb/p1023rdb.c
  16. 2
      board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
  17. 2
      board/freescale/p1_twr/p1_twr.c
  18. 2
      board/freescale/p2041rdb/p2041rdb.c
  19. 2
      board/freescale/t102xqds/t102xqds.c
  20. 2
      board/freescale/t102xrdb/t102xrdb.c
  21. 2
      board/freescale/t1040qds/t1040qds.c
  22. 2
      board/freescale/t104xrdb/t104xrdb.c
  23. 2
      board/freescale/t208xqds/t208xqds.c
  24. 2
      board/freescale/t208xrdb/t208xrdb.c
  25. 2
      board/freescale/t4qds/t4240emu.c
  26. 2
      board/freescale/t4qds/t4240qds.c
  27. 2
      board/freescale/t4rdb/t4240rdb.c
  28. 2
      board/gdsys/mpc8308/hrcon.c
  29. 2
      board/gdsys/mpc8308/strider.c
  30. 2
      board/gdsys/p1022/controlcenterd.c
  31. 2
      board/keymile/kmp204x/kmp204x.c
  32. 2
      board/mpc8308_p1m/mpc8308_p1m.c
  33. 2
      board/varisys/cyrus/cyrus.c
  34. 2
      drivers/usb/common/fsl-dt-fixup.c
  35. 4
      include/fdt_support.h

@ -315,7 +315,7 @@ int ft_board_setup(void *blob, bd_t *bd)
FT_FSL_PCI_SETUP; FT_FSL_PCI_SETUP;
#if defined(CONFIG_HAS_FSL_DR_USB) #if defined(CONFIG_HAS_FSL_DR_USB)
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
#if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH) #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH)

@ -1209,7 +1209,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
#ifdef CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN

@ -73,7 +73,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
#endif #endif
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
return 0; return 0;
} }

@ -394,7 +394,7 @@ int ft_board_setup(void *blob, bd_t *bd)
/* remove dts usb node */ /* remove dts usb node */
fdt_del_node_compat(blob, "fsl-usb2-dr"); fdt_del_node_compat(blob, "fsl-usb2-dr");
} else { } else {
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
fdt_del_node_and_alias(blob, "serial2"); fdt_del_node_and_alias(blob, "serial2");
} }
} }

@ -201,7 +201,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#endif #endif
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN
fdt_fixup_fman_ethernet(blob); fdt_fixup_fman_ethernet(blob);

@ -313,7 +313,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory_banks(blob, base, size, 2); fdt_fixup_memory_banks(blob, base, size, 2);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_FSL_MC_ENET #ifdef CONFIG_FSL_MC_ENET
fdt_fixup_board_enet(blob); fdt_fixup_board_enet(blob);

@ -277,7 +277,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory_banks(blob, base, size, 2); fdt_fixup_memory_banks(blob, base, size, 2);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_FSL_MC_ENET #ifdef CONFIG_FSL_MC_ENET
fdt_fixup_board_enet(blob); fdt_fixup_board_enet(blob);

@ -164,7 +164,7 @@ int misc_init_r(void)
int ft_board_setup(void *blob, bd_t *bd) int ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
fdt_fixup_esdhc(blob, bd); fdt_fixup_esdhc(blob, bd);
return 0; return 0;

@ -194,7 +194,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
ft_pci_setup(blob, bd); ft_pci_setup(blob, bd);
#endif #endif
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
fdt_tsec1_fixup(blob, bd); fdt_tsec1_fixup(blob, bd);
return 0; return 0;

@ -332,7 +332,7 @@ int ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
ft_tsec_fixup(blob, bd); ft_tsec_fixup(blob, bd);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
fdt_fixup_esdhc(blob, bd); fdt_fixup_esdhc(blob, bd);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
ft_pci_setup(blob, bd); ft_pci_setup(blob, bd);

@ -210,7 +210,7 @@ int ft_board_setup(void *blob, bd_t *bd)
ft_pci_setup(blob, bd); ft_pci_setup(blob, bd);
#endif #endif
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
fdt_fixup_esdhc(blob, bd); fdt_fixup_esdhc(blob, bd);
return 0; return 0;

@ -282,7 +282,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#endif #endif
#ifdef CONFIG_HAS_FSL_MPH_USB #ifdef CONFIG_HAS_FSL_MPH_USB
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
return 0; return 0;

@ -463,7 +463,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size); fdt_fixup_memory(blob, (u64)base, (u64)size);
#if defined(CONFIG_HAS_FSL_DR_USB) #if defined(CONFIG_HAS_FSL_DR_USB)
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
/* P1014 and it's derivatives don't support CAN and eTSEC3 */ /* P1014 and it's derivatives don't support CAN and eTSEC3 */

@ -345,7 +345,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size); fdt_fixup_memory(blob, (u64)base, (u64)size);
#ifdef CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
FT_FSL_PCI_SETUP; FT_FSL_PCI_SETUP;

@ -143,7 +143,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size); fdt_fixup_memory(blob, (u64)base, (u64)size);
#ifdef CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
fdt_fixup_fman_ethernet(blob); fdt_fixup_fman_ethernet(blob);

@ -454,7 +454,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#endif #endif
#if defined(CONFIG_HAS_FSL_DR_USB) #if defined(CONFIG_HAS_FSL_DR_USB)
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
#if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH) #if defined(CONFIG_SDCARD) || defined(CONFIG_SPIFLASH)

@ -282,7 +282,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#if defined(CONFIG_TWR_P1025) #if defined(CONFIG_TWR_P1025)
fdt_board_fixup_qe_pins(blob); fdt_board_fixup_qe_pins(blob);
#endif #endif
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
return 0; return 0;
} }

@ -225,7 +225,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size); fdt_fixup_memory(blob, (u64)base, (u64)size);
#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI

@ -375,7 +375,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
#ifdef CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN

@ -189,7 +189,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#endif #endif
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN
fdt_fixup_fman_ethernet(blob); fdt_fixup_fman_ethernet(blob);

@ -257,7 +257,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
#ifdef CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN

@ -144,7 +144,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
#ifdef CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN

@ -461,7 +461,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#endif #endif
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN
fdt_fixup_fman_ethernet(blob); fdt_fixup_fman_ethernet(blob);

@ -128,7 +128,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#endif #endif
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN
fdt_fixup_fman_ethernet(blob); fdt_fixup_fman_ethernet(blob);

@ -76,7 +76,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size); fdt_fixup_memory(blob, (u64)base, (u64)size);
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
return 0; return 0;
} }

@ -694,7 +694,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#endif #endif
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN
fdt_fixup_fman_ethernet(blob); fdt_fixup_fman_ethernet(blob);

@ -107,7 +107,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#endif #endif
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN
fdt_fixup_fman_ethernet(blob); fdt_fixup_fman_ethernet(blob);

@ -358,7 +358,7 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info)
int ft_board_setup(void *blob, bd_t *bd) int ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
fdt_fixup_esdhc(blob, bd); fdt_fixup_esdhc(blob, bd);
return 0; return 0;

@ -413,7 +413,7 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info)
int ft_board_setup(void *blob, bd_t *bd) int ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
fdt_fixup_esdhc(blob, bd); fdt_fixup_esdhc(blob, bd);
return 0; return 0;

@ -341,7 +341,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size); fdt_fixup_memory(blob, (u64)base, (u64)size);
#ifdef CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
FT_FSL_PCI_SETUP; FT_FSL_PCI_SETUP;

@ -277,7 +277,7 @@ int ft_board_setup(void *blob, bd_t *bd)
fdt_fixup_memory(blob, (u64)base, (u64)size); fdt_fixup_memory(blob, (u64)base, (u64)size);
#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI

@ -65,7 +65,7 @@ void pci_init_board(void)
int ft_board_setup(void *blob, bd_t *bd) int ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
return 0; return 0;
} }

@ -97,7 +97,7 @@ int ft_board_setup(void *blob, bd_t *bd)
#endif #endif
fdt_fixup_liodn(blob); fdt_fixup_liodn(blob);
fdt_fixup_dr_usb(blob, bd); fsl_fdt_fixup_dr_usb(blob, bd);
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN
fdt_fixup_fman_ethernet(blob); fdt_fixup_fman_ethernet(blob);

@ -131,7 +131,7 @@ static int fdt_fixup_erratum(int *usb_erratum_off, void *blob,
return 0; return 0;
} }
void fdt_fixup_dr_usb(void *blob, bd_t *bd) void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd)
{ {
static const char * const modes[] = { "host", "peripheral", "otg" }; static const char * const modes[] = { "host", "peripheral", "otg" };
static const char * const phys[] = { "ulpi", "utmi", "utmi_dual" }; static const char * const phys[] = { "ulpi", "utmi", "utmi_dual" };

@ -114,9 +114,9 @@ void fdt_fixup_qe_firmware(void *fdt);
int fdt_fixup_display(void *blob, const char *path, const char *display); int fdt_fixup_display(void *blob, const char *path, const char *display);
#if defined(CONFIG_USB_EHCI_FSL) || defined(CONFIG_USB_XHCI_FSL) #if defined(CONFIG_USB_EHCI_FSL) || defined(CONFIG_USB_XHCI_FSL)
void fdt_fixup_dr_usb(void *blob, bd_t *bd); void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd);
#else #else
static inline void fdt_fixup_dr_usb(void *blob, bd_t *bd) {} static inline void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd) {}
#endif /* defined(CONFIG_USB_EHCI_FSL) || defined(CONFIG_USB_XHCI_FSL) */ #endif /* defined(CONFIG_USB_EHCI_FSL) || defined(CONFIG_USB_XHCI_FSL) */
#if defined(CONFIG_SYS_FSL_SEC_COMPAT) #if defined(CONFIG_SYS_FSL_SEC_COMPAT)

Loading…
Cancel
Save