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

[deliverable/linux.git] / arch / arm / mach-omap2 / omap_hwmod_81xx_data.c

diff --git a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
index 609e2397ea47d72772223383d7885b1240a75136..39736ad2a7548d41cc2ca078084c6e04e414bf56 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
@@ -465,6 +465,7 @@ static struct omap_hwmod dm81xx_elm_hwmod = {
 static struct omap_hwmod_ocp_if dm81xx_l4_ls__elm = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm81xx_elm_hwmod,
+       .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
 };
 
@@ -514,6 +515,7 @@ static struct omap_hwmod dm81xx_gpio1_hwmod = {
 static struct omap_hwmod_ocp_if dm81xx_l4_ls__gpio1 = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm81xx_gpio1_hwmod,
+       .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
 };
 
@@ -540,6 +542,7 @@ static struct omap_hwmod dm81xx_gpio2_hwmod = {
 static struct omap_hwmod_ocp_if dm81xx_l4_ls__gpio2 = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm81xx_gpio2_hwmod,
+       .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
 };
 
@@ -664,7 +667,7 @@ static struct omap_hwmod dm814x_timer1_hwmod = {
 static struct omap_hwmod_ocp_if dm814x_l4_ls__timer1 = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm814x_timer1_hwmod,
-       .clk            = "timer1_fck",
+       .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
 };
 
@@ -701,7 +704,7 @@ static struct omap_hwmod dm814x_timer2_hwmod = {
 static struct omap_hwmod_ocp_if dm814x_l4_ls__timer2 = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm814x_timer2_hwmod,
-       .clk            = "timer2_fck",
+       .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
 };
 
@@ -1159,6 +1162,7 @@ static struct omap_hwmod dm81xx_mailbox_hwmod = {
 static struct omap_hwmod_ocp_if dm81xx_l4_ls__mailbox = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm81xx_mailbox_hwmod,
+       .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
 };
 
@@ -1193,6 +1197,7 @@ static struct omap_hwmod dm81xx_spinbox_hwmod = {
 static struct omap_hwmod_ocp_if dm81xx_l4_ls__spinbox = {
        .master         = &dm81xx_l4_ls_hwmod,
        .slave          = &dm81xx_spinbox_hwmod,
+       .clk            = "sysclk6_ck",
        .user           = OCP_USER_MPU,
 };