diff options
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_3xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 92 |
1 files changed, 63 insertions, 29 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 39b0c0eaa37d..5d8eb58ba5e3 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
@@ -32,51 +32,53 @@ | |||
32 | */ | 32 | */ |
33 | 33 | ||
34 | static struct omap_hwmod omap3xxx_mpu_hwmod; | 34 | static struct omap_hwmod omap3xxx_mpu_hwmod; |
35 | static struct omap_hwmod omap3xxx_l3_hwmod; | 35 | static struct omap_hwmod omap3xxx_iva_hwmod; |
36 | static struct omap_hwmod omap3xxx_l3_main_hwmod; | ||
36 | static struct omap_hwmod omap3xxx_l4_core_hwmod; | 37 | static struct omap_hwmod omap3xxx_l4_core_hwmod; |
37 | static struct omap_hwmod omap3xxx_l4_per_hwmod; | 38 | static struct omap_hwmod omap3xxx_l4_per_hwmod; |
38 | 39 | ||
39 | /* L3 -> L4_CORE interface */ | 40 | /* L3 -> L4_CORE interface */ |
40 | static struct omap_hwmod_ocp_if omap3xxx_l3__l4_core = { | 41 | static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_core = { |
41 | .master = &omap3xxx_l3_hwmod, | 42 | .master = &omap3xxx_l3_main_hwmod, |
42 | .slave = &omap3xxx_l4_core_hwmod, | 43 | .slave = &omap3xxx_l4_core_hwmod, |
43 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 44 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
44 | }; | 45 | }; |
45 | 46 | ||
46 | /* L3 -> L4_PER interface */ | 47 | /* L3 -> L4_PER interface */ |
47 | static struct omap_hwmod_ocp_if omap3xxx_l3__l4_per = { | 48 | static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_per = { |
48 | .master = &omap3xxx_l3_hwmod, | 49 | .master = &omap3xxx_l3_main_hwmod, |
49 | .slave = &omap3xxx_l4_per_hwmod, | 50 | .slave = &omap3xxx_l4_per_hwmod, |
50 | .user = OCP_USER_MPU | OCP_USER_SDMA, | 51 | .user = OCP_USER_MPU | OCP_USER_SDMA, |
51 | }; | 52 | }; |
52 | 53 | ||
53 | /* MPU -> L3 interface */ | 54 | /* MPU -> L3 interface */ |
54 | static struct omap_hwmod_ocp_if omap3xxx_mpu__l3 = { | 55 | static struct omap_hwmod_ocp_if omap3xxx_mpu__l3_main = { |
55 | .master = &omap3xxx_mpu_hwmod, | 56 | .master = &omap3xxx_mpu_hwmod, |
56 | .slave = &omap3xxx_l3_hwmod, | 57 | .slave = &omap3xxx_l3_main_hwmod, |
57 | .user = OCP_USER_MPU, | 58 | .user = OCP_USER_MPU, |
58 | }; | 59 | }; |
59 | 60 | ||
60 | /* Slave interfaces on the L3 interconnect */ | 61 | /* Slave interfaces on the L3 interconnect */ |
61 | static struct omap_hwmod_ocp_if *omap3xxx_l3_slaves[] = { | 62 | static struct omap_hwmod_ocp_if *omap3xxx_l3_main_slaves[] = { |
62 | &omap3xxx_mpu__l3, | 63 | &omap3xxx_mpu__l3_main, |
63 | }; | 64 | }; |
64 | 65 | ||
65 | /* Master interfaces on the L3 interconnect */ | 66 | /* Master interfaces on the L3 interconnect */ |
66 | static struct omap_hwmod_ocp_if *omap3xxx_l3_masters[] = { | 67 | static struct omap_hwmod_ocp_if *omap3xxx_l3_main_masters[] = { |
67 | &omap3xxx_l3__l4_core, | 68 | &omap3xxx_l3_main__l4_core, |
68 | &omap3xxx_l3__l4_per, | 69 | &omap3xxx_l3_main__l4_per, |
69 | }; | 70 | }; |
70 | 71 | ||
71 | /* L3 */ | 72 | /* L3 */ |
72 | static struct omap_hwmod omap3xxx_l3_hwmod = { | 73 | static struct omap_hwmod omap3xxx_l3_main_hwmod = { |
73 | .name = "l3_hwmod", | 74 | .name = "l3_main", |
74 | .class = &l3_hwmod_class, | 75 | .class = &l3_hwmod_class, |
75 | .masters = omap3xxx_l3_masters, | 76 | .masters = omap3xxx_l3_main_masters, |
76 | .masters_cnt = ARRAY_SIZE(omap3xxx_l3_masters), | 77 | .masters_cnt = ARRAY_SIZE(omap3xxx_l3_main_masters), |
77 | .slaves = omap3xxx_l3_slaves, | 78 | .slaves = omap3xxx_l3_main_slaves, |
78 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l3_slaves), | 79 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l3_main_slaves), |
79 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) | 80 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
81 | .flags = HWMOD_NO_IDLEST, | ||
80 | }; | 82 | }; |
81 | 83 | ||
82 | static struct omap_hwmod omap3xxx_l4_wkup_hwmod; | 84 | static struct omap_hwmod omap3xxx_l4_wkup_hwmod; |
@@ -90,7 +92,7 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__l4_wkup = { | |||
90 | 92 | ||
91 | /* Slave interfaces on the L4_CORE interconnect */ | 93 | /* Slave interfaces on the L4_CORE interconnect */ |
92 | static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = { | 94 | static struct omap_hwmod_ocp_if *omap3xxx_l4_core_slaves[] = { |
93 | &omap3xxx_l3__l4_core, | 95 | &omap3xxx_l3_main__l4_core, |
94 | }; | 96 | }; |
95 | 97 | ||
96 | /* Master interfaces on the L4_CORE interconnect */ | 98 | /* Master interfaces on the L4_CORE interconnect */ |
@@ -100,18 +102,19 @@ static struct omap_hwmod_ocp_if *omap3xxx_l4_core_masters[] = { | |||
100 | 102 | ||
101 | /* L4 CORE */ | 103 | /* L4 CORE */ |
102 | static struct omap_hwmod omap3xxx_l4_core_hwmod = { | 104 | static struct omap_hwmod omap3xxx_l4_core_hwmod = { |
103 | .name = "l4_core_hwmod", | 105 | .name = "l4_core", |
104 | .class = &l4_hwmod_class, | 106 | .class = &l4_hwmod_class, |
105 | .masters = omap3xxx_l4_core_masters, | 107 | .masters = omap3xxx_l4_core_masters, |
106 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_core_masters), | 108 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_core_masters), |
107 | .slaves = omap3xxx_l4_core_slaves, | 109 | .slaves = omap3xxx_l4_core_slaves, |
108 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_core_slaves), | 110 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_core_slaves), |
109 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) | 111 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
112 | .flags = HWMOD_NO_IDLEST, | ||
110 | }; | 113 | }; |
111 | 114 | ||
112 | /* Slave interfaces on the L4_PER interconnect */ | 115 | /* Slave interfaces on the L4_PER interconnect */ |
113 | static struct omap_hwmod_ocp_if *omap3xxx_l4_per_slaves[] = { | 116 | static struct omap_hwmod_ocp_if *omap3xxx_l4_per_slaves[] = { |
114 | &omap3xxx_l3__l4_per, | 117 | &omap3xxx_l3_main__l4_per, |
115 | }; | 118 | }; |
116 | 119 | ||
117 | /* Master interfaces on the L4_PER interconnect */ | 120 | /* Master interfaces on the L4_PER interconnect */ |
@@ -120,13 +123,14 @@ static struct omap_hwmod_ocp_if *omap3xxx_l4_per_masters[] = { | |||
120 | 123 | ||
121 | /* L4 PER */ | 124 | /* L4 PER */ |
122 | static struct omap_hwmod omap3xxx_l4_per_hwmod = { | 125 | static struct omap_hwmod omap3xxx_l4_per_hwmod = { |
123 | .name = "l4_per_hwmod", | 126 | .name = "l4_per", |
124 | .class = &l4_hwmod_class, | 127 | .class = &l4_hwmod_class, |
125 | .masters = omap3xxx_l4_per_masters, | 128 | .masters = omap3xxx_l4_per_masters, |
126 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_per_masters), | 129 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_per_masters), |
127 | .slaves = omap3xxx_l4_per_slaves, | 130 | .slaves = omap3xxx_l4_per_slaves, |
128 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_per_slaves), | 131 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_per_slaves), |
129 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) | 132 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
133 | .flags = HWMOD_NO_IDLEST, | ||
130 | }; | 134 | }; |
131 | 135 | ||
132 | /* Slave interfaces on the L4_WKUP interconnect */ | 136 | /* Slave interfaces on the L4_WKUP interconnect */ |
@@ -140,18 +144,19 @@ static struct omap_hwmod_ocp_if *omap3xxx_l4_wkup_masters[] = { | |||
140 | 144 | ||
141 | /* L4 WKUP */ | 145 | /* L4 WKUP */ |
142 | static struct omap_hwmod omap3xxx_l4_wkup_hwmod = { | 146 | static struct omap_hwmod omap3xxx_l4_wkup_hwmod = { |
143 | .name = "l4_wkup_hwmod", | 147 | .name = "l4_wkup", |
144 | .class = &l4_hwmod_class, | 148 | .class = &l4_hwmod_class, |
145 | .masters = omap3xxx_l4_wkup_masters, | 149 | .masters = omap3xxx_l4_wkup_masters, |
146 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_masters), | 150 | .masters_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_masters), |
147 | .slaves = omap3xxx_l4_wkup_slaves, | 151 | .slaves = omap3xxx_l4_wkup_slaves, |
148 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_slaves), | 152 | .slaves_cnt = ARRAY_SIZE(omap3xxx_l4_wkup_slaves), |
149 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) | 153 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
154 | .flags = HWMOD_NO_IDLEST, | ||
150 | }; | 155 | }; |
151 | 156 | ||
152 | /* Master interfaces on the MPU device */ | 157 | /* Master interfaces on the MPU device */ |
153 | static struct omap_hwmod_ocp_if *omap3xxx_mpu_masters[] = { | 158 | static struct omap_hwmod_ocp_if *omap3xxx_mpu_masters[] = { |
154 | &omap3xxx_mpu__l3, | 159 | &omap3xxx_mpu__l3_main, |
155 | }; | 160 | }; |
156 | 161 | ||
157 | /* MPU */ | 162 | /* MPU */ |
@@ -164,12 +169,41 @@ static struct omap_hwmod omap3xxx_mpu_hwmod = { | |||
164 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), | 169 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), |
165 | }; | 170 | }; |
166 | 171 | ||
172 | /* | ||
173 | * IVA2_2 interface data | ||
174 | */ | ||
175 | |||
176 | /* IVA2 <- L3 interface */ | ||
177 | static struct omap_hwmod_ocp_if omap3xxx_l3__iva = { | ||
178 | .master = &omap3xxx_l3_main_hwmod, | ||
179 | .slave = &omap3xxx_iva_hwmod, | ||
180 | .clk = "iva2_ck", | ||
181 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
182 | }; | ||
183 | |||
184 | static struct omap_hwmod_ocp_if *omap3xxx_iva_masters[] = { | ||
185 | &omap3xxx_l3__iva, | ||
186 | }; | ||
187 | |||
188 | /* | ||
189 | * IVA2 (IVA2) | ||
190 | */ | ||
191 | |||
192 | static struct omap_hwmod omap3xxx_iva_hwmod = { | ||
193 | .name = "iva", | ||
194 | .class = &iva_hwmod_class, | ||
195 | .masters = omap3xxx_iva_masters, | ||
196 | .masters_cnt = ARRAY_SIZE(omap3xxx_iva_masters), | ||
197 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430) | ||
198 | }; | ||
199 | |||
167 | static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { | 200 | static __initdata struct omap_hwmod *omap3xxx_hwmods[] = { |
168 | &omap3xxx_l3_hwmod, | 201 | &omap3xxx_l3_main_hwmod, |
169 | &omap3xxx_l4_core_hwmod, | 202 | &omap3xxx_l4_core_hwmod, |
170 | &omap3xxx_l4_per_hwmod, | 203 | &omap3xxx_l4_per_hwmod, |
171 | &omap3xxx_l4_wkup_hwmod, | 204 | &omap3xxx_l4_wkup_hwmod, |
172 | &omap3xxx_mpu_hwmod, | 205 | &omap3xxx_mpu_hwmod, |
206 | &omap3xxx_iva_hwmod, | ||
173 | NULL, | 207 | NULL, |
174 | }; | 208 | }; |
175 | 209 | ||