From: Tony Lindgren <tony@atomide.com>
To: linux-omap@vger.kernel.org
Cc: "Benoît Cousson" <bcousson@baylibre.com>,
devicetree@vger.kernel.org, "Dave Gerlach" <d-gerlach@ti.com>,
"Suman Anna" <s-anna@ti.com>,
"Michael Turquette" <mturquette@baylibre.com>,
"Santosh Shilimkar" <ssantosh@kernel.org>,
"Stephen Boyd" <sboyd@kernel.org>,
"Tero Kristo" <t-kristo@ti.com>,
linux-clk@vger.kernel.org
Subject: [PATCH 10/17] ARM: OMAP2+: Drop legacy platform data for am4 ocmcram
Date: Mon, 16 Nov 2020 13:19:32 +0200 [thread overview]
Message-ID: <20201116111939.21405-11-tony@atomide.com> (raw)
In-Reply-To: <20201116111939.21405-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.
Note that we need to use "ti,no-idle" here.
Cc: Dave Gerlach <d-gerlach@ti.com>
Cc: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/boot/dts/am4372.dtsi | 36 ++++++++++++-------
.../omap_hwmod_33xx_43xx_interconnect_data.c | 7 ----
.../omap_hwmod_33xx_43xx_ipblock_data.c | 19 ----------
arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 1 -
4 files changed, 23 insertions(+), 40 deletions(-)
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -503,23 +503,33 @@ qspi: spi@0 {
};
};
- ocmcram: sram@40300000 {
- compatible = "mmio-sram";
- reg = <0x40300000 0x40000>; /* 256k */
- ranges = <0x0 0x40300000 0x40000>;
+ target-module@40300000 {
+ compatible = "ti,sysc-omap4-simple", "ti,sysc";
+ clocks = <&l3_clkctrl AM4_L3_OCMCRAM_CLKCTRL 0>;
+ clock-names = "fck";
+ ti,no-idle;
#address-cells = <1>;
#size-cells = <1>;
+ ranges = <0 0x40300000 0x40000>;
- pm_sram_code: pm-code-sram@0 {
- compatible = "ti,sram";
- reg = <0x0 0x1000>;
- protect-exec;
- };
+ ocmcram: sram@0 {
+ compatible = "mmio-sram";
+ reg = <0 0x40000>; /* 256k */
+ ranges = <0 0 0x40000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
- pm_sram_data: pm-data-sram@1000 {
- compatible = "ti,sram";
- reg = <0x1000 0x1000>;
- pool;
+ pm_sram_code: pm-code-sram@0 {
+ compatible = "ti,sram";
+ reg = <0x0 0x1000>;
+ protect-exec;
+ };
+
+ pm_sram_data: pm-data-sram@1000 {
+ compatible = "ti,sram";
+ reg = <0x1000 0x1000>;
+ pool;
+ };
};
};
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
@@ -73,10 +73,3 @@ struct omap_hwmod_ocp_if am33xx_l3_s__l3_main = {
.clk = "l3s_gclk",
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
-
-/* l3 main -> ocmc */
-struct omap_hwmod_ocp_if am33xx_l3_main__ocmc = {
- .master = &am33xx_l3_main_hwmod,
- .slave = &am33xx_ocmcram_hwmod,
- .user = OCP_USER_MPU | OCP_USER_SDMA,
-};
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
@@ -139,24 +139,6 @@ struct omap_hwmod am33xx_prcm_hwmod = {
.clkdm_name = "l4_wkup_clkdm",
};
-/* ocmcram */
-static struct omap_hwmod_class am33xx_ocmcram_hwmod_class = {
- .name = "ocmcram",
-};
-
-struct omap_hwmod am33xx_ocmcram_hwmod = {
- .name = "ocmcram",
- .class = &am33xx_ocmcram_hwmod_class,
- .clkdm_name = "l3_clkdm",
- .flags = HWMOD_INIT_NO_IDLE,
- .main_clk = "l3_gclk",
- .prcm = {
- .omap4 = {
- .modulemode = MODULEMODE_SWCTRL,
- },
- },
-};
-
/* 'smartreflex' class */
static struct omap_hwmod_class am33xx_smartreflex_hwmod_class = {
.name = "smartreflex",
@@ -215,7 +197,6 @@ static void omap_hwmod_am43xx_clkctrl(void)
CLKCTRL(am33xx_l4_wkup_hwmod, AM43XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET);
CLKCTRL(am33xx_l3_main_hwmod, AM43XX_CM_PER_L3_CLKCTRL_OFFSET);
CLKCTRL(am33xx_mpu_hwmod , AM43XX_CM_MPU_MPU_CLKCTRL_OFFSET);
- CLKCTRL(am33xx_ocmcram_hwmod , AM43XX_CM_PER_OCMCRAM_CLKCTRL_OFFSET);
}
void omap_hwmod_am43xx_reg(void)
diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
--- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
@@ -68,7 +68,6 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
&am33xx_l3_s__l3_main,
&am43xx_l4_wkup__smartreflex0,
&am43xx_l4_wkup__smartreflex1,
- &am33xx_l3_main__ocmc,
NULL,
};
--
2.29.2
next prev parent reply other threads:[~2020-11-16 12:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 11:19 [PATCH 00/17] Update am437x to boot with simple-pm-bus and genpd Tony Lindgren
2020-11-16 11:19 ` [PATCH 01/17] clk: ti: am437x: Keep am4 l3 main clock always on for genpd Tony Lindgren
2020-12-09 2:19 ` Stephen Boyd
2020-11-16 11:19 ` [PATCH 02/17] soc: ti: omap-prm: am4: add genpd support for remaining PRM instances Tony Lindgren
2020-11-16 11:19 ` [PATCH 03/17] ARM: dts: am43xx: add " Tony Lindgren
2020-11-16 11:19 ` [PATCH 04/17] ARM: dts: Configure also interconnect clocks for am4 system timer Tony Lindgren
2020-11-16 11:19 ` [PATCH 05/17] ARM: OMAP2+: Drop legacy platform data for am4 control module Tony Lindgren
2020-11-16 11:19 ` [PATCH 06/17] ARM: dts: Configure RTC powerdomain for am4 Tony Lindgren
2020-11-16 11:19 ` [PATCH 07/17] ARM: dts: Configure interconnect target module for am4 wkup_m3 Tony Lindgren
2020-11-16 11:19 ` [PATCH 08/17] ARM: OMAP2+: Drop legacy platform data " Tony Lindgren
2020-11-16 11:19 ` [PATCH 09/17] ARM: OMAP2+: Drop legacy platform data for am4 emif Tony Lindgren
2020-11-16 11:19 ` Tony Lindgren [this message]
2020-11-16 11:19 ` [PATCH 11/17] ARM: OMAP2+: Drop legacy platform data for am4 mpuss Tony Lindgren
2020-11-16 11:19 ` [PATCH 12/17] ARM: dts: Use simple-pm-bus for genpd for am4 l4_wkup Tony Lindgren
2020-11-16 11:19 ` [PATCH 13/17] ARM: dts: Use simple-pm-bus for genpd for am4 l4_fast Tony Lindgren
2020-11-16 11:19 ` [PATCH 14/17] ARM: dts: Use simple-pm-bus for genpd for am4 l4_per Tony Lindgren
2020-11-16 11:19 ` [PATCH 15/17] ARM: dts: Move am4 l3 noc to a separate node Tony Lindgren
2020-11-16 11:19 ` [PATCH 16/17] ARM: dts: Use simple-pm-bus for genpd for am4 l3 Tony Lindgren
2020-11-16 11:19 ` [PATCH 17/17] ARM: OMAP2+: Drop legacy remaining legacy platform data for am4 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=20201116111939.21405-11-tony@atomide.com \
--to=tony@atomide.com \
--cc=bcousson@baylibre.com \
--cc=d-gerlach@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=s-anna@ti.com \
--cc=sboyd@kernel.org \
--cc=ssantosh@kernel.org \
--cc=t-kristo@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).