]> Git Repo - linux.git/commitdiff
Merge tag 'omap-for-v5.4/ti-sysc-sgx-signed' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <[email protected]>
Wed, 4 Sep 2019 15:22:01 +0000 (17:22 +0200)
committerArnd Bergmann <[email protected]>
Wed, 4 Sep 2019 15:22:02 +0000 (17:22 +0200)
SoC glue layer changes for SGX on omap variants for v5.4

For a while we've had omap4 sgx glue layer defined in dts and probed
with ti-sysc driver. This allows idling the sgx module for PM, and
removes the need for custom platform glue layer code for any further
driver changes.

We first drop the unused legacy platform data for omap4 sgx. Then for
omap5, we need add the missing clkctrl clock data so we can configure
sgx. And we configure sgx for omap34xx, omap36xx and am3517.

For am335x, we still have a dependency for rstctrl reset driver changes,
so that will be added later on.

Note that this branch is based on earlier ti-sysc branch for omap36xx
glue layer quirk handling.

* tag 'omap-for-v5.4/ti-sysc-sgx-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: ARM: dts: Configure interconnect target module for am3517sgx
  ARM: dts: Configure interconnect target module for omap3 sgx
  ARM: dts: Configure sgx for omap5
  clk: ti: add clkctrl data omap5 sgx
  ARM: OMAP2+: Drop legacy platform data for omap4 gpu

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
1  2 
arch/arm/mach-omap2/omap_hwmod_44xx_data.c

index 08fba48cfce06d7286cb2d572a83426b41424ef5,559b205020c71603eb65da1ea46d2594fff5a1f5..28ea2960a9b28cfc453b10770018c93d89e4100e
@@@ -28,6 -28,7 +28,6 @@@
  #include "cm2_44xx.h"
  #include "prm44xx.h"
  #include "prm-regbits-44xx.h"
 -#include "wd_timer.h"
  
  /* Base offset for all OMAP4 interrupts external to MPUSS */
  #define OMAP44XX_IRQ_GIC_START        32
@@@ -274,6 -275,29 +274,6 @@@ static struct omap_hwmod omap44xx_aess_
        },
  };
  
 -/*
 - * 'c2c' class
 - * chip 2 chip interface used to plug the ape soc (omap) with an external modem
 - * soc
 - */
 -
 -static struct omap_hwmod_class omap44xx_c2c_hwmod_class = {
 -      .name   = "c2c",
 -};
 -
 -/* c2c */
 -static struct omap_hwmod omap44xx_c2c_hwmod = {
 -      .name           = "c2c",
 -      .class          = &omap44xx_c2c_hwmod_class,
 -      .clkdm_name     = "d2d_clkdm",
 -      .prcm = {
 -              .omap4 = {
 -                      .clkctrl_offs = OMAP4_CM_D2D_SAD2D_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_D2D_SAD2D_CONTEXT_OFFSET,
 -              },
 -      },
 -};
 -
  /*
   * 'counter' class
   * 32-bit ordinary counter, clocked by the falling edge of the 32 khz clock
@@@ -1061,41 -1085,6 +1061,6 @@@ static struct omap_hwmod omap44xx_gpmc_
        },
  };
  
- /*
-  * 'gpu' class
-  * 2d/3d graphics accelerator
-  */
- static struct omap_hwmod_class_sysconfig omap44xx_gpu_sysc = {
-       .rev_offs       = 0x1fc00,
-       .sysc_offs      = 0x1fc10,
-       .sysc_flags     = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE),
-       .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
-                          SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
-                          MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
-       .sysc_fields    = &omap_hwmod_sysc_type2,
- };
- static struct omap_hwmod_class omap44xx_gpu_hwmod_class = {
-       .name   = "gpu",
-       .sysc   = &omap44xx_gpu_sysc,
- };
- /* gpu */
- static struct omap_hwmod omap44xx_gpu_hwmod = {
-       .name           = "gpu",
-       .class          = &omap44xx_gpu_hwmod_class,
-       .clkdm_name     = "l3_gfx_clkdm",
-       .main_clk       = "sgx_clk_mux",
-       .prcm = {
-               .omap4 = {
-                       .clkctrl_offs = OMAP4_CM_GFX_GFX_CLKCTRL_OFFSET,
-                       .context_offs = OMAP4_RM_GFX_GFX_CONTEXT_OFFSET,
-                       .modulemode   = MODULEMODE_SWCTRL,
-               },
-       },
- };
  /*
   * 'hdq1w' class
   * hdq / 1-wire serial interface controller
@@@ -2409,6 -2398,61 +2374,6 @@@ static struct omap_hwmod omap44xx_usb_t
        },
  };
  
 -/*
 - * 'wd_timer' class
 - * 32-bit watchdog upward counter that generates a pulse on the reset pin on
 - * overflow condition
 - */
 -
 -static struct omap_hwmod_class_sysconfig omap44xx_wd_timer_sysc = {
 -      .rev_offs       = 0x0000,
 -      .sysc_offs      = 0x0010,
 -      .syss_offs      = 0x0014,
 -      .sysc_flags     = (SYSC_HAS_EMUFREE | SYSC_HAS_SIDLEMODE |
 -                         SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
 -      .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
 -                         SIDLE_SMART_WKUP),
 -      .sysc_fields    = &omap_hwmod_sysc_type1,
 -};
 -
 -static struct omap_hwmod_class omap44xx_wd_timer_hwmod_class = {
 -      .name           = "wd_timer",
 -      .sysc           = &omap44xx_wd_timer_sysc,
 -      .pre_shutdown   = &omap2_wd_timer_disable,
 -      .reset          = &omap2_wd_timer_reset,
 -};
 -
 -/* wd_timer2 */
 -static struct omap_hwmod omap44xx_wd_timer2_hwmod = {
 -      .name           = "wd_timer2",
 -      .class          = &omap44xx_wd_timer_hwmod_class,
 -      .clkdm_name     = "l4_wkup_clkdm",
 -      .main_clk       = "sys_32k_ck",
 -      .prcm = {
 -              .omap4 = {
 -                      .clkctrl_offs = OMAP4_CM_WKUP_WDT2_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_WKUP_WDT2_CONTEXT_OFFSET,
 -                      .modulemode   = MODULEMODE_SWCTRL,
 -              },
 -      },
 -};
 -
 -/* wd_timer3 */
 -static struct omap_hwmod omap44xx_wd_timer3_hwmod = {
 -      .name           = "wd_timer3",
 -      .class          = &omap44xx_wd_timer_hwmod_class,
 -      .clkdm_name     = "abe_clkdm",
 -      .main_clk       = "sys_32k_ck",
 -      .prcm = {
 -              .omap4 = {
 -                      .clkctrl_offs = OMAP4_CM1_ABE_WDT3_CLKCTRL_OFFSET,
 -                      .context_offs = OMAP4_RM_ABE_WDT3_CONTEXT_OFFSET,
 -                      .modulemode   = MODULEMODE_SWCTRL,
 -              },
 -      },
 -};
 -
 -
  /*
   * interfaces
   */
@@@ -2517,14 -2561,6 +2482,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* gpu -> l3_main_2 */
- static struct omap_hwmod_ocp_if omap44xx_gpu__l3_main_2 = {
-       .master         = &omap44xx_gpu_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,
@@@ -2709,6 -2745,14 +2666,6 @@@ static struct omap_hwmod_ocp_if __maybe
        .user           = OCP_USER_SDMA,
  };
  
 -/* l3_main_2 -> c2c */
 -static struct omap_hwmod_ocp_if omap44xx_l3_main_2__c2c = {
 -      .master         = &omap44xx_l3_main_2_hwmod,
 -      .slave          = &omap44xx_c2c_hwmod,
 -      .clk            = "l3_div_ck",
 -      .user           = OCP_USER_MPU | OCP_USER_SDMA,
 -};
 -
  /* l4_wkup -> counter_32k */
  static struct omap_hwmod_ocp_if omap44xx_l4_wkup__counter_32k = {
        .master         = &omap44xx_l4_wkup_hwmod,
@@@ -2941,14 -2985,6 +2898,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* l3_main_2 -> gpu */
- static struct omap_hwmod_ocp_if omap44xx_l3_main_2__gpu = {
-       .master         = &omap44xx_l3_main_2_hwmod,
-       .slave          = &omap44xx_gpu_hwmod,
-       .clk            = "l3_div_ck",
-       .user           = OCP_USER_MPU | OCP_USER_SDMA,
- };
  /* l4_per -> hdq1w */
  static struct omap_hwmod_ocp_if omap44xx_l4_per__hdq1w = {
        .master         = &omap44xx_l4_per_hwmod,
@@@ -3309,6 -3345,30 +3258,6 @@@ static struct omap_hwmod_ocp_if omap44x
        .user           = OCP_USER_MPU | OCP_USER_SDMA,
  };
  
 -/* l4_wkup -> wd_timer2 */
 -static struct omap_hwmod_ocp_if omap44xx_l4_wkup__wd_timer2 = {
 -      .master         = &omap44xx_l4_wkup_hwmod,
 -      .slave          = &omap44xx_wd_timer2_hwmod,
 -      .clk            = "l4_wkup_clk_mux_ck",
 -      .user           = OCP_USER_MPU | OCP_USER_SDMA,
 -};
 -
 -/* l4_abe -> wd_timer3 */
 -static struct omap_hwmod_ocp_if omap44xx_l4_abe__wd_timer3 = {
 -      .master         = &omap44xx_l4_abe_hwmod,
 -      .slave          = &omap44xx_wd_timer3_hwmod,
 -      .clk            = "ocp_abe_iclk",
 -      .user           = OCP_USER_MPU,
 -};
 -
 -/* l4_abe -> wd_timer3 (dma) */
 -static struct omap_hwmod_ocp_if omap44xx_l4_abe__wd_timer3_dma = {
 -      .master         = &omap44xx_l4_abe_hwmod,
 -      .slave          = &omap44xx_wd_timer3_hwmod,
 -      .clk            = "ocp_abe_iclk",
 -      .user           = OCP_USER_SDMA,
 -};
 -
  /* mpu -> emif1 */
  static struct omap_hwmod_ocp_if omap44xx_mpu__emif1 = {
        .master         = &omap44xx_mpu_hwmod,
@@@ -3339,7 -3399,6 +3288,6 @@@ static struct omap_hwmod_ocp_if *omap44
        &omap44xx_debugss__l3_main_2,
        &omap44xx_dma_system__l3_main_2,
        &omap44xx_fdif__l3_main_2,
-       &omap44xx_gpu__l3_main_2,
        &omap44xx_hsi__l3_main_2,
        &omap44xx_ipu__l3_main_2,
        &omap44xx_iss__l3_main_2,
        &omap44xx_l4_cfg__ocp_wp_noc,
        &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,
        &omap44xx_l4_cfg__ctrl_module_pad_core,
        &omap44xx_l4_per__elm,
        &omap44xx_l4_cfg__fdif,
        &omap44xx_l3_main_2__gpmc,
-       &omap44xx_l3_main_2__gpu,
        &omap44xx_l4_per__hdq1w,
        &omap44xx_l4_cfg__hsi,
        &omap44xx_l3_main_2__ipu,
        &omap44xx_l4_cfg__usb_host_hs,
        &omap44xx_l4_cfg__usb_otg_hs,
        &omap44xx_l4_cfg__usb_tll_hs,
 -      &omap44xx_l4_wkup__wd_timer2,
 -      &omap44xx_l4_abe__wd_timer3,
 -      &omap44xx_l4_abe__wd_timer3_dma,
        &omap44xx_mpu__emif1,
        &omap44xx_mpu__emif2,
        &omap44xx_l3_main_2__aes1,
This page took 0.087823 seconds and 4 git commands to generate.