Merge branch 'omap-for-v5.6/sdma' into omap-for-v5.6/ti-sysc-drop-pdata
authorTony Lindgren <tony@atomide.com>
Mon, 30 Dec 2019 18:17:51 +0000 (10:17 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 30 Dec 2019 18:17:51 +0000 (10:17 -0800)
1  2 
arch/arm/boot/dts/dra7-l4.dtsi
arch/arm/boot/dts/omap4-l4.dtsi
arch/arm/boot/dts/omap5-l4.dtsi
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/omap_hwmod_54xx_data.c
arch/arm/mach-omap2/omap_hwmod_7xx_data.c

Simple merge
Simple merge
Simple merge
index 3ef06da69499bfe4e1516a0042971d8fcacc0ecd,7b64c96f4add79728ad0538dc036a4c3bb89c75f..722c641895baa060b68012e378afe98a930a1495
@@@ -18,7 -18,7 +18,6 @@@
   */
  
  #include <linux/io.h>
- #include <linux/omap-dma.h>
 -#include <linux/power/smartreflex.h>
  
  #include "omap_hwmod.h"
  #include "omap_hwmod_common_data.h"
@@@ -359,53 -393,41 +355,6 @@@ static struct omap_hwmod omap44xx_debug
        },
  };
  
--/*
-  * 'dma' class
-  * dma controller for data exchange between memory to memory (i.e. internal or
-  * external memory) and gp peripherals to memory or memory to gp peripherals
 - * 'dmic' class
 - * digital microphone controller
-- */
--
- static struct omap_hwmod_class_sysconfig omap44xx_dma_sysc = {
 -static struct omap_hwmod_class_sysconfig omap44xx_dmic_sysc = {
--      .rev_offs       = 0x0000,
-       .sysc_offs      = 0x002c,
-       .syss_offs      = 0x0028,
-       .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
-                          SYSC_HAS_EMUFREE | SYSC_HAS_MIDLEMODE |
-                          SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
-                          SYSS_HAS_RESET_STATUS),
 -      .sysc_offs      = 0x0010,
 -      .sysc_flags     = (SYSC_HAS_EMUFREE | SYSC_HAS_RESET_STATUS |
 -                         SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
--      .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-                          MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
-       .sysc_fields    = &omap_hwmod_sysc_type1,
- };
- static struct omap_hwmod_class omap44xx_dma_hwmod_class = {
-       .name   = "dma",
-       .sysc   = &omap44xx_dma_sysc,
 -                         SIDLE_SMART_WKUP),
 -      .sysc_fields    = &omap_hwmod_sysc_type2,
--};
--
- /* dma dev_attr */
- static struct omap_dma_dev_attr dma_dev_attr = {
-       .dev_caps       = RESERVE_CHANNEL | DMA_LINKED_LCH | GLOBAL_PRIORITY |
-                         IS_CSSA_32 | IS_CDSA_32 | IS_RW_PRIORITY,
-       .lch_count      = 32,
 -static struct omap_hwmod_class omap44xx_dmic_hwmod_class = {
 -      .name   = "dmic",
 -      .sysc   = &omap44xx_dmic_sysc,
--};
--
- /* dma_system */
- static struct omap_hwmod omap44xx_dma_system_hwmod = {
-       .name           = "dma_system",
-       .class          = &omap44xx_dma_hwmod_class,
-       .clkdm_name     = "l3_dma_clkdm",
-       .main_clk       = "l3_div_ck",
 -/* dmic */
 -static struct omap_hwmod omap44xx_dmic_hwmod = {
 -      .name           = "dmic",
 -      .class          = &omap44xx_dmic_hwmod_class,
 -      .clkdm_name     = "abe_clkdm",
 -      .main_clk       = "func_dmic_abe_gfclk",
--      .prcm = {
--              .omap4 = {
-                       .clkctrl_offs = OMAP4_CM_SDMA_SDMA_CLKCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_SDMA_SDMA_CONTEXT_OFFSET,
 -                      .clkctrl_offs = OMAP4_CM1_ABE_DMIC_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_ABE_DMIC_CONTEXT_OFFSET,
 -                      .modulemode   = MODULEMODE_SWCTRL,
--              },
--      },
-       .dev_attr       = &dma_dev_attr,
--};
--
  /*
   * 'dsp' class
   * dsp sub-system
@@@ -1458,14 -2162,22 +1407,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* dma_system -> l3_main_2 */
- static struct omap_hwmod_ocp_if omap44xx_dma_system__l3_main_2 = {
-       .master         = &omap44xx_dma_system_hwmod,
 -/* fdif -> l3_main_2 */
 -static struct omap_hwmod_ocp_if omap44xx_fdif__l3_main_2 = {
 -      .master         = &omap44xx_fdif_hwmod,
 -      .slave          = &omap44xx_l3_main_2_hwmod,
 -      .clk            = "l3_div_ck",
 -      .user           = OCP_USER_MPU | OCP_USER_SDMA,
 -};
 -
 -/* hsi -> l3_main_2 */
 -static struct omap_hwmod_ocp_if omap44xx_hsi__l3_main_2 = {
 -      .master         = &omap44xx_hsi_hwmod,
--      .slave          = &omap44xx_l3_main_2_hwmod,
--      .clk            = "l3_div_ck",
--      .user           = OCP_USER_MPU | OCP_USER_SDMA,
--};
--
  /* ipu -> l3_main_2 */
  static struct omap_hwmod_ocp_if omap44xx_ipu__l3_main_2 = {
        .master         = &omap44xx_ipu_hwmod,
@@@ -1658,14 -2394,14 +1599,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* l4_cfg -> dma_system */
- static struct omap_hwmod_ocp_if omap44xx_l4_cfg__dma_system = {
-       .master         = &omap44xx_l4_cfg_hwmod,
-       .slave          = &omap44xx_dma_system_hwmod,
-       .clk            = "l4_div_ck",
 -/* l4_abe -> dmic */
 -static struct omap_hwmod_ocp_if omap44xx_l4_abe__dmic = {
 -      .master         = &omap44xx_l4_abe_hwmod,
 -      .slave          = &omap44xx_dmic_hwmod,
 -      .clk            = "ocp_abe_iclk",
--      .user           = OCP_USER_MPU | OCP_USER_SDMA,
--};
--
  /* dsp -> iva */
  static struct omap_hwmod_ocp_if omap44xx_dsp__iva = {
        .master         = &omap44xx_dsp_hwmod,
@@@ -1966,7 -2886,8 +1899,6 @@@ static struct omap_hwmod_ocp_if *omap44
        &omap44xx_l4_cfg__l3_main_1,
        &omap44xx_mpu__l3_main_1,
        &omap44xx_debugss__l3_main_2,
-       &omap44xx_dma_system__l3_main_2,
 -      &omap44xx_fdif__l3_main_2,
 -      &omap44xx_hsi__l3_main_2,
        &omap44xx_ipu__l3_main_2,
        &omap44xx_iss__l3_main_2,
        &omap44xx_iva__l3_main_2,
        &omap44xx_l4_wkup__ctrl_module_wkup,
        &omap44xx_l4_wkup__ctrl_module_pad_wkup,
        &omap44xx_l3_instr__debugss,
-       &omap44xx_l4_cfg__dma_system,
 -      &omap44xx_l4_abe__dmic,
        &omap44xx_dsp__iva,
        /* &omap44xx_dsp__sl2if, */
        &omap44xx_l4_cfg__dsp,
index d15454e1d744dc24261975e237260a7a6874fd59,38af4b3a138a62a5080f0acd8c868301bcd83873..ad398f6bc011b866fca2ba0f33b970f6539c34ad
@@@ -232,53 -226,41 +226,6 @@@ static struct omap_hwmod omap54xx_count
        },
  };
  
--/*
-  * 'dma' class
-  * dma controller for data exchange between memory to memory (i.e. internal or
-  * external memory) and gp peripherals to memory or memory to gp peripherals
 - * 'dmic' class
 - * digital microphone controller
-- */
--
- static struct omap_hwmod_class_sysconfig omap54xx_dma_sysc = {
 -static struct omap_hwmod_class_sysconfig omap54xx_dmic_sysc = {
--      .rev_offs       = 0x0000,
-       .sysc_offs      = 0x002c,
-       .syss_offs      = 0x0028,
-       .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
-                          SYSC_HAS_EMUFREE | SYSC_HAS_MIDLEMODE |
-                          SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
-                          SYSS_HAS_RESET_STATUS),
 -      .sysc_offs      = 0x0010,
 -      .sysc_flags     = (SYSC_HAS_EMUFREE | SYSC_HAS_RESET_STATUS |
 -                         SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
--      .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-                          MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
-       .sysc_fields    = &omap_hwmod_sysc_type1,
- };
- static struct omap_hwmod_class omap54xx_dma_hwmod_class = {
-       .name   = "dma",
-       .sysc   = &omap54xx_dma_sysc,
 -                         SIDLE_SMART_WKUP),
 -      .sysc_fields    = &omap_hwmod_sysc_type2,
--};
--
- /* dma dev_attr */
- static struct omap_dma_dev_attr dma_dev_attr = {
-       .dev_caps       = RESERVE_CHANNEL | DMA_LINKED_LCH | GLOBAL_PRIORITY |
-                         IS_CSSA_32 | IS_CDSA_32 | IS_RW_PRIORITY,
-       .lch_count      = 32,
 -static struct omap_hwmod_class omap54xx_dmic_hwmod_class = {
 -      .name   = "dmic",
 -      .sysc   = &omap54xx_dmic_sysc,
--};
--
- /* dma_system */
- static struct omap_hwmod omap54xx_dma_system_hwmod = {
-       .name           = "dma_system",
-       .class          = &omap54xx_dma_hwmod_class,
-       .clkdm_name     = "dma_clkdm",
-       .main_clk       = "l3_iclk_div",
 -/* dmic */
 -static struct omap_hwmod omap54xx_dmic_hwmod = {
 -      .name           = "dmic",
 -      .class          = &omap54xx_dmic_hwmod_class,
 -      .clkdm_name     = "abe_clkdm",
 -      .main_clk       = "dmic_gfclk",
--      .prcm = {
--              .omap4 = {
-                       .clkctrl_offs = OMAP54XX_CM_DMA_DMA_SYSTEM_CLKCTRL_OFFSET,
-                       .context_offs = OMAP54XX_RM_DMA_DMA_SYSTEM_CONTEXT_OFFSET,
 -                      .clkctrl_offs = OMAP54XX_CM_ABE_DMIC_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP54XX_RM_ABE_DMIC_CONTEXT_OFFSET,
 -                      .modulemode   = MODULEMODE_SWCTRL,
--              },
--      },
-       .dev_attr       = &dma_dev_attr,
--};
--
  /*
   * 'dss' class
   * display sub-system
@@@ -961,14 -1371,14 +908,6 @@@ static struct omap_hwmod_ocp_if omap54x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* l4_cfg -> dma_system */
- static struct omap_hwmod_ocp_if omap54xx_l4_cfg__dma_system = {
-       .master         = &omap54xx_l4_cfg_hwmod,
-       .slave          = &omap54xx_dma_system_hwmod,
-       .clk            = "l4_root_clk_div",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
 -/* l4_abe -> dmic */
 -static struct omap_hwmod_ocp_if omap54xx_l4_abe__dmic = {
 -      .master         = &omap54xx_l4_abe_hwmod,
 -      .slave          = &omap54xx_dmic_hwmod,
 -      .clk            = "abe_iclk",
 -      .user           = OCP_USER_MPU,
--};
--
  /* l3_main_2 -> dss */
  static struct omap_hwmod_ocp_if omap54xx_l3_main_2__dss = {
        .master         = &omap54xx_l3_main_2_hwmod,
@@@ -1091,7 -1613,8 +1030,6 @@@ static struct omap_hwmod_ocp_if *omap54
        &omap54xx_l3_main_1__l4_wkup,
        &omap54xx_mpu__mpu_private,
        &omap54xx_l4_wkup__counter_32k,
-       &omap54xx_l4_cfg__dma_system,
 -      &omap54xx_l4_abe__dmic,
 -      &omap54xx_l4_cfg__mmu_dsp,
        &omap54xx_l3_main_2__dss,
        &omap54xx_l3_main_2__dss_dispc,
        &omap54xx_l3_main_2__dss_dsi1_a,
index f58dfbe9862c21b3b1de2a6b26c530b1c13e95dd,4f7c7fd8d82a6e4e1afe15abe97033b554455f9a..acef3733db4c6b6c677db8456755e350d961c91b
@@@ -15,7 -15,7 +15,6 @@@
   */
  
  #include <linux/io.h>
- #include <linux/omap-dma.h>
 -#include <linux/power/smartreflex.h>
  
  #include "omap_hwmod.h"
  #include "omap_hwmod_common_data.h"
@@@ -281,52 -277,110 +276,6 @@@ static struct omap_hwmod dra7xx_ctrl_mo
        },
  };
  
--/*
-  * 'dma' class
 - * 'dcan' class
-- *
-- */
- static struct omap_hwmod_class_sysconfig dra7xx_dma_sysc = {
-       .rev_offs       = 0x0000,
-       .sysc_offs      = 0x002c,
-       .syss_offs      = 0x0028,
-       .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
-                          SYSC_HAS_EMUFREE | SYSC_HAS_MIDLEMODE |
-                          SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
-                          SYSS_HAS_RESET_STATUS),
-       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-                          SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
-                          MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
-       .sysc_fields    = &omap_hwmod_sysc_type1,
- };
--
- static struct omap_hwmod_class dra7xx_dma_hwmod_class = {
-       .name   = "dma",
-       .sysc   = &dra7xx_dma_sysc,
 -static struct omap_hwmod_class dra7xx_dcan_hwmod_class = {
 -      .name   = "dcan",
--};
--
- /* dma dev_attr */
- static struct omap_dma_dev_attr dma_dev_attr = {
-       .dev_caps       = RESERVE_CHANNEL | DMA_LINKED_LCH | GLOBAL_PRIORITY |
-                         IS_CSSA_32 | IS_CDSA_32 | IS_RW_PRIORITY,
-       .lch_count      = 32,
 -/* dcan1 */
 -static struct omap_hwmod dra7xx_dcan1_hwmod = {
 -      .name           = "dcan1",
 -      .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,
 -                      .context_offs = DRA7XX_RM_WKUPAON_DCAN1_CONTEXT_OFFSET,
 -                      .modulemode   = MODULEMODE_SWCTRL,
 -              },
 -      },
--};
--
- /* dma_system */
- static struct omap_hwmod dra7xx_dma_system_hwmod = {
-       .name           = "dma_system",
-       .class          = &dra7xx_dma_hwmod_class,
-       .clkdm_name     = "dma_clkdm",
-       .main_clk       = "l3_iclk_div",
 -/* dcan2 */
 -static struct omap_hwmod dra7xx_dcan2_hwmod = {
 -      .name           = "dcan2",
 -      .class          = &dra7xx_dcan_hwmod_class,
 -      .clkdm_name     = "l4per2_clkdm",
 -      .main_clk       = "sys_clkin1",
 -      .flags          = HWMOD_CLKDM_NOAUTO,
--      .prcm = {
--              .omap4 = {
-                       .clkctrl_offs = DRA7XX_CM_DMA_DMA_SYSTEM_CLKCTRL_OFFSET,
-                       .context_offs = DRA7XX_RM_DMA_DMA_SYSTEM_CONTEXT_OFFSET,
 -                      .clkctrl_offs = DRA7XX_CM_L4PER2_DCAN2_CLKCTRL_OFFSET,
 -                      .context_offs = DRA7XX_RM_L4PER2_DCAN2_CONTEXT_OFFSET,
 -                      .modulemode   = MODULEMODE_SWCTRL,
--              },
--      },
-       .dev_attr       = &dma_dev_attr,
 -};
 -
 -/* pwmss  */
 -static struct omap_hwmod_class_sysconfig dra7xx_epwmss_sysc = {
 -      .rev_offs       = 0x0,
 -      .sysc_offs      = 0x4,
 -      .sysc_flags     = SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
 -                        SYSC_HAS_RESET_STATUS,
 -      .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
 -      .sysc_fields    = &omap_hwmod_sysc_type2,
 -};
 -
 -/*
 - * epwmss class
 - */
 -static struct omap_hwmod_class dra7xx_epwmss_hwmod_class = {
 -      .name           = "epwmss",
 -      .sysc           = &dra7xx_epwmss_sysc,
 -};
 -
 -/* epwmss0 */
 -static struct omap_hwmod dra7xx_epwmss0_hwmod = {
 -      .name           = "epwmss0",
 -      .class          = &dra7xx_epwmss_hwmod_class,
 -      .clkdm_name     = "l4per2_clkdm",
 -      .main_clk       = "l4_root_clk_div",
 -      .prcm           = {
 -              .omap4  = {
 -                      .modulemode     = MODULEMODE_SWCTRL,
 -                      .clkctrl_offs   = DRA7XX_CM_L4PER2_PWMSS1_CLKCTRL_OFFSET,
 -                      .context_offs   = DRA7XX_RM_L4PER2_PWMSS1_CONTEXT_OFFSET,
 -              },
 -      },
 -};
 -
 -/* epwmss1 */
 -static struct omap_hwmod dra7xx_epwmss1_hwmod = {
 -      .name           = "epwmss1",
 -      .class          = &dra7xx_epwmss_hwmod_class,
 -      .clkdm_name     = "l4per2_clkdm",
 -      .main_clk       = "l4_root_clk_div",
 -      .prcm           = {
 -              .omap4  = {
 -                      .modulemode     = MODULEMODE_SWCTRL,
 -                      .clkctrl_offs   = DRA7XX_CM_L4PER2_PWMSS2_CLKCTRL_OFFSET,
 -                      .context_offs   = DRA7XX_RM_L4PER2_PWMSS2_CONTEXT_OFFSET,
 -              },
 -      },
 -};
 -
 -/* epwmss2 */
 -static struct omap_hwmod dra7xx_epwmss2_hwmod = {
 -      .name           = "epwmss2",
 -      .class          = &dra7xx_epwmss_hwmod_class,
 -      .clkdm_name     = "l4per2_clkdm",
 -      .main_clk       = "l4_root_clk_div",
 -      .prcm           = {
 -              .omap4  = {
 -                      .modulemode     = MODULEMODE_SWCTRL,
 -                      .clkctrl_offs   = DRA7XX_CM_L4PER2_PWMSS3_CLKCTRL_OFFSET,
 -                      .context_offs   = DRA7XX_RM_L4PER2_PWMSS3_CONTEXT_OFFSET,
 -              },
 -      },
--};
--
  /*
   * 'tpcc' class
   *
@@@ -1128,14 -1638,22 +1077,6 @@@ static struct omap_hwmod_ocp_if dra7xx_
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* l4_cfg -> dma_system */
- static struct omap_hwmod_ocp_if dra7xx_l4_cfg__dma_system = {
-       .master         = &dra7xx_l4_cfg_hwmod,
-       .slave          = &dra7xx_dma_system_hwmod,
 -/* l4_wkup -> dcan1 */
 -static struct omap_hwmod_ocp_if dra7xx_l4_wkup__dcan1 = {
 -      .master         = &dra7xx_l4_wkup_hwmod,
 -      .slave          = &dra7xx_dcan1_hwmod,
 -      .clk            = "wkupaon_iclk_mux",
 -      .user           = OCP_USER_MPU | OCP_USER_SDMA,
 -};
 -
 -/* l4_per2 -> dcan2 */
 -static struct omap_hwmod_ocp_if dra7xx_l4_per2__dcan2 = {
 -      .master         = &dra7xx_l4_per2_hwmod,
 -      .slave          = &dra7xx_dcan2_hwmod,
--      .clk            = "l3_iclk_div",
--      .user           = OCP_USER_MPU | OCP_USER_SDMA,
--};
--
  /* l3_main_1 -> tpcc */
  static struct omap_hwmod_ocp_if dra7xx_l3_main_1__tpcc = {
        .master         = &dra7xx_l3_main_1_hwmod,
@@@ -1368,7 -2086,8 +1309,6 @@@ static struct omap_hwmod_ocp_if *dra7xx
        &dra7xx_l3_main_1__bb2d,
        &dra7xx_l4_wkup__counter_32k,
        &dra7xx_l4_wkup__ctrl_module_wkup,
-       &dra7xx_l4_cfg__dma_system,
 -      &dra7xx_l4_wkup__dcan1,
 -      &dra7xx_l4_per2__dcan2,
        &dra7xx_l3_main_1__tpcc,
        &dra7xx_l3_main_1__tptc0,
        &dra7xx_l3_main_1__tptc1,