* [U-Boot] [PATCH 0/2] Renaming the fsl/nxp specific functions
@ 2016-09-16 11:42 Sriram Dash
2016-09-16 11:42 ` [U-Boot] [PATCH 1/2] usb: fsl: Rename fdt_fixup_dr_usb Sriram Dash
2016-09-16 11:42 ` [U-Boot] [PATCH 2/2] usb: fsl: Renaming fdt_fixup_erratum and fdt_fixup_usb_erratum Sriram Dash
0 siblings, 2 replies; 6+ messages in thread
From: Sriram Dash @ 2016-09-16 11:42 UTC (permalink / raw)
To: u-boot
The functions fdt_fixup_dr_usb, fdt_fixup_erratum and
fdt_fixup_usb_erratum are renamed to fsl_fdt_fixup_dr_usb,
fsl_fdt_fixup_erratum and fsl_fdt_fixup_usb_erratum
respectively.This makes more sense as these are not generic
functions.
Sriram Dash (2):
usb: fsl: Rename fdt_fixup_dr_usb
usb: fsl: Renaming fdt_fixup_erratum and fdt_fixup_usb_erratum
board/Arcturus/ucp1020/ucp1020.c | 2 +-
board/freescale/b4860qds/b4860qds.c | 2 +-
board/freescale/bsc9131rdb/bsc9131rdb.c | 2 +-
board/freescale/bsc9132qds/bsc9132qds.c | 2 +-
board/freescale/corenet_ds/corenet_ds.c | 2 +-
board/freescale/ls2080aqds/ls2080aqds.c | 2 +-
board/freescale/ls2080ardb/ls2080ardb.c | 2 +-
board/freescale/mpc8308rdb/mpc8308rdb.c | 2 +-
board/freescale/mpc8315erdb/mpc8315erdb.c | 2 +-
board/freescale/mpc837xemds/mpc837xemds.c | 2 +-
board/freescale/mpc837xerdb/mpc837xerdb.c | 2 +-
board/freescale/mpc8536ds/mpc8536ds.c | 2 +-
board/freescale/p1010rdb/p1010rdb.c | 2 +-
board/freescale/p1022ds/p1022ds.c | 2 +-
board/freescale/p1023rdb/p1023rdb.c | 2 +-
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
board/freescale/p1_twr/p1_twr.c | 2 +-
board/freescale/p2041rdb/p2041rdb.c | 2 +-
board/freescale/t102xqds/t102xqds.c | 2 +-
board/freescale/t102xrdb/t102xrdb.c | 2 +-
board/freescale/t1040qds/t1040qds.c | 2 +-
board/freescale/t104xrdb/t104xrdb.c | 2 +-
board/freescale/t208xqds/t208xqds.c | 2 +-
board/freescale/t208xrdb/t208xrdb.c | 2 +-
board/freescale/t4qds/t4240emu.c | 2 +-
board/freescale/t4qds/t4240qds.c | 2 +-
board/freescale/t4rdb/t4240rdb.c | 2 +-
board/gdsys/mpc8308/hrcon.c | 2 +-
board/gdsys/mpc8308/strider.c | 2 +-
board/gdsys/p1022/controlcenterd.c | 2 +-
board/keymile/kmp204x/kmp204x.c | 2 +-
board/mpc8308_p1m/mpc8308_p1m.c | 2 +-
board/varisys/cyrus/cyrus.c | 2 +-
drivers/usb/common/fsl-dt-fixup.c | 47 +++++++++++++++--------------
include/fdt_support.h | 4 +--
35 files changed, 59 insertions(+), 58 deletions(-)
--
2.1.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] usb: fsl: Rename fdt_fixup_dr_usb
2016-09-16 11:42 [U-Boot] [PATCH 0/2] Renaming the fsl/nxp specific functions Sriram Dash
@ 2016-09-16 11:42 ` Sriram Dash
2016-09-18 10:48 ` Marek Vasut
2016-09-16 11:42 ` [U-Boot] [PATCH 2/2] usb: fsl: Renaming fdt_fixup_erratum and fdt_fixup_usb_erratum Sriram Dash
1 sibling, 1 reply; 6+ messages in thread
From: Sriram Dash @ 2016-09-16 11:42 UTC (permalink / raw)
To: u-boot
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>
---
board/Arcturus/ucp1020/ucp1020.c | 2 +-
board/freescale/b4860qds/b4860qds.c | 2 +-
board/freescale/bsc9131rdb/bsc9131rdb.c | 2 +-
board/freescale/bsc9132qds/bsc9132qds.c | 2 +-
board/freescale/corenet_ds/corenet_ds.c | 2 +-
board/freescale/ls2080aqds/ls2080aqds.c | 2 +-
board/freescale/ls2080ardb/ls2080ardb.c | 2 +-
board/freescale/mpc8308rdb/mpc8308rdb.c | 2 +-
board/freescale/mpc8315erdb/mpc8315erdb.c | 2 +-
board/freescale/mpc837xemds/mpc837xemds.c | 2 +-
board/freescale/mpc837xerdb/mpc837xerdb.c | 2 +-
board/freescale/mpc8536ds/mpc8536ds.c | 2 +-
board/freescale/p1010rdb/p1010rdb.c | 2 +-
board/freescale/p1022ds/p1022ds.c | 2 +-
board/freescale/p1023rdb/p1023rdb.c | 2 +-
board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
board/freescale/p1_twr/p1_twr.c | 2 +-
board/freescale/p2041rdb/p2041rdb.c | 2 +-
board/freescale/t102xqds/t102xqds.c | 2 +-
board/freescale/t102xrdb/t102xrdb.c | 2 +-
board/freescale/t1040qds/t1040qds.c | 2 +-
board/freescale/t104xrdb/t104xrdb.c | 2 +-
board/freescale/t208xqds/t208xqds.c | 2 +-
board/freescale/t208xrdb/t208xrdb.c | 2 +-
board/freescale/t4qds/t4240emu.c | 2 +-
board/freescale/t4qds/t4240qds.c | 2 +-
board/freescale/t4rdb/t4240rdb.c | 2 +-
board/gdsys/mpc8308/hrcon.c | 2 +-
board/gdsys/mpc8308/strider.c | 2 +-
board/gdsys/p1022/controlcenterd.c | 2 +-
board/keymile/kmp204x/kmp204x.c | 2 +-
board/mpc8308_p1m/mpc8308_p1m.c | 2 +-
board/varisys/cyrus/cyrus.c | 2 +-
drivers/usb/common/fsl-dt-fixup.c | 2 +-
include/fdt_support.h | 4 ++--
35 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/board/Arcturus/ucp1020/ucp1020.c b/board/Arcturus/ucp1020/ucp1020.c
index 0fc2bac..0d086e8 100644
--- a/board/Arcturus/ucp1020/ucp1020.c
+++ b/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)
diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c
index e582abb..5dd314e 100644
--- a/board/freescale/b4860qds/b4860qds.c
+++ b/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
diff --git a/board/freescale/bsc9131rdb/bsc9131rdb.c b/board/freescale/bsc9131rdb/bsc9131rdb.c
index 75e1142..fb8bb39 100644
--- a/board/freescale/bsc9131rdb/bsc9131rdb.c
+++ b/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;
}
diff --git a/board/freescale/bsc9132qds/bsc9132qds.c b/board/freescale/bsc9132qds/bsc9132qds.c
index 71a7bb5..2c836da 100644
--- a/board/freescale/bsc9132qds/bsc9132qds.c
+++ b/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");
}
}
diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index f41985d..8a44a9a 100644
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/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);
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 7d95deb..e1b17f6 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -317,7 +317,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);
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index a65cd4a..31fee53 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -281,7 +281,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);
diff --git a/board/freescale/mpc8308rdb/mpc8308rdb.c b/board/freescale/mpc8308rdb/mpc8308rdb.c
index 93e1c50..b4a0dd5 100644
--- a/board/freescale/mpc8308rdb/mpc8308rdb.c
+++ b/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;
diff --git a/board/freescale/mpc8315erdb/mpc8315erdb.c b/board/freescale/mpc8315erdb/mpc8315erdb.c
index ed611c5..3cec09b 100644
--- a/board/freescale/mpc8315erdb/mpc8315erdb.c
+++ b/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;
diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c
index 572913c..045841d 100644
--- a/board/freescale/mpc837xemds/mpc837xemds.c
+++ b/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);
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c
index 565f815..07c0599 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/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;
diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c
index 7b0f461..cede1da 100644
--- a/board/freescale/mpc8536ds/mpc8536ds.c
+++ b/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;
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c
index 1ae1540..8eecb06 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/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 */
diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c
index d7dd478..345feac 100644
--- a/board/freescale/p1022ds/p1022ds.c
+++ b/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;
diff --git a/board/freescale/p1023rdb/p1023rdb.c b/board/freescale/p1023rdb/p1023rdb.c
index 074b713..0451722 100644
--- a/board/freescale/p1023rdb/p1023rdb.c
+++ b/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);
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 61b7a91..d61c3a5 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
@@ -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)
diff --git a/board/freescale/p1_twr/p1_twr.c b/board/freescale/p1_twr/p1_twr.c
index a40bea3..f54a6ff 100644
--- a/board/freescale/p1_twr/p1_twr.c
+++ b/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;
}
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c
index c6a7242..21fb66f 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/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
diff --git a/board/freescale/t102xqds/t102xqds.c b/board/freescale/t102xqds/t102xqds.c
index 76793a1..1affa0b 100644
--- a/board/freescale/t102xqds/t102xqds.c
+++ b/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
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c
index 01dbf38..24df4b4 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/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);
diff --git a/board/freescale/t1040qds/t1040qds.c b/board/freescale/t1040qds/t1040qds.c
index d7d56b4..5466fbf 100644
--- a/board/freescale/t1040qds/t1040qds.c
+++ b/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
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c
index ec97677..6bad6a454 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/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
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c
index bfea3a1..d016329 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/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);
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index 0cb05aa..1ab05ec 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/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);
diff --git a/board/freescale/t4qds/t4240emu.c b/board/freescale/t4qds/t4240emu.c
index f1393f2..35ad19e 100644
--- a/board/freescale/t4qds/t4240emu.c
+++ b/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;
}
diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c
index d6df144..8f9e7e8 100644
--- a/board/freescale/t4qds/t4240qds.c
+++ b/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);
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c
index 406fb13..bdd6f4e 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/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);
diff --git a/board/gdsys/mpc8308/hrcon.c b/board/gdsys/mpc8308/hrcon.c
index f55893f..c6566e9 100644
--- a/board/gdsys/mpc8308/hrcon.c
+++ b/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;
diff --git a/board/gdsys/mpc8308/strider.c b/board/gdsys/mpc8308/strider.c
index b8dde5f..34e9d19 100644
--- a/board/gdsys/mpc8308/strider.c
+++ b/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;
diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c
index 2f98e47..01064dc 100644
--- a/board/gdsys/p1022/controlcenterd.c
+++ b/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;
diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index eebb47f..abb2019 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/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
diff --git a/board/mpc8308_p1m/mpc8308_p1m.c b/board/mpc8308_p1m/mpc8308_p1m.c
index 688cc12..234a387 100644
--- a/board/mpc8308_p1m/mpc8308_p1m.c
+++ b/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;
}
diff --git a/board/varisys/cyrus/cyrus.c b/board/varisys/cyrus/cyrus.c
index 79c363c..74f4473 100644
--- a/board/varisys/cyrus/cyrus.c
+++ b/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);
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 9c48852..906f9df 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/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" };
diff --git a/include/fdt_support.h b/include/fdt_support.h
index e9f3497..8f40231 100644
--- a/include/fdt_support.h
+++ b/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)
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] usb: fsl: Renaming fdt_fixup_erratum and fdt_fixup_usb_erratum
2016-09-16 11:42 [U-Boot] [PATCH 0/2] Renaming the fsl/nxp specific functions Sriram Dash
2016-09-16 11:42 ` [U-Boot] [PATCH 1/2] usb: fsl: Rename fdt_fixup_dr_usb Sriram Dash
@ 2016-09-16 11:42 ` Sriram Dash
2016-09-23 7:32 ` Sriram Dash
1 sibling, 1 reply; 6+ messages in thread
From: Sriram Dash @ 2016-09-16 11:42 UTC (permalink / raw)
To: u-boot
The functions fdt_fixup_erratum and fdt_fixup_usb_erratum are
fsl/nxp specific. So, make them explicit by renaming them
fsl_fdt_fixup_erratum and fsl_fdt_fixup_usb_erratum
Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
---
drivers/usb/common/fsl-dt-fixup.c | 45 ++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
index 906f9df..63a24f7 100644
--- a/drivers/usb/common/fsl-dt-fixup.c
+++ b/drivers/usb/common/fsl-dt-fixup.c
@@ -86,8 +86,9 @@ static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode,
return node_offset;
}
-static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
- const char *controller_type, int start_offset)
+static int fsl_fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
+ const char *controller_type,
+ int start_offset)
{
int node_offset, err;
const char *node_type = NULL;
@@ -114,17 +115,17 @@ static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
return node_offset;
}
-static int fdt_fixup_erratum(int *usb_erratum_off, void *blob,
- const char *controller_type, char *str,
- bool (*has_erratum)(void))
+static int fsl_fdt_fixup_erratum(int *usb_erratum_off, void *blob,
+ const char *controller_type, char *str,
+ bool (*has_erratum)(void))
{
char buf[32] = {0};
snprintf(buf, sizeof(buf), "fsl,usb-erratum-%s", str);
if (!has_erratum())
return -EINVAL;
- *usb_erratum_off = fdt_fixup_usb_erratum(blob, buf, controller_type,
- *usb_erratum_off);
+ *usb_erratum_off = fsl_fdt_fixup_usb_erratum(blob, buf, controller_type,
+ *usb_erratum_off);
if (*usb_erratum_off < 0)
return -ENOSPC;
debug("Adding USB erratum %s\n", str);
@@ -198,29 +199,29 @@ void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd)
if (usb_phy_off < 0)
return;
- ret = fdt_fixup_erratum(&usb_erratum_a006261_off, blob,
- CHIPIDEA_USB2, "a006261",
- has_erratum_a006261);
+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a006261_off, blob,
+ CHIPIDEA_USB2, "a006261",
+ has_erratum_a006261);
if (ret == -ENOSPC)
return;
- ret = fdt_fixup_erratum(&usb_erratum_a007075_off, blob,
- CHIPIDEA_USB2, "a007075",
- has_erratum_a007075);
+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a007075_off, blob,
+ CHIPIDEA_USB2, "a007075",
+ has_erratum_a007075);
if (ret == -ENOSPC)
return;
- ret = fdt_fixup_erratum(&usb_erratum_a007792_off, blob,
- CHIPIDEA_USB2, "a007792",
- has_erratum_a007792);
+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a007792_off, blob,
+ CHIPIDEA_USB2, "a007792",
+ has_erratum_a007792);
if (ret == -ENOSPC)
return;
- ret = fdt_fixup_erratum(&usb_erratum_a005697_off, blob,
- CHIPIDEA_USB2, "a005697",
- has_erratum_a005697);
+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a005697_off, blob,
+ CHIPIDEA_USB2, "a005697",
+ has_erratum_a005697);
if (ret == -ENOSPC)
return;
- ret = fdt_fixup_erratum(&usb_erratum_a008751_off, blob,
- SNPS_DWC3, "a008751",
- has_erratum_a008751);
+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a008751_off, blob,
+ SNPS_DWC3, "a008751",
+ has_erratum_a008751);
if (ret == -ENOSPC)
return;
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 1/2] usb: fsl: Rename fdt_fixup_dr_usb
2016-09-16 11:42 ` [U-Boot] [PATCH 1/2] usb: fsl: Rename fdt_fixup_dr_usb Sriram Dash
@ 2016-09-18 10:48 ` Marek Vasut
0 siblings, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2016-09-18 10:48 UTC (permalink / raw)
To: u-boot
On 09/16/2016 01:42 PM, Sriram Dash wrote:
> 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>
> ---
> board/Arcturus/ucp1020/ucp1020.c | 2 +-
> board/freescale/b4860qds/b4860qds.c | 2 +-
> board/freescale/bsc9131rdb/bsc9131rdb.c | 2 +-
> board/freescale/bsc9132qds/bsc9132qds.c | 2 +-
> board/freescale/corenet_ds/corenet_ds.c | 2 +-
> board/freescale/ls2080aqds/ls2080aqds.c | 2 +-
> board/freescale/ls2080ardb/ls2080ardb.c | 2 +-
> board/freescale/mpc8308rdb/mpc8308rdb.c | 2 +-
> board/freescale/mpc8315erdb/mpc8315erdb.c | 2 +-
> board/freescale/mpc837xemds/mpc837xemds.c | 2 +-
> board/freescale/mpc837xerdb/mpc837xerdb.c | 2 +-
> board/freescale/mpc8536ds/mpc8536ds.c | 2 +-
> board/freescale/p1010rdb/p1010rdb.c | 2 +-
> board/freescale/p1022ds/p1022ds.c | 2 +-
> board/freescale/p1023rdb/p1023rdb.c | 2 +-
> board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +-
> board/freescale/p1_twr/p1_twr.c | 2 +-
> board/freescale/p2041rdb/p2041rdb.c | 2 +-
> board/freescale/t102xqds/t102xqds.c | 2 +-
> board/freescale/t102xrdb/t102xrdb.c | 2 +-
> board/freescale/t1040qds/t1040qds.c | 2 +-
> board/freescale/t104xrdb/t104xrdb.c | 2 +-
> board/freescale/t208xqds/t208xqds.c | 2 +-
> board/freescale/t208xrdb/t208xrdb.c | 2 +-
> board/freescale/t4qds/t4240emu.c | 2 +-
> board/freescale/t4qds/t4240qds.c | 2 +-
> board/freescale/t4rdb/t4240rdb.c | 2 +-
> board/gdsys/mpc8308/hrcon.c | 2 +-
> board/gdsys/mpc8308/strider.c | 2 +-
> board/gdsys/p1022/controlcenterd.c | 2 +-
> board/keymile/kmp204x/kmp204x.c | 2 +-
> board/mpc8308_p1m/mpc8308_p1m.c | 2 +-
> board/varisys/cyrus/cyrus.c | 2 +-
> drivers/usb/common/fsl-dt-fixup.c | 2 +-
> include/fdt_support.h | 4 ++--
> 35 files changed, 36 insertions(+), 36 deletions(-)
>
Applied, thanks.
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] usb: fsl: Renaming fdt_fixup_erratum and fdt_fixup_usb_erratum
2016-09-16 11:42 ` [U-Boot] [PATCH 2/2] usb: fsl: Renaming fdt_fixup_erratum and fdt_fixup_usb_erratum Sriram Dash
@ 2016-09-23 7:32 ` Sriram Dash
2016-09-23 9:13 ` Marek Vasut
0 siblings, 1 reply; 6+ messages in thread
From: Sriram Dash @ 2016-09-23 7:32 UTC (permalink / raw)
To: u-boot
>From: Sriram Dash [mailto:sriram.dash at nxp.com]
>
Hello Marek,
Any comments?
>The functions fdt_fixup_erratum and fdt_fixup_usb_erratum are fsl/nxp specific.
>So, make them explicit by renaming them fsl_fdt_fixup_erratum and
>fsl_fdt_fixup_usb_erratum
>
>Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
>---
> drivers/usb/common/fsl-dt-fixup.c | 45 ++++++++++++++++++++-------------------
> 1 file changed, 23 insertions(+), 22 deletions(-)
>
>diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c
>index 906f9df..63a24f7 100644
>--- a/drivers/usb/common/fsl-dt-fixup.c
>+++ b/drivers/usb/common/fsl-dt-fixup.c
>@@ -86,8 +86,9 @@ static int fdt_fixup_usb_mode_phy_type(void *blob, const
>char *mode,
> return node_offset;
> }
>
>-static int fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
>- const char *controller_type, int start_offset)
>+static int fsl_fdt_fixup_usb_erratum(void *blob, const char *prop_erratum,
>+ const char *controller_type,
>+ int start_offset)
> {
> int node_offset, err;
> const char *node_type = NULL;
>@@ -114,17 +115,17 @@ static int fdt_fixup_usb_erratum(void *blob, const char
>*prop_erratum,
> return node_offset;
> }
>
>-static int fdt_fixup_erratum(int *usb_erratum_off, void *blob,
>- const char *controller_type, char *str,
>- bool (*has_erratum)(void))
>+static int fsl_fdt_fixup_erratum(int *usb_erratum_off, void *blob,
>+ const char *controller_type, char *str,
>+ bool (*has_erratum)(void))
> {
> char buf[32] = {0};
>
> snprintf(buf, sizeof(buf), "fsl,usb-erratum-%s", str);
> if (!has_erratum())
> return -EINVAL;
>- *usb_erratum_off = fdt_fixup_usb_erratum(blob, buf, controller_type,
>- *usb_erratum_off);
>+ *usb_erratum_off = fsl_fdt_fixup_usb_erratum(blob, buf, controller_type,
>+ *usb_erratum_off);
> if (*usb_erratum_off < 0)
> return -ENOSPC;
> debug("Adding USB erratum %s\n", str); @@ -198,29 +199,29 @@ void
>fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd)
> if (usb_phy_off < 0)
> return;
>
>- ret = fdt_fixup_erratum(&usb_erratum_a006261_off, blob,
>- CHIPIDEA_USB2, "a006261",
>- has_erratum_a006261);
>+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a006261_off, blob,
>+ CHIPIDEA_USB2, "a006261",
>+ has_erratum_a006261);
> if (ret == -ENOSPC)
> return;
>- ret = fdt_fixup_erratum(&usb_erratum_a007075_off, blob,
>- CHIPIDEA_USB2, "a007075",
>- has_erratum_a007075);
>+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a007075_off, blob,
>+ CHIPIDEA_USB2, "a007075",
>+ has_erratum_a007075);
> if (ret == -ENOSPC)
> return;
>- ret = fdt_fixup_erratum(&usb_erratum_a007792_off, blob,
>- CHIPIDEA_USB2, "a007792",
>- has_erratum_a007792);
>+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a007792_off, blob,
>+ CHIPIDEA_USB2, "a007792",
>+ has_erratum_a007792);
> if (ret == -ENOSPC)
> return;
>- ret = fdt_fixup_erratum(&usb_erratum_a005697_off, blob,
>- CHIPIDEA_USB2, "a005697",
>- has_erratum_a005697);
>+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a005697_off, blob,
>+ CHIPIDEA_USB2, "a005697",
>+ has_erratum_a005697);
> if (ret == -ENOSPC)
> return;
>- ret = fdt_fixup_erratum(&usb_erratum_a008751_off, blob,
>- SNPS_DWC3, "a008751",
>- has_erratum_a008751);
>+ ret = fsl_fdt_fixup_erratum(&usb_erratum_a008751_off, blob,
>+ SNPS_DWC3, "a008751",
>+ has_erratum_a008751);
> if (ret == -ENOSPC)
> return;
>
>--
>2.1.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 2/2] usb: fsl: Renaming fdt_fixup_erratum and fdt_fixup_usb_erratum
2016-09-23 7:32 ` Sriram Dash
@ 2016-09-23 9:13 ` Marek Vasut
0 siblings, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2016-09-23 9:13 UTC (permalink / raw)
To: u-boot
On 09/23/2016 09:32 AM, Sriram Dash wrote:
>> From: Sriram Dash [mailto:sriram.dash at nxp.com]
>>
>
> Hello Marek,
>
> Any comments?
Two, please stop top-posting and check u-boot-usb , they are already
applied.
>> The functions fdt_fixup_erratum and fdt_fixup_usb_erratum are fsl/nxp specific.
>> So, make them explicit by renaming them fsl_fdt_fixup_erratum and
>> fsl_fdt_fixup_usb_erratum
>>
>> Signed-off-by: Sriram Dash <sriram.dash@nxp.com>
[...]
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-23 9:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-16 11:42 [U-Boot] [PATCH 0/2] Renaming the fsl/nxp specific functions Sriram Dash
2016-09-16 11:42 ` [U-Boot] [PATCH 1/2] usb: fsl: Rename fdt_fixup_dr_usb Sriram Dash
2016-09-18 10:48 ` Marek Vasut
2016-09-16 11:42 ` [U-Boot] [PATCH 2/2] usb: fsl: Renaming fdt_fixup_erratum and fdt_fixup_usb_erratum Sriram Dash
2016-09-23 7:32 ` Sriram Dash
2016-09-23 9:13 ` Marek Vasut
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.