diff options
author | Benoit Cousson <b-cousson@ti.com> | 2011-02-18 08:01:06 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-21 17:20:41 -0500 |
commit | 905a74d9a0452b15bb4087a0ea48d017430e4e23 (patch) | |
tree | 0406bf5bf1ada1d1b83b15f9f4962bec3ca22221 | |
parent | df7ffd317d36d36095c26bb57b3dd405274048e5 (diff) |
OMAP4: hwmod data: Add rev and dev_attr fields in McSPI
- Add a rev attribute to identify various McSPI IP version.
- Add a dev_attr structure to provide the number of chipselect
supported by the instance.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Govindraj.R <govindraj.raja@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 84e795cf0648..182aa79d5e52 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <plat/cpu.h> | 24 | #include <plat/cpu.h> |
25 | #include <plat/gpio.h> | 25 | #include <plat/gpio.h> |
26 | #include <plat/dma.h> | 26 | #include <plat/dma.h> |
27 | #include <plat/mcspi.h> | ||
27 | 28 | ||
28 | #include "omap_hwmod_common_data.h" | 29 | #include "omap_hwmod_common_data.h" |
29 | 30 | ||
@@ -3114,6 +3115,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_mcspi_sysc = { | |||
3114 | static struct omap_hwmod_class omap44xx_mcspi_hwmod_class = { | 3115 | static struct omap_hwmod_class omap44xx_mcspi_hwmod_class = { |
3115 | .name = "mcspi", | 3116 | .name = "mcspi", |
3116 | .sysc = &omap44xx_mcspi_sysc, | 3117 | .sysc = &omap44xx_mcspi_sysc, |
3118 | .rev = OMAP4_MCSPI_REV, | ||
3117 | }; | 3119 | }; |
3118 | 3120 | ||
3119 | /* mcspi1 */ | 3121 | /* mcspi1 */ |
@@ -3156,6 +3158,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi1_slaves[] = { | |||
3156 | &omap44xx_l4_per__mcspi1, | 3158 | &omap44xx_l4_per__mcspi1, |
3157 | }; | 3159 | }; |
3158 | 3160 | ||
3161 | /* mcspi1 dev_attr */ | ||
3162 | static struct omap2_mcspi_dev_attr mcspi1_dev_attr = { | ||
3163 | .num_chipselect = 4, | ||
3164 | }; | ||
3165 | |||
3159 | static struct omap_hwmod omap44xx_mcspi1_hwmod = { | 3166 | static struct omap_hwmod omap44xx_mcspi1_hwmod = { |
3160 | .name = "mcspi1", | 3167 | .name = "mcspi1", |
3161 | .class = &omap44xx_mcspi_hwmod_class, | 3168 | .class = &omap44xx_mcspi_hwmod_class, |
@@ -3169,6 +3176,7 @@ static struct omap_hwmod omap44xx_mcspi1_hwmod = { | |||
3169 | .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI1_CLKCTRL, | 3176 | .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI1_CLKCTRL, |
3170 | }, | 3177 | }, |
3171 | }, | 3178 | }, |
3179 | .dev_attr = &mcspi1_dev_attr, | ||
3172 | .slaves = omap44xx_mcspi1_slaves, | 3180 | .slaves = omap44xx_mcspi1_slaves, |
3173 | .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi1_slaves), | 3181 | .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi1_slaves), |
3174 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 3182 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
@@ -3210,6 +3218,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi2_slaves[] = { | |||
3210 | &omap44xx_l4_per__mcspi2, | 3218 | &omap44xx_l4_per__mcspi2, |
3211 | }; | 3219 | }; |
3212 | 3220 | ||
3221 | /* mcspi2 dev_attr */ | ||
3222 | static struct omap2_mcspi_dev_attr mcspi2_dev_attr = { | ||
3223 | .num_chipselect = 2, | ||
3224 | }; | ||
3225 | |||
3213 | static struct omap_hwmod omap44xx_mcspi2_hwmod = { | 3226 | static struct omap_hwmod omap44xx_mcspi2_hwmod = { |
3214 | .name = "mcspi2", | 3227 | .name = "mcspi2", |
3215 | .class = &omap44xx_mcspi_hwmod_class, | 3228 | .class = &omap44xx_mcspi_hwmod_class, |
@@ -3223,6 +3236,7 @@ static struct omap_hwmod omap44xx_mcspi2_hwmod = { | |||
3223 | .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI2_CLKCTRL, | 3236 | .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI2_CLKCTRL, |
3224 | }, | 3237 | }, |
3225 | }, | 3238 | }, |
3239 | .dev_attr = &mcspi2_dev_attr, | ||
3226 | .slaves = omap44xx_mcspi2_slaves, | 3240 | .slaves = omap44xx_mcspi2_slaves, |
3227 | .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi2_slaves), | 3241 | .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi2_slaves), |
3228 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 3242 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
@@ -3264,6 +3278,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi3_slaves[] = { | |||
3264 | &omap44xx_l4_per__mcspi3, | 3278 | &omap44xx_l4_per__mcspi3, |
3265 | }; | 3279 | }; |
3266 | 3280 | ||
3281 | /* mcspi3 dev_attr */ | ||
3282 | static struct omap2_mcspi_dev_attr mcspi3_dev_attr = { | ||
3283 | .num_chipselect = 2, | ||
3284 | }; | ||
3285 | |||
3267 | static struct omap_hwmod omap44xx_mcspi3_hwmod = { | 3286 | static struct omap_hwmod omap44xx_mcspi3_hwmod = { |
3268 | .name = "mcspi3", | 3287 | .name = "mcspi3", |
3269 | .class = &omap44xx_mcspi_hwmod_class, | 3288 | .class = &omap44xx_mcspi_hwmod_class, |
@@ -3277,6 +3296,7 @@ static struct omap_hwmod omap44xx_mcspi3_hwmod = { | |||
3277 | .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI3_CLKCTRL, | 3296 | .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI3_CLKCTRL, |
3278 | }, | 3297 | }, |
3279 | }, | 3298 | }, |
3299 | .dev_attr = &mcspi3_dev_attr, | ||
3280 | .slaves = omap44xx_mcspi3_slaves, | 3300 | .slaves = omap44xx_mcspi3_slaves, |
3281 | .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi3_slaves), | 3301 | .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi3_slaves), |
3282 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 3302 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |
@@ -3316,6 +3336,11 @@ static struct omap_hwmod_ocp_if *omap44xx_mcspi4_slaves[] = { | |||
3316 | &omap44xx_l4_per__mcspi4, | 3336 | &omap44xx_l4_per__mcspi4, |
3317 | }; | 3337 | }; |
3318 | 3338 | ||
3339 | /* mcspi4 dev_attr */ | ||
3340 | static struct omap2_mcspi_dev_attr mcspi4_dev_attr = { | ||
3341 | .num_chipselect = 1, | ||
3342 | }; | ||
3343 | |||
3319 | static struct omap_hwmod omap44xx_mcspi4_hwmod = { | 3344 | static struct omap_hwmod omap44xx_mcspi4_hwmod = { |
3320 | .name = "mcspi4", | 3345 | .name = "mcspi4", |
3321 | .class = &omap44xx_mcspi_hwmod_class, | 3346 | .class = &omap44xx_mcspi_hwmod_class, |
@@ -3329,6 +3354,7 @@ static struct omap_hwmod omap44xx_mcspi4_hwmod = { | |||
3329 | .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI4_CLKCTRL, | 3354 | .clkctrl_reg = OMAP4430_CM_L4PER_MCSPI4_CLKCTRL, |
3330 | }, | 3355 | }, |
3331 | }, | 3356 | }, |
3357 | .dev_attr = &mcspi4_dev_attr, | ||
3332 | .slaves = omap44xx_mcspi4_slaves, | 3358 | .slaves = omap44xx_mcspi4_slaves, |
3333 | .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi4_slaves), | 3359 | .slaves_cnt = ARRAY_SIZE(omap44xx_mcspi4_slaves), |
3334 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), | 3360 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP4430), |