From: Tony Lindgren <tony@atomide.com>
To: linux-omap@vger.kernel.org
Cc: "Benoît Cousson" <bcousson@baylibre.com>,
devicetree@vger.kernel.org,
"Kishon Vijay Abraham I" <kishon@ti.com>,
"Vignesh Raghavendra" <vigneshr@ti.com>
Subject: [PATCH 04/12] ARM: OMAP2+: Drop legacy platform data for dra7 mpu
Date: Tue, 26 Jan 2021 14:49:29 +0200 [thread overview]
Message-ID: <20210126124937.52994-5-tony@atomide.com> (raw)
In-Reply-To: <20210126124937.52994-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/dra7.dtsi | 1 -
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 42 -----------------------
2 files changed, 43 deletions(-)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -158,7 +158,6 @@ l4_per1: interconnect@48000000 {
target-module@48210000 {
compatible = "ti,sysc-omap4-simple", "ti,sysc";
- ti,hwmods = "mpu";
power-domains = <&prm_mpu>;
clocks = <&mpu_clkctrl DRA7_MPU_CLKCTRL 0>;
clock-names = "fck";
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -242,30 +242,6 @@ static struct omap_hwmod dra7xx_ctrl_module_wkup_hwmod = {
},
};
-/*
- * 'mpu' class
- *
- */
-
-static struct omap_hwmod_class dra7xx_mpu_hwmod_class = {
- .name = "mpu",
-};
-
-/* mpu */
-static struct omap_hwmod dra7xx_mpu_hwmod = {
- .name = "mpu",
- .class = &dra7xx_mpu_hwmod_class,
- .clkdm_name = "mpu_clkdm",
- .flags = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
- .main_clk = "dpll_mpu_m2_ck",
- .prcm = {
- .omap4 = {
- .clkctrl_offs = DRA7XX_CM_MPU_MPU_CLKCTRL_OFFSET,
- .context_offs = DRA7XX_RM_MPU_MPU_CONTEXT_OFFSET,
- },
- },
-};
-
/*
* 'vcp' class
*
@@ -333,14 +309,6 @@ static struct omap_hwmod_ocp_if dra7xx_l4_cfg__l3_main_1 = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
-/* mpu -> l3_main_1 */
-static struct omap_hwmod_ocp_if dra7xx_mpu__l3_main_1 = {
- .master = &dra7xx_mpu_hwmod,
- .slave = &dra7xx_l3_main_1_hwmod,
- .clk = "l3_iclk_div",
- .user = OCP_USER_MPU,
-};
-
/* l3_main_1 -> l3_main_2 */
static struct omap_hwmod_ocp_if dra7xx_l3_main_1__l3_main_2 = {
.master = &dra7xx_l3_main_1_hwmod,
@@ -421,14 +389,6 @@ static struct omap_hwmod_ocp_if dra7xx_l4_wkup__ctrl_module_wkup = {
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
-/* l4_cfg -> mpu */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__mpu = {
- .master = &dra7xx_l4_cfg_hwmod,
- .slave = &dra7xx_mpu_hwmod,
- .clk = "l3_iclk_div",
- .user = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
/* l3_main_1 -> vcp1 */
static struct omap_hwmod_ocp_if dra7xx_l3_main_1__vcp1 = {
.master = &dra7xx_l3_main_1_hwmod,
@@ -465,7 +425,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
&dra7xx_l3_main_1__dmm,
&dra7xx_l3_main_2__l3_instr,
&dra7xx_l4_cfg__l3_main_1,
- &dra7xx_mpu__l3_main_1,
&dra7xx_l3_main_1__l3_main_2,
&dra7xx_l4_cfg__l3_main_2,
&dra7xx_l3_main_1__l4_cfg,
@@ -476,7 +435,6 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
&dra7xx_l4_per2__atl,
&dra7xx_l3_main_1__bb2d,
&dra7xx_l4_wkup__ctrl_module_wkup,
- &dra7xx_l4_cfg__mpu,
&dra7xx_l3_main_1__vcp1,
&dra7xx_l4_per2__vcp1,
&dra7xx_l3_main_1__vcp2,
--
2.30.0
next prev parent reply other threads:[~2021-01-26 12:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 12:49 [PATCHv2 00/12] Drop legacy platform data for dra7 Tony Lindgren
2021-01-26 12:49 ` [PATCH 01/12] ARM: OMAP2+: Drop legacy platform data for dra7 pcie Tony Lindgren
2021-01-26 12:49 ` [PATCH 02/12] ARM: OMAP2+: Drop legacy platform data for dra7 qspi Tony Lindgren
2021-01-26 12:49 ` [PATCH 03/12] ARM: OMAP2+: Drop legacy platform data for dra7 sata Tony Lindgren
2021-01-26 12:49 ` Tony Lindgren [this message]
2021-01-26 12:49 ` [PATCH 05/12] ARM: OMAP2+: Drop legacy platform data for dra7 dmm Tony Lindgren
2021-01-26 12:49 ` [PATCH 06/12] ARM: OMAP2+: Drop legacy platform data for dra7 l4_wkup Tony Lindgren
2021-01-26 12:49 ` [PATCH 07/12] ARM: OMAP2+: Drop legacy platform data for dra7 l4_per1 Tony Lindgren
2021-01-26 12:49 ` [PATCH 08/12] ARM: OMAP2+: Drop legacy platform data for dra7 l4_per2 Tony Lindgren
2021-01-26 12:49 ` [PATCH 09/12] ARM: OMAP2+: Drop legacy platform data for dra7 l4_per3 Tony Lindgren
2021-01-26 12:49 ` [PATCH 10/12] ARM: OMAP2+: Drop legacy platform data for dra7 l4_cfg Tony Lindgren
2021-01-26 12:49 ` [PATCH 11/12] ARM: OMAP2+: Drop legacy platform data for dra7 l3 Tony Lindgren
2021-01-26 12:49 ` [PATCH 12/12] ARM: OMAP2+: Drop legacy platform data for dra7 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=20210126124937.52994-5-tony@atomide.com \
--to=tony@atomide.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=kishon@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=vigneshr@ti.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).