Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / arch / arm / mach-omap2 / omap_hwmod_2xxx_interconnect_data.c

diff --git a/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
index 5fd40d4a989e9954469799fd76e1509f41f88c0a..656861c29d5cae1aba49b622a2aa88f0181717a5 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_interconnect_data.c
@@ -20,142 +20,6 @@
 
 #include "omap_hwmod_common_data.h"
 
-static struct omap_hwmod_addr_space omap2xxx_uart1_addr_space[] = {
-       {
-               .pa_start       = OMAP2_UART1_BASE,
-               .pa_end         = OMAP2_UART1_BASE + SZ_8K - 1,
-               .flags          = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_uart2_addr_space[] = {
-       {
-               .pa_start       = OMAP2_UART2_BASE,
-               .pa_end         = OMAP2_UART2_BASE + SZ_1K - 1,
-               .flags          = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_uart3_addr_space[] = {
-       {
-               .pa_start       = OMAP2_UART3_BASE,
-               .pa_end         = OMAP2_UART3_BASE + SZ_1K - 1,
-               .flags          = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_timer2_addrs[] = {
-       {
-               .pa_start       = 0x4802a000,
-               .pa_end         = 0x4802a000 + SZ_1K - 1,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_timer3_addrs[] = {
-       {
-               .pa_start       = 0x48078000,
-               .pa_end         = 0x48078000 + SZ_1K - 1,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_timer4_addrs[] = {
-       {
-               .pa_start       = 0x4807a000,
-               .pa_end         = 0x4807a000 + SZ_1K - 1,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_timer5_addrs[] = {
-       {
-               .pa_start       = 0x4807c000,
-               .pa_end         = 0x4807c000 + SZ_1K - 1,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_timer6_addrs[] = {
-       {
-               .pa_start       = 0x4807e000,
-               .pa_end         = 0x4807e000 + SZ_1K - 1,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_timer7_addrs[] = {
-       {
-               .pa_start       = 0x48080000,
-               .pa_end         = 0x48080000 + SZ_1K - 1,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_timer8_addrs[] = {
-       {
-               .pa_start       = 0x48082000,
-               .pa_end         = 0x48082000 + SZ_1K - 1,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_timer9_addrs[] = {
-       {
-               .pa_start       = 0x48084000,
-               .pa_end         = 0x48084000 + SZ_1K - 1,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-struct omap_hwmod_addr_space omap2xxx_mcbsp2_addrs[] = {
-       {
-               .name           = "mpu",
-               .pa_start       = 0x48076000,
-               .pa_end         = 0x480760ff,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2_rng_addr_space[] = {
-       {
-               .pa_start       = 0x480a0000,
-               .pa_end         = 0x480a004f,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_sham_addrs[] = {
-       {
-               .pa_start       = 0x480a4000,
-               .pa_end         = 0x480a4000 + 0x64 - 1,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
-static struct omap_hwmod_addr_space omap2xxx_aes_addrs[] = {
-       {
-               .pa_start       = 0x480a6000,
-               .pa_end         = 0x480a6000 + 0x50 - 1,
-               .flags          = ADDR_TYPE_RT
-       },
-       { }
-};
-
 /*
  * Common interconnect data
  */
@@ -182,7 +46,7 @@ struct omap_hwmod_ocp_if omap2xxx_dss__l3 = {
                .omap2 = {
                        .l3_perm_bit  = OMAP2_L3_CORE_FW_CONNID_DSS,
                        .flags  = OMAP_FIREWALL_L3,
-               }
+               },
        },
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
@@ -199,7 +63,6 @@ struct omap_hwmod_ocp_if omap2_l4_core__uart1 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_uart1_hwmod,
        .clk            = "uart1_ick",
-       .addr           = omap2xxx_uart1_addr_space,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -208,7 +71,6 @@ struct omap_hwmod_ocp_if omap2_l4_core__uart2 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_uart2_hwmod,
        .clk            = "uart2_ick",
-       .addr           = omap2xxx_uart2_addr_space,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -217,7 +79,6 @@ struct omap_hwmod_ocp_if omap2_l4_core__uart3 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_uart3_hwmod,
        .clk            = "uart3_ick",
-       .addr           = omap2xxx_uart3_addr_space,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -226,7 +87,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__mcspi1 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_mcspi1_hwmod,
        .clk            = "mcspi1_ick",
-       .addr           = omap2_mcspi1_addr_space,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -235,7 +95,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__mcspi2 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_mcspi2_hwmod,
        .clk            = "mcspi2_ick",
-       .addr           = omap2_mcspi2_addr_space,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -244,7 +103,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer2 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer2_hwmod,
        .clk            = "gpt2_ick",
-       .addr           = omap2xxx_timer2_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -253,7 +111,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer3 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer3_hwmod,
        .clk            = "gpt3_ick",
-       .addr           = omap2xxx_timer3_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -262,7 +119,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer4 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer4_hwmod,
        .clk            = "gpt4_ick",
-       .addr           = omap2xxx_timer4_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -271,7 +127,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer5 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer5_hwmod,
        .clk            = "gpt5_ick",
-       .addr           = omap2xxx_timer5_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -280,7 +135,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer6 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer6_hwmod,
        .clk            = "gpt6_ick",
-       .addr           = omap2xxx_timer6_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -289,7 +143,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer7 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer7_hwmod,
        .clk            = "gpt7_ick",
-       .addr           = omap2xxx_timer7_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -298,7 +151,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer8 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer8_hwmod,
        .clk            = "gpt8_ick",
-       .addr           = omap2xxx_timer8_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -307,7 +159,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer9 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer9_hwmod,
        .clk            = "gpt9_ick",
-       .addr           = omap2xxx_timer9_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -316,7 +167,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer10 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer10_hwmod,
        .clk            = "gpt10_ick",
-       .addr           = omap2_timer10_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -325,7 +175,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer11 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer11_hwmod,
        .clk            = "gpt11_ick",
-       .addr           = omap2_timer11_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -334,7 +183,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__timer12 = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_timer12_hwmod,
        .clk            = "gpt12_ick",
-       .addr           = omap2xxx_timer12_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -348,7 +196,7 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss = {
                .omap2 = {
                        .l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,
                        .flags  = OMAP_FIREWALL_L4,
-               }
+               },
        },
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
@@ -363,7 +211,7 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_dispc = {
                .omap2 = {
                        .l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_DISPC_REGION,
                        .flags  = OMAP_FIREWALL_L4,
-               }
+               },
        },
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
@@ -378,7 +226,7 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_rfbi = {
                .omap2 = {
                        .l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_CORE_REGION,
                        .flags  = OMAP_FIREWALL_L4,
-               }
+               },
        },
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
@@ -393,7 +241,7 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__dss_venc = {
                .omap2 = {
                        .l4_fw_region  = OMAP2420_L4_CORE_FW_DSS_VENC_REGION,
                        .flags  = OMAP_FIREWALL_L4,
-               }
+               },
        },
        .flags          = OCPIF_SWSUP_IDLE,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
@@ -404,7 +252,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__rng = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_rng_hwmod,
        .clk            = "rng_ick",
-       .addr           = omap2_rng_addr_space,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -413,7 +260,6 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__sham = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_sham_hwmod,
        .clk            = "sha_ick",
-       .addr           = omap2xxx_sham_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
@@ -422,6 +268,5 @@ struct omap_hwmod_ocp_if omap2xxx_l4_core__aes = {
        .master         = &omap2xxx_l4_core_hwmod,
        .slave          = &omap2xxx_aes_hwmod,
        .clk            = "aes_ick",
-       .addr           = omap2xxx_aes_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };