From: rnayak@ti•com (Rajendra Nayak)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 02/13] ARM: OMAP2+: hwmod: AM335x: prepare for AM43x reuse
Date: Wed, 21 Aug 2013 14:07:28 +0530 [thread overview]
Message-ID: <52147C48.2070407@ti.com> (raw)
In-Reply-To: <5207ff755f653dd438b7717bab1d0d61d50d44b6.1375443858.git.afzal@ti.com>
On Friday 02 August 2013 07:06 PM, Afzal Mohammed wrote:
> AM335x & AM43x have most of the interconnects, IPs similar. Instead of
> adding new hwmod data for AM43x, reuse AM335x hwmod data as much as
> possible.
>
> In the hwmod entries that could be reused on AM43x, major changes are
> in register offsets and different ocpif clock for most of peripherals
> that comes under l4_wkup interconnect.
>
> To achieve reuse, as a first step, bring out ocpif's relevant for both
> SoC's to a new array and handle appropriately.
>
> Signed-off-by: Afzal Mohammed <afzal@ti•com>
> ---
> arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 22 ++++++++++++++++++----
> 1 file changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
> index 7a9b492..b0a38f0 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
> @@ -29,6 +29,7 @@
> #include "i2c.h"
> #include "mmc.h"
> #include "wd_timer.h"
> +#include "soc.h"
>
> /*
> * IP blocks
> @@ -2458,6 +2459,13 @@ static struct omap_hwmod_ocp_if am33xx_l3_main__aes0 = {
>
> static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
> &am33xx_l3_main__emif,
> + &am33xx_l4_hs__pruss,
> + &am33xx_l3_main__lcdc,
> + &am33xx_l3_s__usbss,
> + NULL,
> +};
> +
> +static struct omap_hwmod_ocp_if *amx3xx_hwmod_ocp_ifs[] __initdata = {
It took me sometime to figure out what amx3xx was :)
Did you take a look at how omap2420 and omap2430 reuse is done? you can still
have just one am33xx specific and another am43xx specific ocp_if arrays.
> &am33xx_mpu__l3_main,
> &am33xx_mpu__prcm,
> &am33xx_l3_s__l4_ls,
> @@ -2481,7 +2489,6 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
> &am33xx_l4_wkup__gpio0,
> &am33xx_l4_wkup__adc_tsc,
> &am33xx_l4_wkup__wd_timer1,
> - &am33xx_l4_hs__pruss,
> &am33xx_l4_per__dcan0,
> &am33xx_l4_per__dcan1,
> &am33xx_l4_per__gpio1,
> @@ -2522,14 +2529,12 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
> &am33xx_epwmss2__eqep2,
> &am33xx_epwmss2__ehrpwm2,
> &am33xx_l3_s__gpmc,
> - &am33xx_l3_main__lcdc,
> &am33xx_l4_ls__mcspi0,
> &am33xx_l4_ls__mcspi1,
> &am33xx_l3_main__tptc0,
> &am33xx_l3_main__tptc1,
> &am33xx_l3_main__tptc2,
> &am33xx_l3_main__ocmc,
> - &am33xx_l3_s__usbss,
> &am33xx_l4_hs__cpgmac0,
> &am33xx_cpgmac0__mdio,
> &am33xx_l3_main__sha0,
> @@ -2539,6 +2544,15 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
>
> int __init am33xx_hwmod_init(void)
> {
> + int ret;
> +
> omap_hwmod_init();
> - return omap_hwmod_register_links(am33xx_hwmod_ocp_ifs);
> + ret = omap_hwmod_register_links(amx3xx_hwmod_ocp_ifs);
> + if (ret < 0)
> + return ret;
> +
> + if (soc_is_am33xx())
> + return omap_hwmod_register_links(am33xx_hwmod_ocp_ifs);
> +
> + return 0;
> }
>
next prev parent reply other threads:[~2013-08-21 8:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-02 13:35 [PATCH v2 00/13] ARM: OMAP2+: AM43x PRCM support Afzal Mohammed
2013-08-02 13:36 ` [PATCH v2 01/13] ARM: OMAP2+: CM: reintroduce SW_SLEEP for OMAP4 Afzal Mohammed
2013-08-21 7:13 ` Rajendra Nayak
2013-08-28 12:14 ` Afzal Mohammed
2013-08-30 18:04 ` Vaibhav Bedia
2013-08-02 13:36 ` [PATCH v2 02/13] ARM: OMAP2+: hwmod: AM335x: prepare for AM43x reuse Afzal Mohammed
2013-08-21 8:37 ` Rajendra Nayak [this message]
2013-08-02 13:36 ` [PATCH v2 03/13] ARM: OMAP2+: hwmod: AMx3: runtime AM335x handling Afzal Mohammed
2013-08-21 11:28 ` Rajendra Nayak
2013-08-02 13:37 ` [PATCH v2 04/13] ARM: OMAP2+: hwmod: AMx3: remove common static fields Afzal Mohammed
2013-08-02 13:37 ` [PATCH v2 05/13] ARM: OMAP2+: CM: cm_inst offset s16->u16 Afzal Mohammed
2013-08-02 13:37 ` [PATCH v2 06/13] ARM: OMAP2+: PRCM: AM43x definitions Afzal Mohammed
2013-08-21 3:20 ` Paul Walmsley
2013-08-28 12:03 ` Afzal Mohammed
2013-08-02 13:37 ` [PATCH v2 07/13] ARM: OMAP2+: PM: AM43x powerdomain data Afzal Mohammed
2013-08-02 13:37 ` [PATCH v2 08/13] ARM: OMAP2+: CM: AM43x clockdomain data Afzal Mohammed
2013-08-02 13:37 ` [PATCH v2 09/13] ARM: OMAP2+: hwmod: AMx3: runtime AM43x handling Afzal Mohammed
2013-08-02 13:38 ` [PATCH v2 10/13] ARM: OMAP2+: hwmod: AM43x operations Afzal Mohammed
2013-08-21 11:30 ` Rajendra Nayak
2013-08-28 12:29 ` Afzal Mohammed
2013-08-02 13:38 ` [PATCH v2 11/13] ARM: OMAP2+: AM43x: PRCM kbuild Afzal Mohammed
2013-08-02 13:38 ` [PATCH v2 12/13] ARM: OMAP2+: AM43x PRCM init Afzal Mohammed
2013-08-02 13:38 ` [PATCH v2 13/13] ARM: OMAP2+: hwmod: AM43x: new w.r.t AM335x Afzal Mohammed
2013-08-21 11:33 ` Rajendra Nayak
2013-08-13 8:01 ` [PATCH v2 00/13] ARM: OMAP2+: AM43x PRCM support Tony Lindgren
2013-08-19 6:36 ` Afzal Mohammed
2013-08-20 9:18 ` Benoit Cousson
2013-08-28 12:09 ` Afzal Mohammed
2013-08-21 2:53 ` Paul Walmsley
2013-08-28 12:03 ` Afzal Mohammed
2013-08-21 11:44 ` Rajendra Nayak
2013-08-29 14:00 ` Afzal Mohammed
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=52147C48.2070407@ti.com \
--to=rnayak@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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