aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2010-12-02 01:49:26 -0500
committerFelipe Balbi <balbi@ti.com>2010-12-10 03:21:10 -0500
commit05ac10dd6862a3fcce33d2203fbb2ef285e3ca87 (patch)
treed56301e2a12cecc8ef75f9fc6ca121a432cc5271 /arch
parent7c925546427a0428b84bc5ba1f28b3698e492072 (diff)
usb: musb: trivial search and replace patch
change all ocurrences of musb_hdrc to musb-hdrc. We will call glue layer drivers musb-<glue layer>, so in order to keep things somewhat standard, let's change the underscore into a dash. Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-davinci/usb.c2
-rw-r--r--arch/arm/mach-omap2/clock2420_data.c2
-rw-r--r--arch/arm/mach-omap2/clock2430_data.c2
-rw-r--r--arch/arm/mach-omap2/clock3xxx_data.c8
-rw-r--r--arch/arm/mach-omap2/clock44xx_data.c2
-rw-r--r--arch/arm/mach-omap2/usb-musb.c2
-rw-r--r--arch/arm/mach-omap2/usb-tusb6010.c2
-rw-r--r--arch/blackfin/mach-bf527/boards/ad7160eval.c2
-rw-r--r--arch/blackfin/mach-bf527/boards/cm_bf527.c2
-rw-r--r--arch/blackfin/mach-bf527/boards/ezbrd.c2
-rw-r--r--arch/blackfin/mach-bf527/boards/ezkit.c2
-rw-r--r--arch/blackfin/mach-bf527/boards/tll6527m.c2
-rw-r--r--arch/blackfin/mach-bf548/boards/cm_bf548.c2
-rw-r--r--arch/blackfin/mach-bf548/boards/ezkit.c2
14 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c
index b0d6b07431c0..0c7735bc0d19 100644
--- a/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
@@ -76,7 +76,7 @@ static struct resource usb_resources[] = {
76static u64 usb_dmamask = DMA_BIT_MASK(32); 76static u64 usb_dmamask = DMA_BIT_MASK(32);
77 77
78static struct platform_device usb_dev = { 78static struct platform_device usb_dev = {
79 .name = "musb_hdrc", 79 .name = "musb-hdrc",
80 .id = -1, 80 .id = -1,
81 .dev = { 81 .dev = {
82 .platform_data = &usb_data, 82 .platform_data = &usb_data,
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c
index 21f856252ad8..831e25c89d2d 100644
--- a/arch/arm/mach-omap2/clock2420_data.c
+++ b/arch/arm/mach-omap2/clock2420_data.c
@@ -1877,7 +1877,7 @@ static struct omap_clk omap2420_clks[] = {
1877 CLK("omap-aes", "ick", &aes_ick, CK_242X), 1877 CLK("omap-aes", "ick", &aes_ick, CK_242X),
1878 CLK(NULL, "pka_ick", &pka_ick, CK_242X), 1878 CLK(NULL, "pka_ick", &pka_ick, CK_242X),
1879 CLK(NULL, "usb_fck", &usb_fck, CK_242X), 1879 CLK(NULL, "usb_fck", &usb_fck, CK_242X),
1880 CLK("musb_hdrc", "fck", &osc_ck, CK_242X), 1880 CLK("musb-hdrc", "fck", &osc_ck, CK_242X),
1881}; 1881};
1882 1882
1883/* 1883/*
diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c
index e32afcbdfb88..a6bccd7475a0 100644
--- a/arch/arm/mach-omap2/clock2430_data.c
+++ b/arch/arm/mach-omap2/clock2430_data.c
@@ -1983,7 +1983,7 @@ static struct omap_clk omap2430_clks[] = {
1983 CLK("omap-aes", "ick", &aes_ick, CK_243X), 1983 CLK("omap-aes", "ick", &aes_ick, CK_243X),
1984 CLK(NULL, "pka_ick", &pka_ick, CK_243X), 1984 CLK(NULL, "pka_ick", &pka_ick, CK_243X),
1985 CLK(NULL, "usb_fck", &usb_fck, CK_243X), 1985 CLK(NULL, "usb_fck", &usb_fck, CK_243X),
1986 CLK("musb_hdrc", "ick", &usbhs_ick, CK_243X), 1986 CLK("musb-hdrc", "ick", &usbhs_ick, CK_243X),
1987 CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_243X), 1987 CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_243X),
1988 CLK("mmci-omap-hs.0", "fck", &mmchs1_fck, CK_243X), 1988 CLK("mmci-omap-hs.0", "fck", &mmchs1_fck, CK_243X),
1989 CLK("mmci-omap-hs.1", "ick", &mmchs2_ick, CK_243X), 1989 CLK("mmci-omap-hs.1", "ick", &mmchs2_ick, CK_243X),
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index a04cb03db51f..3e668edbf6fe 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3306,8 +3306,8 @@ static struct omap_clk omap3xxx_clks[] = {
3306 CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es1, CK_3430ES1), 3306 CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es1, CK_3430ES1),
3307 CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2), 3307 CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2),
3308 CLK(NULL, "core_l3_ick", &core_l3_ick, CK_3XXX), 3308 CLK(NULL, "core_l3_ick", &core_l3_ick, CK_3XXX),
3309 CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es1, CK_3430ES1), 3309 CLK("musb-hdrc", "ick", &hsotgusb_ick_3430es1, CK_3430ES1),
3310 CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es2, CK_3430ES2), 3310 CLK("musb-hdrc", "ick", &hsotgusb_ick_3430es2, CK_3430ES2),
3311 CLK(NULL, "sdrc_ick", &sdrc_ick, CK_3XXX), 3311 CLK(NULL, "sdrc_ick", &sdrc_ick, CK_3XXX),
3312 CLK(NULL, "gpmc_fck", &gpmc_fck, CK_3XXX), 3312 CLK(NULL, "gpmc_fck", &gpmc_fck, CK_3XXX),
3313 CLK(NULL, "security_l3_ick", &security_l3_ick, CK_343X), 3313 CLK(NULL, "security_l3_ick", &security_l3_ick, CK_343X),
@@ -3442,8 +3442,8 @@ static struct omap_clk omap3xxx_clks[] = {
3442 CLK("davinci_emac", "phy_clk", &emac_fck, CK_AM35XX), 3442 CLK("davinci_emac", "phy_clk", &emac_fck, CK_AM35XX),
3443 CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX), 3443 CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX),
3444 CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX), 3444 CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX),
3445 CLK("musb_hdrc", "ick", &hsotgusb_ick_am35xx, CK_AM35XX), 3445 CLK("musb-hdrc", "ick", &hsotgusb_ick_am35xx, CK_AM35XX),
3446 CLK("musb_hdrc", "fck", &hsotgusb_fck_am35xx, CK_AM35XX), 3446 CLK("musb-hdrc", "fck", &hsotgusb_fck_am35xx, CK_AM35XX),
3447 CLK(NULL, "hecc_ck", &hecc_ck, CK_AM35XX), 3447 CLK(NULL, "hecc_ck", &hecc_ck, CK_AM35XX),
3448 CLK(NULL, "uart4_ick", &uart4_ick_am35xx, CK_AM35XX), 3448 CLK(NULL, "uart4_ick", &uart4_ick_am35xx, CK_AM35XX),
3449}; 3449};
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index f473e8922664..95dd34ce6ea1 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -2953,7 +2953,7 @@ static struct omap_clk omap44xx_clks[] = {
2953 CLK("ehci-omap.0", "usbhost_ick", &dummy_ck, CK_443X), 2953 CLK("ehci-omap.0", "usbhost_ick", &dummy_ck, CK_443X),
2954 CLK(NULL, "otg_60m_gfclk", &otg_60m_gfclk, CK_443X), 2954 CLK(NULL, "otg_60m_gfclk", &otg_60m_gfclk, CK_443X),
2955 CLK(NULL, "usb_otg_hs_xclk", &usb_otg_hs_xclk, CK_443X), 2955 CLK(NULL, "usb_otg_hs_xclk", &usb_otg_hs_xclk, CK_443X),
2956 CLK("musb_hdrc", "ick", &usb_otg_hs_ick, CK_443X), 2956 CLK("musb-hdrc", "ick", &usb_otg_hs_ick, CK_443X),
2957 CLK(NULL, "usb_phy_cm_clk32k", &usb_phy_cm_clk32k, CK_443X), 2957 CLK(NULL, "usb_phy_cm_clk32k", &usb_phy_cm_clk32k, CK_443X),
2958 CLK(NULL, "usb_tll_hs_usb_ch2_clk", &usb_tll_hs_usb_ch2_clk, CK_443X), 2958 CLK(NULL, "usb_tll_hs_usb_ch2_clk", &usb_tll_hs_usb_ch2_clk, CK_443X),
2959 CLK(NULL, "usb_tll_hs_usb_ch0_clk", &usb_tll_hs_usb_ch0_clk, CK_443X), 2959 CLK(NULL, "usb_tll_hs_usb_ch0_clk", &usb_tll_hs_usb_ch0_clk, CK_443X),
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index ed0e85c3764f..7d3ea53af3ab 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -77,7 +77,7 @@ static struct musb_hdrc_platform_data musb_plat = {
77static u64 musb_dmamask = DMA_BIT_MASK(32); 77static u64 musb_dmamask = DMA_BIT_MASK(32);
78 78
79static struct platform_device musb_device = { 79static struct platform_device musb_device = {
80 .name = "musb_hdrc", 80 .name = "musb-hdrc",
81 .id = -1, 81 .id = -1,
82 .dev = { 82 .dev = {
83 .dma_mask = &musb_dmamask, 83 .dma_mask = &musb_dmamask,
diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c
index 64a0112b70a5..42389213b470 100644
--- a/arch/arm/mach-omap2/usb-tusb6010.c
+++ b/arch/arm/mach-omap2/usb-tusb6010.c
@@ -223,7 +223,7 @@ static struct resource tusb_resources[] = {
223static u64 tusb_dmamask = ~(u32)0; 223static u64 tusb_dmamask = ~(u32)0;
224 224
225static struct platform_device tusb_device = { 225static struct platform_device tusb_device = {
226 .name = "musb_hdrc", 226 .name = "musb-hdrc",
227 .id = -1, 227 .id = -1,
228 .dev = { 228 .dev = {
229 .dma_mask = &tusb_dmamask, 229 .dma_mask = &tusb_dmamask,
diff --git a/arch/blackfin/mach-bf527/boards/ad7160eval.c b/arch/blackfin/mach-bf527/boards/ad7160eval.c
index fc767ac76381..ec9f2612be1d 100644
--- a/arch/blackfin/mach-bf527/boards/ad7160eval.c
+++ b/arch/blackfin/mach-bf527/boards/ad7160eval.c
@@ -83,7 +83,7 @@ static struct musb_hdrc_platform_data musb_plat = {
83static u64 musb_dmamask = ~(u32)0; 83static u64 musb_dmamask = ~(u32)0;
84 84
85static struct platform_device musb_device = { 85static struct platform_device musb_device = {
86 .name = "musb_hdrc", 86 .name = "musb-hdrc",
87 .id = 0, 87 .id = 0,
88 .dev = { 88 .dev = {
89 .dma_mask = &musb_dmamask, 89 .dma_mask = &musb_dmamask,
diff --git a/arch/blackfin/mach-bf527/boards/cm_bf527.c b/arch/blackfin/mach-bf527/boards/cm_bf527.c
index f714d7be35b9..a7627dee688e 100644
--- a/arch/blackfin/mach-bf527/boards/cm_bf527.c
+++ b/arch/blackfin/mach-bf527/boards/cm_bf527.c
@@ -120,7 +120,7 @@ static struct musb_hdrc_platform_data musb_plat = {
120static u64 musb_dmamask = ~(u32)0; 120static u64 musb_dmamask = ~(u32)0;
121 121
122static struct platform_device musb_device = { 122static struct platform_device musb_device = {
123 .name = "musb_hdrc", 123 .name = "musb-hdrc",
124 .id = 0, 124 .id = 0,
125 .dev = { 125 .dev = {
126 .dma_mask = &musb_dmamask, 126 .dma_mask = &musb_dmamask,
diff --git a/arch/blackfin/mach-bf527/boards/ezbrd.c b/arch/blackfin/mach-bf527/boards/ezbrd.c
index 315eec930604..d1df634e24c3 100644
--- a/arch/blackfin/mach-bf527/boards/ezbrd.c
+++ b/arch/blackfin/mach-bf527/boards/ezbrd.c
@@ -84,7 +84,7 @@ static struct musb_hdrc_platform_data musb_plat = {
84static u64 musb_dmamask = ~(u32)0; 84static u64 musb_dmamask = ~(u32)0;
85 85
86static struct platform_device musb_device = { 86static struct platform_device musb_device = {
87 .name = "musb_hdrc", 87 .name = "musb-hdrc",
88 .id = 0, 88 .id = 0,
89 .dev = { 89 .dev = {
90 .dma_mask = &musb_dmamask, 90 .dma_mask = &musb_dmamask,
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 273731279740..5983abd8a7e3 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -124,7 +124,7 @@ static struct musb_hdrc_platform_data musb_plat = {
124static u64 musb_dmamask = ~(u32)0; 124static u64 musb_dmamask = ~(u32)0;
125 125
126static struct platform_device musb_device = { 126static struct platform_device musb_device = {
127 .name = "musb_hdrc", 127 .name = "musb-hdrc",
128 .id = 0, 128 .id = 0,
129 .dev = { 129 .dev = {
130 .dma_mask = &musb_dmamask, 130 .dma_mask = &musb_dmamask,
diff --git a/arch/blackfin/mach-bf527/boards/tll6527m.c b/arch/blackfin/mach-bf527/boards/tll6527m.c
index 9ec575729e2c..284ec1f44131 100644
--- a/arch/blackfin/mach-bf527/boards/tll6527m.c
+++ b/arch/blackfin/mach-bf527/boards/tll6527m.c
@@ -91,7 +91,7 @@ static struct musb_hdrc_platform_data musb_plat = {
91static u64 musb_dmamask = ~(u32)0; 91static u64 musb_dmamask = ~(u32)0;
92 92
93static struct platform_device musb_device = { 93static struct platform_device musb_device = {
94 .name = "musb_hdrc", 94 .name = "musb-hdrc",
95 .id = 0, 95 .id = 0,
96 .dev = { 96 .dev = {
97 .dma_mask = &musb_dmamask, 97 .dma_mask = &musb_dmamask,
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c
index 3e3dfb23f94e..f52334519a20 100644
--- a/arch/blackfin/mach-bf548/boards/cm_bf548.c
+++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c
@@ -520,7 +520,7 @@ static struct musb_hdrc_platform_data musb_plat = {
520static u64 musb_dmamask = ~(u32)0; 520static u64 musb_dmamask = ~(u32)0;
521 521
522static struct platform_device musb_device = { 522static struct platform_device musb_device = {
523 .name = "musb_hdrc", 523 .name = "musb-hdrc",
524 .id = 0, 524 .id = 0,
525 .dev = { 525 .dev = {
526 .dma_mask = &musb_dmamask, 526 .dma_mask = &musb_dmamask,
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 9ff166d6f00d..e2c851bef99a 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -625,7 +625,7 @@ static struct musb_hdrc_platform_data musb_plat = {
625static u64 musb_dmamask = ~(u32)0; 625static u64 musb_dmamask = ~(u32)0;
626 626
627static struct platform_device musb_device = { 627static struct platform_device musb_device = {
628 .name = "musb_hdrc", 628 .name = "musb-hdrc",
629 .id = 0, 629 .id = 0,
630 .dev = { 630 .dev = {
631 .dma_mask = &musb_dmamask, 631 .dma_mask = &musb_dmamask,