Merge branch 'picoxcell/timer' into next/timer

Imported from mailing list

* picoxcell/timer:
  clocksource: dw_apb_timer: Add common DTS glue for dw_apb_timer

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index afddec835ece0eedb88383cae671bdaf1f4ecd57,b7bcba5221ba260b31d0327b37442e52fb807143..dfe9bc4d7b80c6e91195eb57e62470fc7ca64c80
--- 1/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -1928,7 -1928,7 +1928,7 @@@ static struct omap_hwmod_dma_info omap4
  
  static struct omap_hwmod_opt_clk mcbsp1_opt_clks[] = {
        { .role = "pad_fck", .clk = "pad_clks_ck" },
-       { .role = "prcm_clk", .clk = "mcbsp1_sync_mux_ck" },
+       { .role = "prcm_fck", .clk = "mcbsp1_sync_mux_ck" },
  };
  
  static struct omap_hwmod omap44xx_mcbsp1_hwmod = {
@@@ -1963,7 -1963,7 +1963,7 @@@ static struct omap_hwmod_dma_info omap4
  
  static struct omap_hwmod_opt_clk mcbsp2_opt_clks[] = {
        { .role = "pad_fck", .clk = "pad_clks_ck" },
-       { .role = "prcm_clk", .clk = "mcbsp2_sync_mux_ck" },
+       { .role = "prcm_fck", .clk = "mcbsp2_sync_mux_ck" },
  };
  
  static struct omap_hwmod omap44xx_mcbsp2_hwmod = {
@@@ -1998,7 -1998,7 +1998,7 @@@ static struct omap_hwmod_dma_info omap4
  
  static struct omap_hwmod_opt_clk mcbsp3_opt_clks[] = {
        { .role = "pad_fck", .clk = "pad_clks_ck" },
-       { .role = "prcm_clk", .clk = "mcbsp3_sync_mux_ck" },
+       { .role = "prcm_fck", .clk = "mcbsp3_sync_mux_ck" },
  };
  
  static struct omap_hwmod omap44xx_mcbsp3_hwmod = {
@@@ -2033,7 -2033,7 +2033,7 @@@ static struct omap_hwmod_dma_info omap4
  
  static struct omap_hwmod_opt_clk mcbsp4_opt_clks[] = {
        { .role = "pad_fck", .clk = "pad_clks_ck" },
-       { .role = "prcm_clk", .clk = "mcbsp4_sync_mux_ck" },
+       { .role = "prcm_fck", .clk = "mcbsp4_sync_mux_ck" },
  };
  
  static struct omap_hwmod omap44xx_mcbsp4_hwmod = {
@@@ -2947,6 -2947,7 +2947,6 @@@ static struct omap_hwmod omap44xx_timer
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
 -      .dev_attr       = &capability_alwon_dev_attr,
  };
  
  /* timer3 */
@@@ -2968,6 -2969,7 +2968,6 @@@ static struct omap_hwmod omap44xx_timer
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
 -      .dev_attr       = &capability_alwon_dev_attr,
  };
  
  /* timer4 */
@@@ -2989,6 -2991,7 +2989,6 @@@ static struct omap_hwmod omap44xx_timer
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
 -      .dev_attr       = &capability_alwon_dev_attr,
  };
  
  /* timer5 */
@@@ -3010,6 -3013,7 +3010,6 @@@ static struct omap_hwmod omap44xx_timer
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
 -      .dev_attr       = &capability_alwon_dev_attr,
  };
  
  /* timer6 */
@@@ -3032,6 -3036,7 +3032,6 @@@ static struct omap_hwmod omap44xx_timer
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
 -      .dev_attr       = &capability_alwon_dev_attr,
  };
  
  /* timer7 */
@@@ -3053,6 -3058,7 +3053,6 @@@ static struct omap_hwmod omap44xx_timer
                        .modulemode   = MODULEMODE_SWCTRL,
                },
        },
 -      .dev_attr       = &capability_alwon_dev_attr,
  };
  
  /* timer8 */
@@@ -3858,7 -3864,7 +3858,7 @@@ static struct omap_hwmod_ocp_if omap44x
  };
  
  /* usb_host_fs -> l3_main_2 */
- static struct omap_hwmod_ocp_if omap44xx_usb_host_fs__l3_main_2 = {
+ static struct omap_hwmod_ocp_if __maybe_unused omap44xx_usb_host_fs__l3_main_2 = {
        .master         = &omap44xx_usb_host_fs_hwmod,
        .slave          = &omap44xx_l3_main_2_hwmod,
        .clk            = "l3_div_ck",
@@@ -3916,7 -3922,7 +3916,7 @@@ static struct omap_hwmod_ocp_if omap44x
  };
  
  /* aess -> l4_abe */
- static struct omap_hwmod_ocp_if omap44xx_aess__l4_abe = {
+ static struct omap_hwmod_ocp_if __maybe_unused omap44xx_aess__l4_abe = {
        .master         = &omap44xx_aess_hwmod,
        .slave          = &omap44xx_l4_abe_hwmod,
        .clk            = "ocp_abe_iclk",
@@@ -4007,7 -4013,7 +4007,7 @@@ static struct omap_hwmod_addr_space oma
  };
  
  /* l4_abe -> aess */
- static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess = {
+ static struct omap_hwmod_ocp_if __maybe_unused omap44xx_l4_abe__aess = {
        .master         = &omap44xx_l4_abe_hwmod,
        .slave          = &omap44xx_aess_hwmod,
        .clk            = "ocp_abe_iclk",
@@@ -4025,7 -4031,7 +4025,7 @@@ static struct omap_hwmod_addr_space oma
  };
  
  /* l4_abe -> aess (dma) */
- static struct omap_hwmod_ocp_if omap44xx_l4_abe__aess_dma = {
+ static struct omap_hwmod_ocp_if __maybe_unused omap44xx_l4_abe__aess_dma = {
        .master         = &omap44xx_l4_abe_hwmod,
        .slave          = &omap44xx_aess_hwmod,
        .clk            = "ocp_abe_iclk",
@@@ -5851,7 -5857,7 +5851,7 @@@ static struct omap_hwmod_addr_space oma
  };
  
  /* l4_cfg -> usb_host_fs */
- static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_host_fs = {
+ static struct omap_hwmod_ocp_if __maybe_unused omap44xx_l4_cfg__usb_host_fs = {
        .master         = &omap44xx_l4_cfg_hwmod,
        .slave          = &omap44xx_usb_host_fs_hwmod,
        .clk            = "l4_div_ck",
@@@ -6008,13 -6014,13 +6008,13 @@@ static struct omap_hwmod_ocp_if *omap44
        &omap44xx_iva__l3_main_2,
        &omap44xx_l3_main_1__l3_main_2,
        &omap44xx_l4_cfg__l3_main_2,
-       &omap44xx_usb_host_fs__l3_main_2,
+       /* &omap44xx_usb_host_fs__l3_main_2, */
        &omap44xx_usb_host_hs__l3_main_2,
        &omap44xx_usb_otg_hs__l3_main_2,
        &omap44xx_l3_main_1__l3_main_3,
        &omap44xx_l3_main_2__l3_main_3,
        &omap44xx_l4_cfg__l3_main_3,
-       &omap44xx_aess__l4_abe,
+       /* &omap44xx_aess__l4_abe, */
        &omap44xx_dsp__l4_abe,
        &omap44xx_l3_main_1__l4_abe,
        &omap44xx_mpu__l4_abe,
@@@ -6023,8 -6029,8 +6023,8 @@@
        &omap44xx_l4_cfg__l4_wkup,
        &omap44xx_mpu__mpu_private,
        &omap44xx_l4_cfg__ocp_wp_noc,
-       &omap44xx_l4_abe__aess,
-       &omap44xx_l4_abe__aess_dma,
+       /* &omap44xx_l4_abe__aess, */
+       /* &omap44xx_l4_abe__aess_dma, */
        &omap44xx_l3_main_2__c2c,
        &omap44xx_l4_wkup__counter_32k,
        &omap44xx_l4_cfg__ctrl_module_core,
@@@ -6130,7 -6136,7 +6130,7 @@@
        &omap44xx_l4_per__uart2,
        &omap44xx_l4_per__uart3,
        &omap44xx_l4_per__uart4,
-       &omap44xx_l4_cfg__usb_host_fs,
+       /* &omap44xx_l4_cfg__usb_host_fs, */
        &omap44xx_l4_cfg__usb_host_hs,
        &omap44xx_l4_cfg__usb_otg_hs,
        &omap44xx_l4_cfg__usb_tll_hs,