Merge tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / omap_hwmod_7xx_data.c

diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index d0585293a381bdb54edc89982e2fa94f7cfb70bc..b3abb8d8b2f6add6af321ecadc1a7ed9ca158cca 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -359,6 +359,7 @@ static struct omap_hwmod dra7xx_dcan1_hwmod = {
        .class          = &dra7xx_dcan_hwmod_class,
        .clkdm_name     = "wkupaon_clkdm",
        .main_clk       = "dcan1_sys_clk_mux",
+       .flags          = HWMOD_CLKDM_NOAUTO,
        .prcm = {
                .omap4 = {
                        .clkctrl_offs = DRA7XX_CM_WKUPAON_DCAN1_CLKCTRL_OFFSET,
@@ -374,6 +375,7 @@ static struct omap_hwmod dra7xx_dcan2_hwmod = {
        .class          = &dra7xx_dcan_hwmod_class,
        .clkdm_name     = "l4per2_clkdm",
        .main_clk       = "sys_clkin1",
+       .flags          = HWMOD_CLKDM_NOAUTO,
        .prcm = {
                .omap4 = {
                        .clkctrl_offs = DRA7XX_CM_L4PER2_DCAN2_CLKCTRL_OFFSET,
@@ -1098,7 +1100,6 @@ static struct omap_hwmod_class_sysconfig dra7xx_i2c_sysc = {
                           SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
                           SIDLE_SMART_WKUP),
-       .clockact       = CLOCKACT_TEST_ICLK,
        .sysc_fields    = &omap_hwmod_sysc_type1,
 };
 
@@ -2700,6 +2701,7 @@ static struct omap_hwmod dra7xx_usb_otg_ss1_hwmod = {
        .class          = &dra7xx_usb_otg_ss_hwmod_class,
        .clkdm_name     = "l3init_clkdm",
        .main_clk       = "dpll_core_h13x2_ck",
+       .flags          = HWMOD_CLKDM_NOAUTO,
        .prcm = {
                .omap4 = {
                        .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS1_CLKCTRL_OFFSET,
@@ -2721,6 +2723,7 @@ static struct omap_hwmod dra7xx_usb_otg_ss2_hwmod = {
        .class          = &dra7xx_usb_otg_ss_hwmod_class,
        .clkdm_name     = "l3init_clkdm",
        .main_clk       = "dpll_core_h13x2_ck",
+       .flags          = HWMOD_CLKDM_NOAUTO,
        .prcm = {
                .omap4 = {
                        .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS2_CLKCTRL_OFFSET,