linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: linux-omap@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/11] ARM: OMAP2+: Drop legacy platform data for omap4 dmm
Date: Mon,  8 Mar 2021 15:46:19 +0200	[thread overview]
Message-ID: <20210308134627.13056-4-tony@atomide.com> (raw)
In-Reply-To: <20210308134627.13056-1-tony@atomide.com>

We can now probe devices with ti-sysc interconnect driver and dts data.
Let's drop the related platform data and custom ti,hwmods dts property.

As we're just dropping data, and the early platform data init is based on
the custom ti,hwmods property, we want to drop both the platform data and
ti,hwmods property in a single patch.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/omap4.dtsi               |  1 -
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 39 ----------------------
 2 files changed, 40 deletions(-)

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -287,7 +287,6 @@ target-module@4012c000 {
 
 		target-module@4e000000 {
 			compatible = "ti,sysc-omap2", "ti,sysc";
-			ti,hwmods = "dmm";
 			reg = <0x4e000000 0x4>,
 			      <0x4e000010 0x4>;
 			reg-names = "rev", "sysc";
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -33,27 +33,6 @@
  * IP blocks
  */
 
-/*
- * 'dmm' class
- * instance(s): dmm
- */
-static struct omap_hwmod_class omap44xx_dmm_hwmod_class = {
-	.name	= "dmm",
-};
-
-/* dmm */
-static struct omap_hwmod omap44xx_dmm_hwmod = {
-	.name		= "dmm",
-	.class		= &omap44xx_dmm_hwmod_class,
-	.clkdm_name	= "l3_emif_clkdm",
-	.prcm = {
-		.omap4 = {
-			.clkctrl_offs = OMAP4_CM_MEMIF_DMM_CLKCTRL_OFFSET,
-			.context_offs = OMAP4_RM_MEMIF_DMM_CONTEXT_OFFSET,
-		},
-	},
-};
-
 /*
  * 'l3' class
  * instance(s): l3_instr, l3_main_1, l3_main_2, l3_main_3
@@ -440,22 +419,6 @@ static struct omap_hwmod omap44xx_sl2if_hwmod = {
  * interfaces
  */
 
-/* l3_main_1 -> dmm */
-static struct omap_hwmod_ocp_if omap44xx_l3_main_1__dmm = {
-	.master		= &omap44xx_l3_main_1_hwmod,
-	.slave		= &omap44xx_dmm_hwmod,
-	.clk		= "l3_div_ck",
-	.user		= OCP_USER_SDMA,
-};
-
-/* mpu -> dmm */
-static struct omap_hwmod_ocp_if omap44xx_mpu__dmm = {
-	.master		= &omap44xx_mpu_hwmod,
-	.slave		= &omap44xx_dmm_hwmod,
-	.clk		= "l3_div_ck",
-	.user		= OCP_USER_MPU,
-};
-
 /* l3_main_3 -> l3_instr */
 static struct omap_hwmod_ocp_if omap44xx_l3_main_3__l3_instr = {
 	.master		= &omap44xx_l3_main_3_hwmod,
@@ -665,8 +628,6 @@ static struct omap_hwmod_ocp_if omap44xx_mpu__emif2 = {
 };
 
 static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = {
-	&omap44xx_l3_main_1__dmm,
-	&omap44xx_mpu__dmm,
 	&omap44xx_l3_main_3__l3_instr,
 	&omap44xx_ocp_wp_noc__l3_instr,
 	&omap44xx_l3_main_2__l3_main_1,
-- 
2.30.1

  parent reply	other threads:[~2021-03-08 13:47 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-08 13:46 [PATCH 00/11] Drop legacy data for omap4 Tony Lindgren
2021-03-08 13:46 ` [PATCH 01/11] ARM: OMAP2+: Drop legacy platform data for omap4 iss Tony Lindgren
2021-03-08 13:46 ` [PATCH 02/11] ARM: OMAP2+: Drop legacy platform data for omap4 control modules Tony Lindgren
2021-03-08 13:46 ` Tony Lindgren [this message]
2021-03-08 13:46 ` [PATCH 04/11] ARM: OMAP2+: Drop legacy platform data for omap4 emif Tony Lindgren
2021-03-08 13:46 ` [PATCH 05/11] ARM: OMAP2+: Drop legacy platform data for omap4 debugss Tony Lindgren
2021-03-08 13:46 ` [PATCH 06/11] ARM: OMAP2+: Drop legacy platform data for omap4 mpu Tony Lindgren
2021-03-08 13:46 ` [PATCH 07/11] ARM: OMAP2+: Drop legacy platform data for omap4 l4_wkup Tony Lindgren
2021-03-08 13:46 ` [PATCH 08/11] ARM: OMAP2+: Drop legacy platform data for omap4 l4_per Tony Lindgren
2021-03-08 13:46 ` [PATCH 09/11] ARM: OMAP2+: Drop legacy platform data for omap4 l4_cfg Tony Lindgren
2021-03-08 13:46 ` [PATCH 10/11] ARM: OMAP2+: Drop legacy platform data for omap4 l3 Tony Lindgren
2021-03-08 13:46 ` [PATCH 11/11] ARM: OMAP2+: Drop legacy platform data for omap4 hwmod Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210308134627.13056-4-tony@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --subject='Re: [PATCH 03/11] ARM: OMAP2+: Drop legacy platform data for omap4 dmm' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox