From: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
To: Suman Anna <s-anna-l0cyMroinI0@public.gmane.org>
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
Laurent Pinchart
<laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>,
linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>
Subject: Re: [PATCHv2 14/16] ARM: OMAP3: hwmod data: cleanup data for IOMMUs
Date: Wed, 26 Feb 2014 09:18:24 -0800 [thread overview]
Message-ID: <20140226171824.GH11654@atomide.com> (raw)
In-Reply-To: <1392315347-32967-15-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
* Suman Anna <s-anna-l0cyMroinI0@public.gmane.org> [140213 10:19]:
> From: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>
>
> The irq numbers, ocp address space and device attribute data
> have all been cleaned up for OMAP3 IOMMUs. All this data is
> populated via the corresponding dt node.
>
> Signed-off-by: Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>
> Signed-off-by: Suman Anna <s-anna-l0cyMroinI0@public.gmane.org>
This will need to wait until we've made omap3 to be DT only
as this will break idling of things for the legacy booting.
Regards,
Tony
> ---
> arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 46 ------------------------------
> 1 file changed, 46 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> index 9c7e23a..d68c131 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -24,7 +24,6 @@
> #include "l4_3xxx.h"
> #include <linux/platform_data/asoc-ti-mcbsp.h>
> #include <linux/platform_data/spi-omap2-mcspi.h>
> -#include <linux/platform_data/iommu-omap.h>
> #include <linux/platform_data/mailbox-omap.h>
> #include <plat/dmtimer.h>
>
> @@ -2991,83 +2990,39 @@ static struct omap_hwmod_class omap3xxx_mmu_hwmod_class = {
>
> /* mmu isp */
>
> -static struct omap_mmu_dev_attr mmu_isp_dev_attr = {
> - .da_start = 0x0,
> - .da_end = 0xfffff000,
> - .nr_tlb_entries = 8,
> -};
> -
> static struct omap_hwmod omap3xxx_mmu_isp_hwmod;
> -static struct omap_hwmod_irq_info omap3xxx_mmu_isp_irqs[] = {
> - { .irq = 24 + OMAP_INTC_START, },
> - { .irq = -1 }
> -};
> -
> -static struct omap_hwmod_addr_space omap3xxx_mmu_isp_addrs[] = {
> - {
> - .pa_start = 0x480bd400,
> - .pa_end = 0x480bd47f,
> - .flags = ADDR_TYPE_RT,
> - },
> - { }
> -};
>
> /* l4_core -> mmu isp */
> static struct omap_hwmod_ocp_if omap3xxx_l4_core__mmu_isp = {
> .master = &omap3xxx_l4_core_hwmod,
> .slave = &omap3xxx_mmu_isp_hwmod,
> - .addr = omap3xxx_mmu_isp_addrs,
> .user = OCP_USER_MPU | OCP_USER_SDMA,
> };
>
> static struct omap_hwmod omap3xxx_mmu_isp_hwmod = {
> .name = "mmu_isp",
> .class = &omap3xxx_mmu_hwmod_class,
> - .mpu_irqs = omap3xxx_mmu_isp_irqs,
> .main_clk = "cam_ick",
> - .dev_attr = &mmu_isp_dev_attr,
> .flags = HWMOD_NO_IDLEST,
> };
>
> /* mmu iva */
>
> -static struct omap_mmu_dev_attr mmu_iva_dev_attr = {
> - .da_start = 0x11000000,
> - .da_end = 0xfffff000,
> - .nr_tlb_entries = 32,
> -};
> -
> static struct omap_hwmod omap3xxx_mmu_iva_hwmod;
> -static struct omap_hwmod_irq_info omap3xxx_mmu_iva_irqs[] = {
> - { .irq = 28 + OMAP_INTC_START, },
> - { .irq = -1 }
> -};
> -
> static struct omap_hwmod_rst_info omap3xxx_mmu_iva_resets[] = {
> { .name = "mmu", .rst_shift = 1, .st_shift = 9 },
> };
>
> -static struct omap_hwmod_addr_space omap3xxx_mmu_iva_addrs[] = {
> - {
> - .pa_start = 0x5d000000,
> - .pa_end = 0x5d00007f,
> - .flags = ADDR_TYPE_RT,
> - },
> - { }
> -};
> -
> /* l3_main -> iva mmu */
> static struct omap_hwmod_ocp_if omap3xxx_l3_main__mmu_iva = {
> .master = &omap3xxx_l3_main_hwmod,
> .slave = &omap3xxx_mmu_iva_hwmod,
> - .addr = omap3xxx_mmu_iva_addrs,
> .user = OCP_USER_MPU | OCP_USER_SDMA,
> };
>
> static struct omap_hwmod omap3xxx_mmu_iva_hwmod = {
> .name = "mmu_iva",
> .class = &omap3xxx_mmu_hwmod_class,
> - .mpu_irqs = omap3xxx_mmu_iva_irqs,
> .clkdm_name = "iva2_clkdm",
> .rst_lines = omap3xxx_mmu_iva_resets,
> .rst_lines_cnt = ARRAY_SIZE(omap3xxx_mmu_iva_resets),
> @@ -3080,7 +3035,6 @@ static struct omap_hwmod omap3xxx_mmu_iva_hwmod = {
> .idlest_idle_bit = OMAP3430_ST_IVA2_SHIFT,
> },
> },
> - .dev_attr = &mmu_iva_dev_attr,
> .flags = HWMOD_NO_IDLEST,
> };
>
> --
> 1.8.5.3
>
next prev parent reply other threads:[~2014-02-26 17:18 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-13 18:15 [PATCHv2 00/16] OMAP IOMMU DT adaptation and cleanup Suman Anna
2014-02-13 18:15 ` [PATCHv2 01/16] iommu/omap: convert to devm_* interfaces Suman Anna
[not found] ` <1392315347-32967-2-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
2014-02-25 21:10 ` Laurent Pinchart
[not found] ` <1392315347-32967-1-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
2014-02-13 18:15 ` [PATCHv2 02/16] iommu/omap: omap_iommu_attach() should return ENODEV, not NULL Suman Anna
[not found] ` <1392315347-32967-3-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
2014-02-25 21:13 ` Laurent Pinchart
2014-02-25 22:32 ` Suman Anna
[not found] ` <530D19E3.9030407-l0cyMroinI0@public.gmane.org>
2014-02-26 2:05 ` Laurent Pinchart
2014-02-26 16:45 ` Suman Anna
2014-02-13 18:15 ` [PATCHv2 03/16] Documentation: dt: add OMAP iommu bindings Suman Anna
2014-02-24 12:57 ` Florian Vaussard
2014-02-24 18:09 ` Suman Anna
[not found] ` <1392315347-32967-4-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
2014-02-25 21:26 ` Laurent Pinchart
2014-02-25 23:02 ` Suman Anna
2014-02-26 2:13 ` Laurent Pinchart
2014-02-26 17:02 ` Suman Anna
[not found] ` <530E1E20.9000301-l0cyMroinI0@public.gmane.org>
2014-02-26 19:32 ` Laurent Pinchart
2014-02-26 20:23 ` Suman Anna
2014-02-26 20:36 ` Laurent Pinchart
2014-02-26 22:18 ` Suman Anna
[not found] ` <530E682D.9070005-l0cyMroinI0@public.gmane.org>
2014-02-26 22:28 ` Suman Anna
2014-02-26 22:43 ` Laurent Pinchart
2014-02-26 23:14 ` Suman Anna
2014-02-13 18:15 ` [PATCHv2 04/16] iommu/omap: add devicetree support Suman Anna
2014-02-26 17:08 ` Tony Lindgren
2014-02-13 18:15 ` [PATCHv2 05/16] iommu/omap: enable bus-error back on supported iommus Suman Anna
2014-02-13 18:15 ` [PATCHv2 06/16] iommu/omap: allocate archdata on the fly for DT-based devices Suman Anna
2014-02-13 18:15 ` [PATCHv2 07/16] iommu/omap: allow enable/disable even without pdata Suman Anna
[not found] ` <1392315347-32967-8-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
2014-02-25 21:15 ` Laurent Pinchart
2014-02-25 22:41 ` Suman Anna
2014-02-13 18:15 ` [PATCHv2 09/16] ARM: OMAP2+: change the ISP device archdata MMU name Suman Anna
2014-02-13 18:15 ` [PATCHv2 10/16] ARM: OMAP2+: use pdata quirks for iommu reset lines Suman Anna
[not found] ` <1392315347-32967-11-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
2014-02-26 17:17 ` Tony Lindgren
[not found] ` <20140226171731.GG11654-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2014-02-26 18:04 ` Suman Anna
2014-02-13 18:15 ` [PATCHv2 11/16] ARM: OMAP3: fix iva mmu programming issues Suman Anna
2014-02-13 18:15 ` [PATCHv2 12/16] ARM: OMAP5: hwmod data: add mmu data for ipu & dsp Suman Anna
2014-02-13 18:15 ` [PATCHv2 16/16] ARM: OMAP2+: Remove legacy omap-iommu.c Suman Anna
2014-02-13 18:15 ` [PATCHv2 08/16] ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2 Suman Anna
[not found] ` <1392315347-32967-9-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
2014-02-25 21:17 ` Laurent Pinchart
2014-02-26 17:09 ` Tony Lindgren
2014-02-26 17:15 ` Tony Lindgren
2014-02-28 19:58 ` Paul Walmsley
[not found] ` <alpine.DEB.2.02.1402281958170.453-rwI8Ez+7Ko+d5PgPZx9QOdBPR1lH4CV8@public.gmane.org>
2014-02-28 20:42 ` Suman Anna
2014-02-13 18:15 ` [PATCHv2 13/16] ARM: OMAP2+: extend iommu pdata-quirks to OMAP5 Suman Anna
2014-02-13 18:15 ` [PATCHv2 14/16] ARM: OMAP3: hwmod data: cleanup data for IOMMUs Suman Anna
[not found] ` <1392315347-32967-15-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
2014-02-26 17:18 ` Tony Lindgren [this message]
[not found] ` <20140226171824.GH11654-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2014-02-26 17:59 ` Suman Anna
[not found] ` <530E2B67.9050300-l0cyMroinI0@public.gmane.org>
2014-02-27 9:16 ` Florian Vaussard
[not found] ` <530F0255.0-p8DiymsW2f8@public.gmane.org>
2014-02-28 0:25 ` Tony Lindgren
2014-02-13 18:15 ` [PATCHv2 15/16] ARM: OMAP4: " Suman Anna
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=20140226171824.GH11654@atomide.com \
--to=tony-4v6ys6ai5vpbdgjk7y7tuq@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=florian.vaussard-p8DiymsW2f8@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=s-anna-l0cyMroinI0@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).