aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorKevin Hilman <khilman@deeprootsystems.com>2010-07-26 18:34:32 -0400
committerPaul Walmsley <paul@pwsan.com>2010-07-26 18:34:32 -0400
commit4a7cf90a01a642969e61879337f6524dbdde05c2 (patch)
treee803f9dfca6131550eb9ffc66d80da4f4fe0c032 /arch/arm/mach-omap2
parent90709ae91b7492ccf280252f612cd4215b725db9 (diff)
OMAP2&3: hwmod: Replace l3 -> l3_main
Replace all the struct that contain l3 with l3_main in order to be consistent with the OMAP4 naming convention. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_2420_data.c34
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_2430_data.c34
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c42
3 files changed, 55 insertions, 55 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 646386cf8679..8c90b27db2e7 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -30,41 +30,41 @@
30 */ 30 */
31 31
32static struct omap_hwmod omap2420_mpu_hwmod; 32static struct omap_hwmod omap2420_mpu_hwmod;
33static struct omap_hwmod omap2420_l3_hwmod; 33static struct omap_hwmod omap2420_l3_main_hwmod;
34static struct omap_hwmod omap2420_l4_core_hwmod; 34static struct omap_hwmod omap2420_l4_core_hwmod;
35 35
36/* L3 -> L4_CORE interface */ 36/* L3 -> L4_CORE interface */
37static struct omap_hwmod_ocp_if omap2420_l3__l4_core = { 37static struct omap_hwmod_ocp_if omap2420_l3_main__l4_core = {
38 .master = &omap2420_l3_hwmod, 38 .master = &omap2420_l3_main_hwmod,
39 .slave = &omap2420_l4_core_hwmod, 39 .slave = &omap2420_l4_core_hwmod,
40 .user = OCP_USER_MPU | OCP_USER_SDMA, 40 .user = OCP_USER_MPU | OCP_USER_SDMA,
41}; 41};
42 42
43/* MPU -> L3 interface */ 43/* MPU -> L3 interface */
44static struct omap_hwmod_ocp_if omap2420_mpu__l3 = { 44static struct omap_hwmod_ocp_if omap2420_mpu__l3_main = {
45 .master = &omap2420_mpu_hwmod, 45 .master = &omap2420_mpu_hwmod,
46 .slave = &omap2420_l3_hwmod, 46 .slave = &omap2420_l3_main_hwmod,
47 .user = OCP_USER_MPU, 47 .user = OCP_USER_MPU,
48}; 48};
49 49
50/* Slave interfaces on the L3 interconnect */ 50/* Slave interfaces on the L3 interconnect */
51static struct omap_hwmod_ocp_if *omap2420_l3_slaves[] = { 51static struct omap_hwmod_ocp_if *omap2420_l3_main_slaves[] = {
52 &omap2420_mpu__l3, 52 &omap2420_mpu__l3_main,
53}; 53};
54 54
55/* Master interfaces on the L3 interconnect */ 55/* Master interfaces on the L3 interconnect */
56static struct omap_hwmod_ocp_if *omap2420_l3_masters[] = { 56static struct omap_hwmod_ocp_if *omap2420_l3_main_masters[] = {
57 &omap2420_l3__l4_core, 57 &omap2420_l3_main__l4_core,
58}; 58};
59 59
60/* L3 */ 60/* L3 */
61static struct omap_hwmod omap2420_l3_hwmod = { 61static struct omap_hwmod omap2420_l3_main_hwmod = {
62 .name = "l3_main", 62 .name = "l3_main",
63 .class = &l3_hwmod_class, 63 .class = &l3_hwmod_class,
64 .masters = omap2420_l3_masters, 64 .masters = omap2420_l3_main_masters,
65 .masters_cnt = ARRAY_SIZE(omap2420_l3_masters), 65 .masters_cnt = ARRAY_SIZE(omap2420_l3_main_masters),
66 .slaves = omap2420_l3_slaves, 66 .slaves = omap2420_l3_main_slaves,
67 .slaves_cnt = ARRAY_SIZE(omap2420_l3_slaves), 67 .slaves_cnt = ARRAY_SIZE(omap2420_l3_main_slaves),
68 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), 68 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420),
69 .flags = HWMOD_NO_IDLEST, 69 .flags = HWMOD_NO_IDLEST,
70}; 70};
@@ -80,7 +80,7 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__l4_wkup = {
80 80
81/* Slave interfaces on the L4_CORE interconnect */ 81/* Slave interfaces on the L4_CORE interconnect */
82static struct omap_hwmod_ocp_if *omap2420_l4_core_slaves[] = { 82static struct omap_hwmod_ocp_if *omap2420_l4_core_slaves[] = {
83 &omap2420_l3__l4_core, 83 &omap2420_l3_main__l4_core,
84}; 84};
85 85
86/* Master interfaces on the L4_CORE interconnect */ 86/* Master interfaces on the L4_CORE interconnect */
@@ -123,7 +123,7 @@ static struct omap_hwmod omap2420_l4_wkup_hwmod = {
123 123
124/* Master interfaces on the MPU device */ 124/* Master interfaces on the MPU device */
125static struct omap_hwmod_ocp_if *omap2420_mpu_masters[] = { 125static struct omap_hwmod_ocp_if *omap2420_mpu_masters[] = {
126 &omap2420_mpu__l3, 126 &omap2420_mpu__l3_main,
127}; 127};
128 128
129/* MPU */ 129/* MPU */
@@ -137,7 +137,7 @@ static struct omap_hwmod omap2420_mpu_hwmod = {
137}; 137};
138 138
139static __initdata struct omap_hwmod *omap2420_hwmods[] = { 139static __initdata struct omap_hwmod *omap2420_hwmods[] = {
140 &omap2420_l3_hwmod, 140 &omap2420_l3_main_hwmod,
141 &omap2420_l4_core_hwmod, 141 &omap2420_l4_core_hwmod,
142 &omap2420_l4_wkup_hwmod, 142 &omap2420_l4_wkup_hwmod,
143 &omap2420_mpu_hwmod, 143 &omap2420_mpu_hwmod,
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index b2100cfb3171..c0f3311d5b5e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -30,41 +30,41 @@
30 */ 30 */
31 31
32static struct omap_hwmod omap2430_mpu_hwmod; 32static struct omap_hwmod omap2430_mpu_hwmod;
33static struct omap_hwmod omap2430_l3_hwmod; 33static struct omap_hwmod omap2430_l3_main_hwmod;
34static struct omap_hwmod omap2430_l4_core_hwmod; 34static struct omap_hwmod omap2430_l4_core_hwmod;
35 35
36/* L3 -> L4_CORE interface */ 36/* L3 -> L4_CORE interface */
37static struct omap_hwmod_ocp_if omap2430_l3__l4_core = { 37static struct omap_hwmod_ocp_if omap2430_l3_main__l4_core = {
38 .master = &omap2430_l3_hwmod, 38 .master = &omap2430_l3_main_hwmod,
39 .slave = &omap2430_l4_core_hwmod, 39 .slave = &omap2430_l4_core_hwmod,
40 .user = OCP_USER_MPU | OCP_USER_SDMA, 40 .user = OCP_USER_MPU | OCP_USER_SDMA,
41}; 41};
42 42
43/* MPU -> L3 interface */ 43/* MPU -> L3 interface */
44static struct omap_hwmod_ocp_if omap2430_mpu__l3 = { 44static struct omap_hwmod_ocp_if omap2430_mpu__l3_main = {
45 .master = &omap2430_mpu_hwmod, 45 .master = &omap2430_mpu_hwmod,
46 .slave = &omap2430_l3_hwmod, 46 .slave = &omap2430_l3_main_hwmod,
47 .user = OCP_USER_MPU, 47 .user = OCP_USER_MPU,
48}; 48};
49 49
50/* Slave interfaces on the L3 interconnect */ 50/* Slave interfaces on the L3 interconnect */
51static struct omap_hwmod_ocp_if *omap2430_l3_slaves[] = { 51static struct omap_hwmod_ocp_if *omap2430_l3_main_slaves[] = {
52 &omap2430_mpu__l3, 52 &omap2430_mpu__l3_main,
53}; 53};
54 54
55/* Master interfaces on the L3 interconnect */ 55/* Master interfaces on the L3 interconnect */
56static struct omap_hwmod_ocp_if *omap2430_l3_masters[] = { 56static struct omap_hwmod_ocp_if *omap2430_l3_main_masters[] = {
57 &omap2430_l3__l4_core, 57 &omap2430_l3_main__l4_core,
58}; 58};
59 59
60/* L3 */ 60/* L3 */
61static struct omap_hwmod omap2430_l3_hwmod = { 61static struct omap_hwmod omap2430_l3_main_hwmod = {
62 .name = "l3_main", 62 .name = "l3_main",
63 .class = &l3_hwmod_class, 63 .class = &l3_hwmod_class,
64 .masters = omap2430_l3_masters, 64 .masters = omap2430_l3_main_masters,
65 .masters_cnt = ARRAY_SIZE(omap2430_l3_masters), 65 .masters_cnt = ARRAY_SIZE(omap2430_l3_main_masters),
66 .slaves = omap2430_l3_slaves, 66 .slaves = omap2430_l3_main_slaves,
67 .slaves_cnt = ARRAY_SIZE(omap2430_l3_slaves), 67 .slaves_cnt = ARRAY_SIZE(omap2430_l3_main_slaves),
68 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), 68 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
69 .flags = HWMOD_NO_IDLEST, 69 .flags = HWMOD_NO_IDLEST,
70}; 70};
@@ -82,7 +82,7 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__l4_wkup = {
82 82
83/* Slave interfaces on the L4_CORE interconnect */ 83/* Slave interfaces on the L4_CORE interconnect */
84static struct omap_hwmod_ocp_if *omap2430_l4_core_slaves[] = { 84static struct omap_hwmod_ocp_if *omap2430_l4_core_slaves[] = {
85 &omap2430_l3__l4_core, 85 &omap2430_l3_main__l4_core,
86}; 86};
87 87
88/* Master interfaces on the L4_CORE interconnect */ 88/* Master interfaces on the L4_CORE interconnect */
@@ -125,7 +125,7 @@ static struct omap_hwmod omap2430_l4_wkup_hwmod = {
125 125
126/* Master interfaces on the MPU device */ 126/* Master interfaces on the MPU device */
127static struct omap_hwmod_ocp_if *omap2430_mpu_masters[] = { 127static struct omap_hwmod_ocp_if *omap2430_mpu_masters[] = {
128 &omap2430_mpu__l3, 128 &omap2430_mpu__l3_main,
129}; 129};
130 130
131/* MPU */ 131/* MPU */
@@ -139,7 +139,7 @@ static struct omap_hwmod omap2430_mpu_hwmod = {
139}; 139};
140 140
141static __initdata struct omap_hwmod *omap2430_hwmods[] = { 141static __initdata struct omap_hwmod *omap2430_hwmods[] = {
142 &omap2430_l3_hwmod, 142 &omap2430_l3_main_hwmod,
143 &omap2430_l4_core_hwmod, 143 &omap2430_l4_core_hwmod,
144 &omap2430_l4_wkup_hwmod, 144 &omap2430_l4_wkup_hwmod,
145 &omap2430_mpu_hwmod, 145 &omap2430_mpu_hwmod,
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index ec6a5f8d94a8..9d9cfb94b9ee 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -32,50 +32,50 @@
32 */ 32 */
33 33
34static struct omap_hwmod omap3xxx_mpu_hwmod; 34static struct omap_hwmod omap3xxx_mpu_hwmod;
35static struct omap_hwmod omap3xxx_l3_hwmod; 35static struct omap_hwmod omap3xxx_l3_main_hwmod;
36static struct omap_hwmod omap3xxx_l4_core_hwmod; 36static struct omap_hwmod omap3xxx_l4_core_hwmod;
37static struct omap_hwmod omap3xxx_l4_per_hwmod; 37static struct omap_hwmod omap3xxx_l4_per_hwmod;
38 38
39/* L3 -> L4_CORE interface */ 39/* L3 -> L4_CORE interface */
40static struct omap_hwmod_ocp_if omap3xxx_l3__l4_core = { 40static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_core = {
41 .master = &omap3xxx_l3_hwmod, 41 .master = &omap3xxx_l3_main_hwmod,
42 .slave = &omap3xxx_l4_core_hwmod, 42 .slave = &omap3xxx_l4_core_hwmod,
43 .user = OCP_USER_MPU | OCP_USER_SDMA, 43 .user = OCP_USER_MPU | OCP_USER_SDMA,
44}; 44};
45 45
46/* L3 -> L4_PER interface */ 46/* L3 -> L4_PER interface */
47static struct omap_hwmod_ocp_if omap3xxx_l3__l4_per = { 47static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_per = {
48 .master = &omap3xxx_l3_hwmod, 48 .master = &omap3xxx_l3_main_hwmod,
49 .slave = &omap3xxx_l4_per_hwmod, 49 .slave = &omap3xxx_l4_per_hwmod,
50 .user = OCP_USER_MPU | OCP_USER_SDMA, 50 .user = OCP_USER_MPU | OCP_USER_SDMA,
51}; 51};
52 52
53/* MPU -> L3 interface */ 53/* MPU -> L3 interface */
54static struct omap_hwmod_ocp_if omap3xxx_mpu__l3 = { 54static struct omap_hwmod_ocp_if omap3xxx_mpu__l3_main = {
55 .master = &omap3xxx_mpu_hwmod, 55 .master = &omap3xxx_mpu_hwmod,
56 .slave = &omap3xxx_l3_hwmod, 56 .slave = &omap3xxx_l3_main_hwmod,
57 .user = OCP_USER_MPU, 57 .user = OCP_USER_MPU,
58}; 58};
59 59
60/* Slave interfaces on the L3 interconnect */ 60/* Slave interfaces on the L3 interconnect */
61static struct omap_hwmod_ocp_if *omap3xxx_l3_slaves[] = { 61static struct omap_hwmod_ocp_if *omap3xxx_l3_main_slaves[] = {
62 &omap3xxx_mpu__l3, 62 &omap3xxx_mpu__l3_main,
63}; 63};
64 64
65/* Master interfaces on the L3 interconnect */ 65/* Master interfaces on the L3 interconnect */
66static struct omap_hwmod_ocp_if *omap3xxx_l3_masters[] = { 66static struct omap_hwmod_ocp_if *omap3xxx_l3_main_masters[] = {
67 &omap3xxx_l3__l4_core, 67 &omap3xxx_l3_main__l4_core,
68 &omap3xxx_l3__l4_per, 68 &omap3xxx_l3_main__l4_per,
69}; 69};
70 70
71/* L3 */ 71/* L3 */
72static struct omap_hwmod omap3xxx_l3_hwmod = { 72static struct omap_hwmod omap3xxx_l3_main_hwmod = {
73 .name = "l3_main", 73 .name = "l3_main",
74 .class = &l3_hwmod_class, 74 .class = &l3_hwmod_class,
75 .masters = omap3xxx_l3_masters, 75 .masters = omap3xxx_l3_main_masters,
76 .masters_cnt = ARRAY_SIZE(omap3xxx_l3_masters), 76 .masters_cnt = ARRAY_SIZE(omap3xxx_l3_main_masters),
77 .slaves = omap3xxx_l3_slaves, 77 .slaves = omap3xxx_l3_main_slaves,
78 .slaves_cnt = ARRAY_SIZE(omap3xxx_l3_slaves), 78 .slaves_cnt = ARRAY_SIZE(omap3xxx_l3_main_slaves),
79 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), 79 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
80 .flags = HWMOD_NO_IDLEST, 80 .flags = HWMOD_NO_IDLEST,
81}; 81};
@@ -91,7 +91,7 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__l4_wkup = {
91 91
92/* Slave interfaces on the L4_CORE interconnect */ 92/* Slave interfaces on the L4_CORE interconnect */
93static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = { 93static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = {
94 &omap3xxx_l3__l4_core, 94 &omap3xxx_l3_main__l4_core,
95}; 95};
96 96
97/* Master interfaces on the L4_CORE interconnect */ 97/* Master interfaces on the L4_CORE interconnect */
@@ -113,7 +113,7 @@ static struct omap_hwmod omap3xxx_l4_core_hwmod = {
113 113
114/* Slave interfaces on the L4_PER interconnect */ 114/* Slave interfaces on the L4_PER interconnect */
115static struct omap_hwmod_ocp_if *omap3xxx_l4_per_slaves[] = { 115static struct omap_hwmod_ocp_if *omap3xxx_l4_per_slaves[] = {
116 &omap3xxx_l3__l4_per, 116 &omap3xxx_l3_main__l4_per,
117}; 117};
118 118
119/* Master interfaces on the L4_PER interconnect */ 119/* Master interfaces on the L4_PER interconnect */
@@ -155,7 +155,7 @@ static struct omap_hwmod omap3xxx_l4_wkup_hwmod = {
155 155
156/* Master interfaces on the MPU device */ 156/* Master interfaces on the MPU device */
157static struct omap_hwmod_ocp_if *omap3xxx_mpu_masters[] = { 157static struct omap_hwmod_ocp_if *omap3xxx_mpu_masters[] = {
158 &omap3xxx_mpu__l3, 158 &omap3xxx_mpu__l3_main,
159}; 159};
160 160
161/* MPU */ 161/* MPU */
@@ -169,7 +169,7 @@ static struct omap_hwmod omap3xxx_mpu_hwmod = {
169}; 169};
170 170
171static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { 171static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
172 &omap3xxx_l3_hwmod, 172 &omap3xxx_l3_main_hwmod,
173 &omap3xxx_l4_core_hwmod, 173 &omap3xxx_l4_core_hwmod,
174 &omap3xxx_l4_per_hwmod, 174 &omap3xxx_l4_per_hwmod,
175 &omap3xxx_l4_wkup_hwmod, 175 &omap3xxx_l4_wkup_hwmod,
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-11 03:57:26 -0500