Merge branch 'late/kirkwood' into late/soc

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

diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index 10575a1bc1f1fa468c7b728702bf66dd4258c4f7..b5db6007c523413cfd0e2b4f1063b5451a231f00 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -536,6 +536,15 @@ static struct omap_hwmod_addr_space omap2420_counter_32k_addrs[] = {
        { }
 };
 
+static struct omap_hwmod_addr_space omap2420_gpmc_addrs[] = {
+       {
+               .pa_start       = 0x6800a000,
+               .pa_end         = 0x6800afff,
+               .flags          = ADDR_TYPE_RT
+       },
+       { }
+};
+
 static struct omap_hwmod_ocp_if omap2420_l4_wkup__counter_32k = {
        .master         = &omap2xxx_l4_wkup_hwmod,
        .slave          = &omap2xxx_counter_32k_hwmod,
@@ -544,6 +553,14 @@ static struct omap_hwmod_ocp_if omap2420_l4_wkup__counter_32k = {
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+static struct omap_hwmod_ocp_if omap2420_l3__gpmc = {
+       .master         = &omap2xxx_l3_main_hwmod,
+       .slave          = &omap2xxx_gpmc_hwmod,
+       .clk            = "core_l3_ck",
+       .addr           = omap2420_gpmc_addrs,
+       .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = {
        &omap2xxx_l3_main__l4_core,
        &omap2xxx_mpu__l3_main,
@@ -585,8 +602,10 @@ static struct omap_hwmod_ocp_if *omap2420_hwmod_ocp_ifs[] __initdata = {
        &omap2420_l4_core__mcbsp1,
        &omap2420_l4_core__mcbsp2,
        &omap2420_l4_core__msdi1,
+       &omap2xxx_l4_core__rng,
        &omap2420_l4_core__hdq1w,
        &omap2420_l4_wkup__counter_32k,
+       &omap2420_l3__gpmc,
        NULL,
 };