Merge branch 'omap-for-v4.14/fixes' into omap-for-v4.15/fixes-v2

diff --combined arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index d2106ae4410a23fb76c8593b6d123b3a94800ade,c12e7b572a4195a8c614981969c2f12bc6796a5e..52c9d585b44d2607f4d0a4c5d0b1b1d01cb4bac3
--- 1/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@@ -565,6 -565,12 +565,6 @@@ static struct omap_hwmod_class i2c_clas
        .reset  = &omap_i2c_reset,
  };
  
 -static struct omap_hwmod_dma_info omap3xxx_dss_sdma_chs[] = {
 -      { .name = "dispc", .dma_req = 5 },
 -      { .name = "dsi1", .dma_req = 74 },
 -      { .dma_req = -1, },
 -};
 -
  /* dss */
  static struct omap_hwmod_opt_clk dss_opt_clks[] = {
        /*
@@@ -581,6 -587,7 +581,6 @@@ static struct omap_hwmod omap3430es1_ds
        .name           = "dss_core",
        .class          = &omap2_dss_hwmod_class,
        .main_clk       = "dss1_alwon_fck", /* instead of dss_fck */
 -      .sdma_reqs      = omap3xxx_dss_sdma_chs,
        .prcm           = {
                .omap2 = {
                        .prcm_reg_id = 1,
@@@ -600,6 -607,7 +600,6 @@@ static struct omap_hwmod omap3xxx_dss_c
        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
        .class          = &omap2_dss_hwmod_class,
        .main_clk       = "dss1_alwon_fck", /* instead of dss_fck */
 -      .sdma_reqs      = omap3xxx_dss_sdma_chs,
        .prcm           = {
                .omap2 = {
                        .prcm_reg_id = 1,
@@@ -639,6 -647,7 +639,6 @@@ static struct omap_hwmod_class omap3_di
  static struct omap_hwmod omap3xxx_dss_dispc_hwmod = {
        .name           = "dss_dispc",
        .class          = &omap3_dispc_hwmod_class,
 -      .mpu_irqs       = omap2_dispc_irqs,
        .main_clk       = "dss1_alwon_fck",
        .prcm           = {
                .omap2 = {
@@@ -1008,6 -1017,7 +1008,6 @@@ static struct omap_hwmod_class omap3xxx
  static struct omap_hwmod omap3xxx_dma_system_hwmod = {
        .name           = "dma",
        .class          = &omap3xxx_dma_hwmod_class,
 -      .mpu_irqs       = omap2_dma_system_irqs,
        .main_clk       = "core_l3_ick",
        .prcm = {
                .omap2 = {
@@@ -1646,6 -1656,7 +1646,7 @@@ static struct omap_hwmod omap3xxx_mmc3_
        .main_clk       = "mmchs3_fck",
        .prcm           = {
                .omap2 = {
+                       .module_offs = CORE_MOD,
                        .prcm_reg_id = 1,
                        .module_bit = OMAP3430_EN_MMC3_SHIFT,
                        .idlest_reg_id = 1,
@@@ -2098,10 -2109,20 +2099,10 @@@ static struct omap_hwmod_ocp_if omap3_l
  };
  
  /* L4 CORE -> SR1 interface */
 -static struct omap_hwmod_addr_space omap3_sr1_addr_space[] = {
 -      {
 -              .pa_start       = OMAP34XX_SR1_BASE,
 -              .pa_end         = OMAP34XX_SR1_BASE + SZ_1K - 1,
 -              .flags          = ADDR_TYPE_RT,
 -      },
 -      { },
 -};
 -
  static struct omap_hwmod_ocp_if omap34xx_l4_core__sr1 = {
        .master         = &omap3xxx_l4_core_hwmod,
        .slave          = &omap34xx_sr1_hwmod,
        .clk            = "sr_l4_ick",
 -      .addr           = omap3_sr1_addr_space,
        .user           = OCP_USER_MPU,
  };
  
@@@ -2109,15 -2130,25 +2110,15 @@@ static struct omap_hwmod_ocp_if omap36x
        .master         = &omap3xxx_l4_core_hwmod,
        .slave          = &omap36xx_sr1_hwmod,
        .clk            = "sr_l4_ick",
 -      .addr           = omap3_sr1_addr_space,
        .user           = OCP_USER_MPU,
  };
  
 -/* L4 CORE -> SR1 interface */
 -static struct omap_hwmod_addr_space omap3_sr2_addr_space[] = {
 -      {
 -              .pa_start       = OMAP34XX_SR2_BASE,
 -              .pa_end         = OMAP34XX_SR2_BASE + SZ_1K - 1,
 -              .flags          = ADDR_TYPE_RT,
 -      },
 -      { },
 -};
 +/* L4 CORE -> SR2 interface */
  
  static struct omap_hwmod_ocp_if omap34xx_l4_core__sr2 = {
        .master         = &omap3xxx_l4_core_hwmod,
        .slave          = &omap34xx_sr2_hwmod,
        .clk            = "sr_l4_ick",
 -      .addr           = omap3_sr2_addr_space,
        .user           = OCP_USER_MPU,
  };
  
@@@ -2125,6 -2156,7 +2126,6 @@@ static struct omap_hwmod_ocp_if omap36x
        .master         = &omap3xxx_l4_core_hwmod,
        .slave          = &omap36xx_sr2_hwmod,
        .clk            = "sr_l4_ick",
 -      .addr           = omap3_sr2_addr_space,
        .user           = OCP_USER_MPU,
  };
  
@@@ -2493,11 -2525,21 +2494,11 @@@ static struct omap_hwmod_ocp_if omap3xx
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
 -static struct omap_hwmod_addr_space omap3xxx_dma_system_addrs[] = {
 -      {
 -              .pa_start       = 0x48056000,
 -              .pa_end         = 0x48056fff,
 -              .flags          = ADDR_TYPE_RT,
 -      },
 -      { },
 -};
 -
  /* l4_cfg -> dma_system */
  static struct omap_hwmod_ocp_if omap3xxx_l4_core__dma_system = {
        .master         = &omap3xxx_l4_core_hwmod,
        .slave          = &omap3xxx_dma_system_hwmod,
        .clk            = "core_l4_ick",
 -      .addr           = omap3xxx_dma_system_addrs,
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
@@@ -3107,7 -3149,7 +3108,7 @@@ int __init omap3xxx_hwmod_init(void
        int r;
        struct omap_hwmod_ocp_if **h = NULL, **h_gp = NULL, **h_sham = NULL;
        struct omap_hwmod_ocp_if **h_aes = NULL;
 -      struct device_node *bus = NULL;
 +      struct device_node *bus;
        unsigned int rev;
  
        omap_hwmod_init();
@@@ -3167,14 -3209,18 +3168,14 @@@
  
        if (h_sham && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "sham")) {
                r = omap_hwmod_register_links(h_sham);
 -              if (r < 0) {
 -                      of_node_put(bus);
 -                      return r;
 -              }
 +              if (r < 0)
 +                      goto put_node;
        }
  
        if (h_aes && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "aes")) {
                r = omap_hwmod_register_links(h_aes);
 -              if (r < 0) {
 -                      of_node_put(bus);
 -                      return r;
 -              }
 +              if (r < 0)
 +                      goto put_node;
        }
        of_node_put(bus);
  
@@@ -3225,8 -3271,4 +3226,8 @@@
        r = omap_hwmod_register_links(omap3xxx_dss_hwmod_ocp_ifs);
  
        return r;
 +
 +put_node:
 +      of_node_put(bus);
 +      return r;
  }

diff --combined arch/arm/mach-omap2/prcm-common.h
index 0592b23902c6885b03985085ec5c4d7415966d01,ac9ee2ef3471cec6e3372663a228dc55d0dbe570..0977da0dab76077ee663ffa0dc0ba3f3c32f3a26
--- 1/arch/arm/mach-omap2/prcm-common.h
--- 2/arch/arm/mach-omap2/prcm-common.h
+++ b/arch/arm/mach-omap2/prcm-common.h
@@@ -506,6 -506,7 +506,6 @@@ struct omap_prcm_irq_setup 
        u8 nr_irqs;
        const struct omap_prcm_irq *irqs;
        int irq;
 -      unsigned int (*xlate_irq)(unsigned int);
        void (*read_pending_irqs)(unsigned long *events);
        void (*ocp_barrier)(void);
        void (*save_and_clear_irqen)(u32 *saved_mask);
@@@ -528,6 -529,7 +528,7 @@@
  struct omap_domain_base {
        u32 pa;
        void __iomem *va;
+       s16 offset;
  };
  
  /**