Browse Source

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

+ 1 - 1
board/Arcturus/ucp1020/ucp1020.c

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

+ 1 - 1
board/freescale/b4860qds/b4860qds.c

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

+ 1 - 1
board/freescale/bsc9131rdb/bsc9131rdb.c

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

+ 1 - 1
board/freescale/bsc9132qds/bsc9132qds.c

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

+ 1 - 1
board/freescale/corenet_ds/corenet_ds.c

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

+ 1 - 1
board/freescale/ls2080aqds/ls2080aqds.c

@@ -313,7 +313,7 @@ int ft_board_setup(void *blob, bd_t *bd)
 
 	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
 	fdt_fixup_board_enet(blob);

+ 1 - 1
board/freescale/ls2080ardb/ls2080ardb.c

@@ -277,7 +277,7 @@ int ft_board_setup(void *blob, bd_t *bd)
 
 	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
 	fdt_fixup_board_enet(blob);

+ 1 - 1
board/freescale/mpc8308rdb/mpc8308rdb.c

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

+ 1 - 1
board/freescale/mpc8315erdb/mpc8315erdb.c

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

+ 1 - 1
board/freescale/mpc837xemds/mpc837xemds.c

@@ -332,7 +332,7 @@ int ft_board_setup(void *blob, bd_t *bd)
 {
 	ft_cpu_setup(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);
 #ifdef CONFIG_PCI
 	ft_pci_setup(blob, bd);

+ 1 - 1
board/freescale/mpc837xerdb/mpc837xerdb.c

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

+ 1 - 1
board/freescale/mpc8536ds/mpc8536ds.c

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

+ 1 - 1
board/freescale/p1010rdb/p1010rdb.c

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

+ 1 - 1
board/freescale/p1022ds/p1022ds.c

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

+ 1 - 1
board/freescale/p1023rdb/p1023rdb.c

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

+ 1 - 1
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c

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

+ 1 - 1
board/freescale/p1_twr/p1_twr.c

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

+ 1 - 1
board/freescale/p2041rdb/p2041rdb.c

@@ -225,7 +225,7 @@ int ft_board_setup(void *blob, bd_t *bd)
 	fdt_fixup_memory(blob, (u64)base, (u64)size);
 
 #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
 
 #ifdef CONFIG_PCI

+ 1 - 1
board/freescale/t102xqds/t102xqds.c

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

+ 1 - 1
board/freescale/t102xrdb/t102xrdb.c

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

+ 1 - 1
board/freescale/t1040qds/t1040qds.c

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

+ 1 - 1
board/freescale/t104xrdb/t104xrdb.c

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

+ 1 - 1
board/freescale/t208xqds/t208xqds.c

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

+ 1 - 1
board/freescale/t208xrdb/t208xrdb.c

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

+ 1 - 1
board/freescale/t4qds/t4240emu.c

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

+ 1 - 1
board/freescale/t4qds/t4240qds.c

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

+ 1 - 1
board/freescale/t4rdb/t4240rdb.c

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

+ 1 - 1
board/gdsys/mpc8308/hrcon.c

@@ -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)
 {
 	ft_cpu_setup(blob, bd);
-	fdt_fixup_dr_usb(blob, bd);
+	fsl_fdt_fixup_dr_usb(blob, bd);
 	fdt_fixup_esdhc(blob, bd);
 
 	return 0;

+ 1 - 1
board/gdsys/mpc8308/strider.c

@@ -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)
 {
 	ft_cpu_setup(blob, bd);
-	fdt_fixup_dr_usb(blob, bd);
+	fsl_fdt_fixup_dr_usb(blob, bd);
 	fdt_fixup_esdhc(blob, bd);
 
 	return 0;

+ 1 - 1
board/gdsys/p1022/controlcenterd.c

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

+ 1 - 1
board/keymile/kmp204x/kmp204x.c

@@ -277,7 +277,7 @@ int ft_board_setup(void *blob, bd_t *bd)
 	fdt_fixup_memory(blob, (u64)base, (u64)size);
 
 #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
 
 #ifdef CONFIG_PCI

+ 1 - 1
board/mpc8308_p1m/mpc8308_p1m.c

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

+ 1 - 1
board/varisys/cyrus/cyrus.c

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

+ 1 - 1
drivers/usb/common/fsl-dt-fixup.c

@@ -131,7 +131,7 @@ static int fdt_fixup_erratum(int *usb_erratum_off, void *blob,
 	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 phys[] = { "ulpi", "utmi", "utmi_dual" };

+ 2 - 2
include/fdt_support.h

@@ -114,9 +114,9 @@ void fdt_fixup_qe_firmware(void *fdt);
 int fdt_fixup_display(void *blob, const char *path, const char *display);
 
 #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
-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) */
 
 #if defined(CONFIG_SYS_FSL_SEC_COMPAT)