summaryrefslogtreecommitdiffstats
path: root/extras/recipes-kernel/linux/linux-omap-2.6.39/mfd/0006-arm-omap-usb-device-name-change-for-the-clk-names-of.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap-2.6.39/mfd/0006-arm-omap-usb-device-name-change-for-the-clk-names-of.patch')
-rw-r--r--extras/recipes-kernel/linux/linux-omap-2.6.39/mfd/0006-arm-omap-usb-device-name-change-for-the-clk-names-of.patch123
1 files changed, 123 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/mfd/0006-arm-omap-usb-device-name-change-for-the-clk-names-of.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/mfd/0006-arm-omap-usb-device-name-change-for-the-clk-names-of.patch
new file mode 100644
index 00000000..c0ac58bf
--- /dev/null
+++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/mfd/0006-arm-omap-usb-device-name-change-for-the-clk-names-of.patch
@@ -0,0 +1,123 @@
1From 64bc651bb56435e4cd86d2ebfa4f301abdbac6e5 Mon Sep 17 00:00:00 2001
2From: Keshava Munegowda <Keshava_mgowda@ti.com>
3Date: Wed, 1 Jun 2011 11:02:58 -0700
4Subject: [PATCH 06/13] arm: omap: usb: device name change for the clk names of usbhs
5
6device name usbhs clocks are changed from
7usbhs-omap.0 to usbhs_omap; this is because
8in the hwmod registration the device name is set
9as usbhs_omap
10
11Signed-off-by: Keshava Munegowda <keshava_mgowda@ti.com>
12---
13 arch/arm/mach-omap2/clock3xxx_data.c | 28 ++++++++++++++--------------
14 arch/arm/mach-omap2/clock44xx_data.c | 10 +++++-----
15 drivers/mfd/omap-usb-host.c | 2 +-
16 3 files changed, 20 insertions(+), 20 deletions(-)
17
18diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
19index 75b119b..fabe482 100644
20--- a/arch/arm/mach-omap2/clock3xxx_data.c
21+++ b/arch/arm/mach-omap2/clock3xxx_data.c
22@@ -3285,7 +3285,7 @@ static struct omap_clk omap3xxx_clks[] = {
23 CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
24 CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
25 CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
26- CLK("usbhs-omap.0", "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
27+ CLK("usbhs_omap", "usbtll_fck", &usbtll_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
28 CLK("omap-mcbsp.1", "prcm_fck", &core_96m_fck, CK_3XXX),
29 CLK("omap-mcbsp.5", "prcm_fck", &core_96m_fck, CK_3XXX),
30 CLK(NULL, "core_96m_fck", &core_96m_fck, CK_3XXX),
31@@ -3321,7 +3321,7 @@ static struct omap_clk omap3xxx_clks[] = {
32 CLK(NULL, "pka_ick", &pka_ick, CK_34XX | CK_36XX),
33 CLK(NULL, "core_l4_ick", &core_l4_ick, CK_3XXX),
34 CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
35- CLK("usbhs-omap.0", "usbtll_ick", &usbtll_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
36+ CLK("usbhs_omap", "usbtll_ick", &usbtll_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
37 CLK("omap_hsmmc.2", "ick", &mmchs3_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
38 CLK(NULL, "icr_ick", &icr_ick, CK_34XX | CK_36XX),
39 CLK("omap-aes", "ick", &aes2_ick, CK_34XX | CK_36XX),
40@@ -3367,20 +3367,20 @@ static struct omap_clk omap3xxx_clks[] = {
41 CLK(NULL, "cam_ick", &cam_ick, CK_34XX | CK_36XX),
42 CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_34XX | CK_36XX),
43 CLK(NULL, "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
44- CLK("usbhs-omap.0", "hs_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
45+ CLK("usbhs_omap", "hs_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
46 CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
47- CLK("usbhs-omap.0", "fs_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
48+ CLK("usbhs_omap", "fs_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
49 CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
50- CLK("usbhs-omap.0", "usbhost_ick", &usbhost_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
51- CLK("usbhs-omap.0", "utmi_p1_gfclk", &dummy_ck, CK_3XXX),
52- CLK("usbhs-omap.0", "utmi_p2_gfclk", &dummy_ck, CK_3XXX),
53- CLK("usbhs-omap.0", "xclk60mhsp1_ck", &dummy_ck, CK_3XXX),
54- CLK("usbhs-omap.0", "xclk60mhsp2_ck", &dummy_ck, CK_3XXX),
55- CLK("usbhs-omap.0", "usb_host_hs_utmi_p1_clk", &dummy_ck, CK_3XXX),
56- CLK("usbhs-omap.0", "usb_host_hs_utmi_p2_clk", &dummy_ck, CK_3XXX),
57- CLK("usbhs-omap.0", "usb_tll_hs_usb_ch0_clk", &dummy_ck, CK_3XXX),
58- CLK("usbhs-omap.0", "usb_tll_hs_usb_ch1_clk", &dummy_ck, CK_3XXX),
59- CLK("usbhs-omap.0", "init_60m_fclk", &dummy_ck, CK_3XXX),
60+ CLK("usbhs_omap", "usbhost_ick", &usbhost_ick, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
61+ CLK("usbhs_omap", "utmi_p1_gfclk", &dummy_ck, CK_3XXX),
62+ CLK("usbhs_omap", "utmi_p2_gfclk", &dummy_ck, CK_3XXX),
63+ CLK("usbhs_omap", "xclk60mhsp1_ck", &dummy_ck, CK_3XXX),
64+ CLK("usbhs_omap", "xclk60mhsp2_ck", &dummy_ck, CK_3XXX),
65+ CLK("usbhs_omap", "usb_host_hs_utmi_p1_clk", &dummy_ck, CK_3XXX),
66+ CLK("usbhs_omap", "usb_host_hs_utmi_p2_clk", &dummy_ck, CK_3XXX),
67+ CLK("usbhs_omap", "usb_tll_hs_usb_ch0_clk", &dummy_ck, CK_3XXX),
68+ CLK("usbhs_omap", "usb_tll_hs_usb_ch1_clk", &dummy_ck, CK_3XXX),
69+ CLK("usbhs_omap", "init_60m_fclk", &dummy_ck, CK_3XXX),
70 CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2PLUS | CK_36XX),
71 CLK(NULL, "gpt1_fck", &gpt1_fck, CK_3XXX),
72 CLK(NULL, "wkup_32k_fck", &wkup_32k_fck, CK_3XXX),
73diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
74index 8c96567..34e91eb 100644
75--- a/arch/arm/mach-omap2/clock44xx_data.c
76+++ b/arch/arm/mach-omap2/clock44xx_data.c
77@@ -3205,7 +3205,7 @@ static struct omap_clk omap44xx_clks[] = {
78 CLK(NULL, "uart3_fck", &uart3_fck, CK_443X),
79 CLK(NULL, "uart4_fck", &uart4_fck, CK_443X),
80 CLK(NULL, "usb_host_fs_fck", &usb_host_fs_fck, CK_443X),
81- CLK("usbhs-omap.0", "fs_fck", &usb_host_fs_fck, CK_443X),
82+ CLK("usbhs_omap", "fs_fck", &usb_host_fs_fck, CK_443X),
83 CLK(NULL, "utmi_p1_gfclk", &utmi_p1_gfclk, CK_443X),
84 CLK(NULL, "usb_host_hs_utmi_p1_clk", &usb_host_hs_utmi_p1_clk, CK_443X),
85 CLK(NULL, "utmi_p2_gfclk", &utmi_p2_gfclk, CK_443X),
86@@ -3217,8 +3217,8 @@ static struct omap_clk omap44xx_clks[] = {
87 CLK(NULL, "usb_host_hs_hsic480m_p2_clk", &usb_host_hs_hsic480m_p2_clk, CK_443X),
88 CLK(NULL, "usb_host_hs_func48mclk", &usb_host_hs_func48mclk, CK_443X),
89 CLK(NULL, "usb_host_hs_fck", &usb_host_hs_fck, CK_443X),
90- CLK("usbhs-omap.0", "hs_fck", &usb_host_hs_fck, CK_443X),
91- CLK("usbhs-omap.0", "usbhost_ick", &dummy_ck, CK_443X),
92+ CLK("usbhs_omap", "hs_fck", &usb_host_hs_fck, CK_443X),
93+ CLK("usbhs_omap", "usbhost_ick", &dummy_ck, CK_443X),
94 CLK(NULL, "otg_60m_gfclk", &otg_60m_gfclk, CK_443X),
95 CLK(NULL, "usb_otg_hs_xclk", &usb_otg_hs_xclk, CK_443X),
96 CLK("musb-omap2430", "ick", &usb_otg_hs_ick, CK_443X),
97@@ -3227,8 +3227,8 @@ static struct omap_clk omap44xx_clks[] = {
98 CLK(NULL, "usb_tll_hs_usb_ch0_clk", &usb_tll_hs_usb_ch0_clk, CK_443X),
99 CLK(NULL, "usb_tll_hs_usb_ch1_clk", &usb_tll_hs_usb_ch1_clk, CK_443X),
100 CLK(NULL, "usb_tll_hs_ick", &usb_tll_hs_ick, CK_443X),
101- CLK("usbhs-omap.0", "usbtll_ick", &usb_tll_hs_ick, CK_443X),
102- CLK("usbhs-omap.0", "usbtll_fck", &dummy_ck, CK_443X),
103+ CLK("usbhs_omap", "usbtll_ick", &usb_tll_hs_ick, CK_443X),
104+ CLK("usbhs_omap", "usbtll_fck", &dummy_ck, CK_443X),
105 CLK(NULL, "usim_ck", &usim_ck, CK_443X),
106 CLK(NULL, "usim_fclk", &usim_fclk, CK_443X),
107 CLK(NULL, "usim_fck", &usim_fck, CK_443X),
108diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
109index 8552195..43de12a 100644
110--- a/drivers/mfd/omap-usb-host.c
111+++ b/drivers/mfd/omap-usb-host.c
112@@ -28,7 +28,7 @@
113 #include <plat/usb.h>
114 #include <linux/pm_runtime.h>
115
116-#define USBHS_DRIVER_NAME "usbhs-omap"
117+#define USBHS_DRIVER_NAME "usbhs_omap"
118 #define OMAP_EHCI_DEVICE "ehci-omap"
119 #define OMAP_OHCI_DEVICE "ohci-omap3"
120
121--
1221.6.6.1
123
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-28 04:49:34 +0000