From: Tony Lindgren <tony@atomide.com>
Date: Thu, 3 Sep 2020 09:06:18 +0000 (+0300)
Subject: Merge branch 'omap-for-v5.10/prm-genpd' into omap-for-v5.10/ti-sysc-drop-pdata
X-Git-Tag: v5.10.7~1322^2~11^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d7ce5c5c4e6418c1bb1d7c5ee94de815fdc3041;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'omap-for-v5.10/prm-genpd' into omap-for-v5.10/ti-sysc-drop-pdata
---

0d7ce5c5c4e6418c1bb1d7c5ee94de815fdc3041
diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
index a131bf2,1be30c3..ab5146b
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
@@@ -74,22 -74,14 +74,6 @@@ struct omap_hwmod_ocp_if am33xx_l3_s__l
  	.user		= OCP_USER_MPU | OCP_USER_SDMA,
  };
  
- /* gfx -> l3 main */
- struct omap_hwmod_ocp_if am33xx_gfx__l3_main = {
- 	.master		= &am33xx_gfx_hwmod,
- 	.slave		= &am33xx_l3_main_hwmod,
- 	.clk		= "dpll_core_m4_ck",
- 	.user		= OCP_USER_MPU | OCP_USER_SDMA,
- };
- 
- /* l3 main -> gfx */
- struct omap_hwmod_ocp_if am33xx_l3_main__gfx = {
- 	.master		= &am33xx_l3_main_hwmod,
- 	.slave		= &am33xx_gfx_hwmod,
- 	.clk		= "dpll_core_m4_ck",
- 	.user		= OCP_USER_MPU | OCP_USER_SDMA,
 -/* l4 wkup -> rtc */
 -struct omap_hwmod_ocp_if am33xx_l4_wkup__rtc = {
 -	.master		= &am33xx_l4_wkup_hwmod,
 -	.slave		= &am33xx_rtc_hwmod,
 -	.clk		= "clkdiv32k_ick",
 -	.user		= OCP_USER_MPU,
--};
--
  /* l3s cfg -> gpmc */
  struct omap_hwmod_ocp_if am33xx_l3_s__gpmc = {
  	.master		= &am33xx_l3_s_hwmod,