omap3-iommu: reorganize
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 2 lines · Felipe Contreras
This way it's more object oriented and easier to see what is happening. No functional changes.
Felipe, can you please refresh this against omap for-next branch?
Thanks,
Tony
Quoted 111 lines
Signed-off-by Felipe Contreras <[email protected]>--- arch/arm/mach-omap2/omap3-iommu.c | 62 ++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 31 deletions(-)arch/arm/mach-omap2/omap3-iommu.c +31
-31@@ -14,47 +14,50 @@#include <mach/iommu.h> -#define OMAP3_MMU1_BASE 0x480bd400 -#define OMAP3_MMU2_BASE 0x5d000000 -#define OMAP3_MMU1_IRQ 24 -#define OMAP3_MMU2_IRQ 28 - - -static unsigned long iommu_base[]__initdata = { -OMAP3_MMU1_BASE , -OMAP3_MMU2_BASE , -}; - -static int iommu_irq[]__initdata = { -OMAP3_MMU1_IRQ , -OMAP3_MMU2_IRQ , +struct iommu_device { +resource_size_t base; +int irq; +struct iommu_platform_data pdata; +struct resource res[2 ]; }; -static const struct iommu_platform_data omap3_iommu_pdata[]__initconst = { +static struct iommu_device devices[] = { { - .name ="isp" , - .nr_tlb_entries =8 , - .clk_name ="cam_ick" , + .base =0x480bd400 , + .irq =24 , + .pdata = { + .name ="isp" , + .nr_tlb_entries =8 , + .clk_name ="cam_ick" , + }, }, #if defined(CONFIG_MPU_BRIDGE_IOMMU) { - .name ="iva2" , - .nr_tlb_entries =32 , - .clk_name ="iva2_ck" , + .base =0x5d000000 , + .irq =28 , + .pdata = { + .name ="iva2" , + .nr_tlb_entries =32 , + .clk_name ="iva2_ck" , + }, }, #endif }; -#define NR_IOMMU_DEVICES ARRAY_SIZE(omap3_iommu_pdata) +#define NR_IOMMU_DEVICES ARRAY_SIZE(devices)static struct platform_device *omap3_iommu_pdev[NR_IOMMU_DEVICES ];static int __init omap3_iommu_init (void ) {int i, err; +struct resource res[] = { + { .flags =IORESOURCE_MEM }, + { .flags =IORESOURCE_IRQ }, + };for (i =0 ; i <NR_IOMMU_DEVICES ; i++) {struct platform_device *pdev; -struct resource res[2 ]; +const struct iommu_device *d = &devices[i]; pdev =platform_device_alloc ("omap-iommu" , i);if (!pdev) {@@ -62,19 +65,16 @@ static int __init omap3_iommu_init(void) goto err_out; } -memset (res,0 ,sizeof (res)); - res[0 ].start = iommu_base[i]; - res[0 ].end = iommu_base[i] +MMU_REG_SIZE -1 ; - res[0 ].flags =IORESOURCE_MEM ; - res[1 ].start = res[1 ].end = iommu_irq[i]; - res[1 ].flags =IORESOURCE_IRQ ; + res[0 ].start = d->base; + res[0 ].end = d->base +MMU_REG_SIZE -1 ; + res[1 ].start = res[1 ].end = d->irq; err =platform_device_add_resources (pdev, res,ARRAY_SIZE (res));if (err) goto err_out; - err =platform_device_add_data (pdev, &omap3_iommu_pdata[i], -sizeof (omap3_iommu_pdata[0 ])); + err =platform_device_add_data (pdev, &d->pdata, +sizeof (d->pdata));if (err) goto err_out; err =platform_device_add (pdev);Signature · 1 line
1.6.5.rc1
Quoted 5 lines · Tony Lindgren
Quoted 2 lines · Felipe Contreras
This way it's more object oriented and easier to see what is happening. No functional changes.
Felipe, can you please refresh this against omap for-next branch?
I just tried and it doesn't require any changes.
Just do this and it will apply cleanly (not really part of the patch):
- #include <mach/iommu.h>
+ #include <plat/iommu.h>
Signature · 1 line
Felipe Contreras
Quoted 5 lines · Felipe Contreras
Quoted 4 lines · Tony Lindgren
Quoted 2 lines · Felipe Contreras
This way it's more object oriented and easier to see what is happening. No functional changes.
Quoted 7 lines
Quoted 1 line
Felipe, can you please refresh this against omap for-next branch?
I just tried and it doesn't require any changes.
Just do this and it will apply cleanly (not really part of the patch):
- #include <mach/iommu.h>
+ #include <plat/iommu.h>
Hmm, I already deleted the original, and can't seem to find it in the archives either. Looks only earlier versions are in the archive.
Maybe it never made it to linux-omap or linux-kernel lists. Can you please repost?
Thanks,
Tony