diff options
author | Paul Walmsley <paul@pwsan.com> | 2010-07-26 18:34:33 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2010-07-26 18:34:33 -0400 |
commit | 08072acf3a23febd1b676f1d908c6c0b9ddf167c (patch) | |
tree | 282c4a549d4ceb1066fe01cf1626a04d97fe65a8 /arch/arm/mach-omap2 | |
parent | 540064bfdb201c8b4abe248729673991246ebc72 (diff) |
OMAP2: hwmod data: add IVA1 (2420), IVA2 (2430) hwmods
Add IVA1 hwmod data for OMAP2420 and IVA2 hwmod data for 2430. The data
is based on Benoît Cousson's hwmod data for the OMAP3 IVA blocks.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Benoît Cousson <b-cousson@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2420_data.c | 30 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_2430_data.c | 32 |
2 files changed, 60 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c index 8c90b27db2e7..3cc768e8bc04 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c | |||
@@ -30,6 +30,7 @@ | |||
30 | */ | 30 | */ |
31 | 31 | ||
32 | static struct omap_hwmod omap2420_mpu_hwmod; | 32 | static struct omap_hwmod omap2420_mpu_hwmod; |
33 | static struct omap_hwmod omap2420_iva_hwmod; | ||
33 | static struct omap_hwmod omap2420_l3_main_hwmod; | 34 | static struct omap_hwmod omap2420_l3_main_hwmod; |
34 | static struct omap_hwmod omap2420_l4_core_hwmod; | 35 | static struct omap_hwmod omap2420_l4_core_hwmod; |
35 | 36 | ||
@@ -136,11 +137,40 @@ static struct omap_hwmod omap2420_mpu_hwmod = { | |||
136 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), | 137 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420), |
137 | }; | 138 | }; |
138 | 139 | ||
140 | /* | ||
141 | * IVA1 interface data | ||
142 | */ | ||
143 | |||
144 | /* IVA <- L3 interface */ | ||
145 | static struct omap_hwmod_ocp_if omap2420_l3__iva = { | ||
146 | .master = &omap2420_l3_main_hwmod, | ||
147 | .slave = &omap2420_iva_hwmod, | ||
148 | .clk = "iva1_ifck", | ||
149 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
150 | }; | ||
151 | |||
152 | static struct omap_hwmod_ocp_if *omap2420_iva_masters[] = { | ||
153 | &omap2420_l3__iva, | ||
154 | }; | ||
155 | |||
156 | /* | ||
157 | * IVA2 (IVA2) | ||
158 | */ | ||
159 | |||
160 | static struct omap_hwmod omap2420_iva_hwmod = { | ||
161 | .name = "iva", | ||
162 | .class = &iva_hwmod_class, | ||
163 | .masters = omap2420_iva_masters, | ||
164 | .masters_cnt = ARRAY_SIZE(omap2420_iva_masters), | ||
165 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420) | ||
166 | }; | ||
167 | |||
139 | static __initdata struct omap_hwmod *omap2420_hwmods[] = { | 168 | static __initdata struct omap_hwmod *omap2420_hwmods[] = { |
140 | &omap2420_l3_main_hwmod, | 169 | &omap2420_l3_main_hwmod, |
141 | &omap2420_l4_core_hwmod, | 170 | &omap2420_l4_core_hwmod, |
142 | &omap2420_l4_wkup_hwmod, | 171 | &omap2420_l4_wkup_hwmod, |
143 | &omap2420_mpu_hwmod, | 172 | &omap2420_mpu_hwmod, |
173 | &omap2420_iva_hwmod, | ||
144 | NULL, | 174 | NULL, |
145 | }; | 175 | }; |
146 | 176 | ||
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index c0f3311d5b5e..4526628ed287 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c | |||
@@ -30,6 +30,7 @@ | |||
30 | */ | 30 | */ |
31 | 31 | ||
32 | static struct omap_hwmod omap2430_mpu_hwmod; | 32 | static struct omap_hwmod omap2430_mpu_hwmod; |
33 | static struct omap_hwmod omap2430_iva_hwmod; | ||
33 | static struct omap_hwmod omap2430_l3_main_hwmod; | 34 | static struct omap_hwmod omap2430_l3_main_hwmod; |
34 | static struct omap_hwmod omap2430_l4_core_hwmod; | 35 | static struct omap_hwmod omap2430_l4_core_hwmod; |
35 | 36 | ||
@@ -70,8 +71,6 @@ static struct omap_hwmod omap2430_l3_main_hwmod = { | |||
70 | }; | 71 | }; |
71 | 72 | ||
72 | static struct omap_hwmod omap2430_l4_wkup_hwmod; | 73 | static struct omap_hwmod omap2430_l4_wkup_hwmod; |
73 | static struct omap_hwmod omap2430_mmc1_hwmod; | ||
74 | static struct omap_hwmod omap2430_mmc2_hwmod; | ||
75 | 74 | ||
76 | /* L4_CORE -> L4_WKUP interface */ | 75 | /* L4_CORE -> L4_WKUP interface */ |
77 | static struct omap_hwmod_ocp_if omap2430_l4_core__l4_wkup = { | 76 | static struct omap_hwmod_ocp_if omap2430_l4_core__l4_wkup = { |
@@ -138,11 +137,40 @@ static struct omap_hwmod omap2430_mpu_hwmod = { | |||
138 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), | 137 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), |
139 | }; | 138 | }; |
140 | 139 | ||
140 | /* | ||
141 | * IVA2_1 interface data | ||
142 | */ | ||
143 | |||
144 | /* IVA2 <- L3 interface */ | ||
145 | static struct omap_hwmod_ocp_if omap2430_l3__iva = { | ||
146 | .master = &omap2430_l3_main_hwmod, | ||
147 | .slave = &omap2430_iva_hwmod, | ||
148 | .clk = "dsp_fck", | ||
149 | .user = OCP_USER_MPU | OCP_USER_SDMA, | ||
150 | }; | ||
151 | |||
152 | static struct omap_hwmod_ocp_if *omap2430_iva_masters[] = { | ||
153 | &omap2430_l3__iva, | ||
154 | }; | ||
155 | |||
156 | /* | ||
157 | * IVA2 (IVA2) | ||
158 | */ | ||
159 | |||
160 | static struct omap_hwmod omap2430_iva_hwmod = { | ||
161 | .name = "iva", | ||
162 | .class = &iva_hwmod_class, | ||
163 | .masters = omap2430_iva_masters, | ||
164 | .masters_cnt = ARRAY_SIZE(omap2430_iva_masters), | ||
165 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430) | ||
166 | }; | ||
167 | |||
141 | static __initdata struct omap_hwmod *omap2430_hwmods[] = { | 168 | static __initdata struct omap_hwmod *omap2430_hwmods[] = { |
142 | &omap2430_l3_main_hwmod, | 169 | &omap2430_l3_main_hwmod, |
143 | &omap2430_l4_core_hwmod, | 170 | &omap2430_l4_core_hwmod, |
144 | &omap2430_l4_wkup_hwmod, | 171 | &omap2430_l4_wkup_hwmod, |
145 | &omap2430_mpu_hwmod, | 172 | &omap2430_mpu_hwmod, |
173 | &omap2430_iva_hwmod, | ||
146 | NULL, | 174 | NULL, |
147 | }; | 175 | }; |
148 | 176 | ||