From: b-cousson@ti•com (Cousson, Benoit)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 2/6] OMAP3: hwmod data: Add mmu for iva2 and isp
Date: Sat, 06 Nov 2010 15:15:57 -0400 [thread overview]
Message-ID: <4CD5A96D.1000806@ti.com> (raw)
In-Reply-To: <1289006396-27230-3-git-send-email-omar.ramirez@ti.com>
On 11/5/2010 9:19 PM, Ramirez Luna, Omar wrote:
> Add mmu hwmod data for iva2 and isp.
s/iva2/iva/
If you do need the version information, you should use the rev field in
the hwmod class.
All the comments about the structure fields order I did on your mailbox
series will apply here as well.
Benoit
>
> Plus a define for the iva2 base register.
>
> Signed-off-by: Omar Ramirez Luna<omar.ramirez@ti•com>
> ---
> arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 103 ++++++++++++++++++++++++++++
> arch/arm/plat-omap/include/plat/iommu.h | 8 ++
> arch/arm/plat-omap/include/plat/omap34xx.h | 2 +
> 3 files changed, 113 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> index 60d977e..ff80efc 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -21,6 +21,7 @@
> #include<plat/l4_3xxx.h>
> #include<plat/i2c.h>
> #include<plat/omap34xx.h>
> +#include<plat/iommu.h>
>
> #include "omap_hwmod_common_data.h"
>
> @@ -801,6 +802,106 @@ static struct omap_hwmod omap3xxx_mailbox_hwmod = {
> .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
> };
>
> +/* mmu */
> +
> +static struct omap_hwmod_class omap3xxx_mmu_hwmod_class = {
> + .name = "mmu",
> +};
> +
> +/* isp mmu */
> +
> +static struct omap_hwmod omap3xxx_isp_mmu_hwmod;
> +
> +static struct omap_hwmod_addr_space omap3xxx_isp_mmu_addrs[] = {
> + {
> + .pa_start = OMAP3430_ISP_MMU_BASE,
> + .pa_end = OMAP3430_ISP_MMU_BASE + SZ_256 - 1,
> + .flags = ADDR_TYPE_RT,
> + },
> +};
> +
> +/* l4_core -> isp mmu */
> +static struct omap_hwmod_ocp_if omap3xxx_l4_core__isp_mmu = {
> + .master =&omap3xxx_l4_core_hwmod,
> + .slave =&omap3xxx_isp_mmu_hwmod,
> + .addr = omap3xxx_isp_mmu_addrs,
> + .clk = "cam_ick",
> + .addr_cnt = ARRAY_SIZE(omap3xxx_isp_mmu_addrs),
> + .user = OCP_USER_MPU | OCP_USER_SDMA,
> +};
> +
> +/* isp mmu slave ports */
> +static struct omap_hwmod_ocp_if *omap3xxx_isp_mmu_slaves[] = {
> + &omap3xxx_l4_core__isp_mmu,
> +};
> +
> +static struct omap_hwmod_irq_info omap3xxx_isp_mmu_irqs[] = {
> + { .name = "isp", .irq = INT_24XX_CAM_IRQ, },
> +};
> +
> +static struct omap_mmu_dev_attr isp_mmu_dev_attr = {
> + .nr_tlb_entries = 8,
> +};
> +
> +static struct omap_hwmod omap3xxx_isp_mmu_hwmod = {
> + .name = "isp",
> + .class =&omap3xxx_mmu_hwmod_class,
> + .mpu_irqs = omap3xxx_isp_mmu_irqs,
> + .mpu_irqs_cnt = ARRAY_SIZE(omap3xxx_isp_mmu_irqs),
> + .slaves = omap3xxx_isp_mmu_slaves,
> + .slaves_cnt = ARRAY_SIZE(omap3xxx_isp_mmu_slaves),
> + .dev_attr =&isp_mmu_dev_attr,
> + .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
> + .flags = HWMOD_NO_IDLEST,
> +};
> +
> +/* iva2 mmu */
> +
> +static struct omap_hwmod omap3xxx_iva2_mmu_hwmod;
> +
> +static struct omap_hwmod_addr_space omap3xxx_iva2_mmu_addrs[] = {
> + {
> + .pa_start = OMAP34XX_IVA2_MMU_BASE,
> + .pa_end = OMAP34XX_IVA2_MMU_BASE + SZ_256 - 1,
> + .flags = ADDR_TYPE_RT,
> + },
> +};
> +
> +/* l3_main -> iva2 mmu */
> +static struct omap_hwmod_ocp_if omap3xxx_l3_main__iva2_mmu = {
> + .master =&omap3xxx_l3_main_hwmod,
> + .slave =&omap3xxx_iva2_mmu_hwmod,
> + .addr = omap3xxx_iva2_mmu_addrs,
> + .addr_cnt = ARRAY_SIZE(omap3xxx_iva2_mmu_addrs),
> + .user = OCP_USER_MPU | OCP_USER_SDMA,
> +};
> +
> +/* iva2 mmu slave ports */
> +static struct omap_hwmod_ocp_if *omap3xxx_iva2_mmu_slaves[] = {
> + &omap3xxx_l3_main__iva2_mmu,
> +};
> +
> +static struct omap_hwmod_irq_info omap3xxx_iva2_mmu_irqs[] = {
> + { .name = "iva2", .irq = INT_24XX_DSP_MMU, },
> +};
> +
> +static struct omap_mmu_dev_attr iva2_mmu_dev_attr = {
> + .nr_tlb_entries = 32,
> +};
> +
> +static struct omap_hwmod omap3xxx_iva2_mmu_hwmod = {
> + .name = "iva2",
> + .class =&omap3xxx_mmu_hwmod_class,
> + .mpu_irqs = omap3xxx_iva2_mmu_irqs,
> + .mpu_irqs_cnt = ARRAY_SIZE(omap3xxx_iva2_mmu_irqs),
> + .main_clk = "iva2_ck",
> + .slaves = omap3xxx_iva2_mmu_slaves,
> + .slaves_cnt = ARRAY_SIZE(omap3xxx_iva2_mmu_slaves),
> + .dev_attr =&iva2_mmu_dev_attr,
> + .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
> + .flags = HWMOD_NO_IDLEST,
> +};
> +
> static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
> &omap3xxx_l3_main_hwmod,
> &omap3xxx_l4_core_hwmod,
> @@ -817,6 +918,8 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
> &omap3xxx_i2c2_hwmod,
> &omap3xxx_i2c3_hwmod,
> &omap3xxx_mailbox_hwmod,
> + &omap3xxx_isp_mmu_hwmod,
> + &omap3xxx_iva2_mmu_hwmod,
> NULL,
> };
>
> diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h
> index 33c7d41..91a75a5 100644
> --- a/arch/arm/plat-omap/include/plat/iommu.h
> +++ b/arch/arm/plat-omap/include/plat/iommu.h
> @@ -99,6 +99,14 @@ struct iommu_functions {
> ssize_t (*dump_ctx)(struct iommu *obj, char *buf, ssize_t len);
> };
>
> +/* omap_mmu_dev_attr - OMAP mmu device attributes for omap_hwmod
> + * @nr_tlb_entries: number of entries supported by the translation look-aside
> + * buffer (TLB).
> + */
> +struct omap_mmu_dev_attr {
> + int nr_tlb_entries;
> +};
> +
> struct iommu_platform_data {
> const char *name;
> const char *clk_name;
> diff --git a/arch/arm/plat-omap/include/plat/omap34xx.h b/arch/arm/plat-omap/include/plat/omap34xx.h
> index 98fc8b4..697f8f9 100644
> --- a/arch/arm/plat-omap/include/plat/omap34xx.h
> +++ b/arch/arm/plat-omap/include/plat/omap34xx.h
> @@ -82,6 +82,8 @@
>
> #define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000)
>
> +#define OMAP34XX_IVA2_MMU_BASE 0x5D000000
> +
> /* Security */
> #define OMAP34XX_SEC_BASE (L4_34XX_BASE + 0xA0000)
> #define OMAP34XX_SEC_SHA1MD5_BASE (OMAP34XX_SEC_BASE + 0x23000)
next prev parent reply other threads:[~2010-11-06 19:15 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-06 1:19 [PATCH 0/6] omap: iommu: hwmod support and code reorganization Omar Ramirez Luna
2010-11-06 1:19 ` [PATCH 1/6] omap: iommu: remove redundant clock usage Omar Ramirez Luna
2010-11-06 19:11 ` Cousson, Benoit
2010-11-07 15:55 ` Ramirez Luna, Omar
2010-11-06 1:19 ` [PATCH 2/6] OMAP3: hwmod data: Add mmu for iva2 and isp Omar Ramirez Luna
2010-11-06 19:15 ` Cousson, Benoit [this message]
2010-11-07 16:00 ` Ramirez Luna, Omar
2010-11-08 23:05 ` Cousson, Benoit
2010-11-08 23:52 ` Ramirez Luna, Omar
2010-11-06 1:19 ` [PATCH 3/6] OMAP4: hwmod data: add mmu hwmod for ducati and tesla Omar Ramirez Luna
2010-11-06 20:47 ` Cousson, Benoit
2010-11-07 16:18 ` Ramirez Luna, Omar
2010-11-08 23:21 ` Cousson, Benoit
2010-11-08 23:48 ` Ramirez Luna, Omar
2010-11-09 0:03 ` Cousson, Benoit
2010-11-06 1:19 ` [PATCH 4/6] omap: iommu: intial hwmod support Omar Ramirez Luna
2010-11-06 21:05 ` Cousson, Benoit
2010-11-07 16:21 ` Ramirez Luna, Omar
2010-11-06 1:19 ` [PATCH 5/6] omap: iommu: hwmod device enable/disable routines Omar Ramirez Luna
2010-11-06 21:17 ` Cousson, Benoit
2010-11-07 16:24 ` Ramirez Luna, Omar
2010-11-06 1:19 ` [PATCH 6/6] omap: iommu: code reorganization and cleanup Omar Ramirez Luna
2010-11-06 8:34 ` Felipe Contreras
2010-11-07 16:29 ` Ramirez Luna, Omar
2010-11-06 21:28 ` Cousson, Benoit
2010-11-07 16:27 ` Ramirez Luna, Omar
2010-11-06 1:32 ` [PATCH 0/6] omap: iommu: hwmod support and code reorganization Ramirez Luna, Omar
2010-11-06 18:31 ` Cousson, Benoit
2010-11-07 15:43 ` Ramirez Luna, Omar
2010-11-08 21:56 ` Cousson, Benoit
2010-11-06 18:56 ` Cousson, Benoit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CD5A96D.1000806@ti.com \
--to=b-cousson@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox