OMAP4: hwmod data: Fix L3 interconnect data order and alignement

Change the position of the ocp_if structure to match the template.

Remove unneeded comma at the end of address space flag field.

Remove USER_SDMA since this ocp link is only from the l3_main_1
path that is accessible only from the MPU in that case and not
the SDMA.

Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>

diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index a93c455..f1138e4 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -216,6 +216,12 @@ static struct omap_hwmod omap44xx_l3_instr_hwmod = {
 };
 
 /* l3_main_1 interface data */
+static struct omap_hwmod_irq_info omap44xx_l3_main_1_irqs[] = {
+       { .name = "dbg_err", .irq = 9 + OMAP44XX_IRQ_GIC_START },
+       { .name = "app_err", .irq = 10 + OMAP44XX_IRQ_GIC_START },
+       { .irq = -1 }
+};
+
 /* dsp -> l3_main_1 */
 static struct omap_hwmod_ocp_if omap44xx_dsp__l3_main_1 = {
        .master         = &omap44xx_dsp_hwmod,
@@ -264,18 +270,11 @@ static struct omap_hwmod_ocp_if omap44xx_mmc2__l3_main_1 = {
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
-/* L3 target configuration and error log registers */
-static struct omap_hwmod_irq_info omap44xx_l3_targ_irqs[] = {
-       { .irq = 9  + OMAP44XX_IRQ_GIC_START },
-       { .irq = 10 + OMAP44XX_IRQ_GIC_START },
-       { .irq = -1 }
-};
-
 static struct omap_hwmod_addr_space omap44xx_l3_main_1_addrs[] = {
        {
                .pa_start       = 0x44000000,
                .pa_end         = 0x44000fff,
-               .flags          = ADDR_TYPE_RT,
+               .flags          = ADDR_TYPE_RT
        },
        { }
 };
@@ -286,7 +285,7 @@ static struct omap_hwmod_ocp_if omap44xx_mpu__l3_main_1 = {
        .slave          = &omap44xx_l3_main_1_hwmod,
        .clk            = "l3_div_ck",
        .addr           = omap44xx_l3_main_1_addrs,
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+       .user           = OCP_USER_MPU,
 };
 
 /* l3_main_1 slave ports */
@@ -303,9 +302,9 @@ static struct omap_hwmod_ocp_if *omap44xx_l3_main_1_slaves[] = {
 static struct omap_hwmod omap44xx_l3_main_1_hwmod = {
        .name           = "l3_main_1",
        .class          = &omap44xx_l3_hwmod_class,
-       .mpu_irqs       = omap44xx_l3_targ_irqs,
        .slaves         = omap44xx_l3_main_1_slaves,
        .slaves_cnt     = ARRAY_SIZE(omap44xx_l3_main_1_slaves),
+       .mpu_irqs       = omap44xx_l3_main_1_irqs,
        .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP4430),
 };
 
@@ -354,7 +353,7 @@ static struct omap_hwmod_addr_space omap44xx_l3_main_2_addrs[] = {
        {
                .pa_start       = 0x44800000,
                .pa_end         = 0x44801fff,
-               .flags          = ADDR_TYPE_RT,
+               .flags          = ADDR_TYPE_RT
        },
        { }
 };
@@ -365,7 +364,7 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l3_main_2 = {
        .slave          = &omap44xx_l3_main_2_hwmod,
        .clk            = "l3_div_ck",
        .addr           = omap44xx_l3_main_2_addrs,
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+       .user           = OCP_USER_MPU,
 };
 
 /* l4_cfg -> l3_main_2 */
@@ -409,7 +408,7 @@ static struct omap_hwmod_addr_space omap44xx_l3_main_3_addrs[] = {
        {
                .pa_start       = 0x45000000,
                .pa_end         = 0x45000fff,
-               .flags          = ADDR_TYPE_RT,
+               .flags          = ADDR_TYPE_RT
        },
        { }
 };
@@ -420,7 +419,7 @@ static struct omap_hwmod_ocp_if omap44xx_l3_main_1__l3_main_3 = {
        .slave          = &omap44xx_l3_main_3_hwmod,
        .clk            = "l3_div_ck",
        .addr           = omap44xx_l3_main_3_addrs,
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+       .user           = OCP_USER_MPU,
 };
 
 /* l3_main_2 -> l3_main_3 */